Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/php 8 2 #11

Merged
merged 14 commits into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['5.6', '7.4', '8.0']
php-versions: ['5.6', '7.4', '8.2']
ins0 marked this conversation as resolved.
Show resolved Hide resolved
name: Testing PHP ${{ matrix.php-versions }}
steps:
- name: Checkout
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/vendor/
/.idea/
/.phpunit.cache/
.phpunit.result.cache
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"ext-json": "*",
"guzzlehttp/psr7": "^1.6",
"php": "^5.6 || ^7.0 || ^8.0",
"php": "^5.6 || ^7.0 || ^8.2",
"php-http/httplug": ">=1.1.0"
},
"suggest": {
Expand Down
24 changes: 12 additions & 12 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<phpunit bootstrap="./tests/bootstrap.php">
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>
<testsuites>
<testsuite name="The project's test suite">
<directory>./tests</directory>
</testsuite>
</testsuites>
<?xml version="1.0" encoding="utf-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
<coverage>
<include>
<directory suffix=".php">./src/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="The project's test suite">
<directory>./tests</directory>
</testsuite>
</testsuites>
</phpunit>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Class SecretEngineTest
* @package Test\VaultPHP\SecretEngines
*/
abstract class SecretEngineTest extends TestCase
abstract class AbstractSecretEngineTestCase extends TestCase
{
protected function createApiClient($expectedMethod, $expectedPath, $expectedData, $responseData, $responseStatus = 200)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Request\CreateKeyRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\CreateKeyResponse;
use VaultPHP\SecretEngines\Engines\Transit\EncryptionType;
Expand All @@ -12,7 +12,7 @@
* Class CreateKeyTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class CreateKeyTest extends SecretEngineTest
final class CreateKeyTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Request\DecryptData\DecryptData;
use VaultPHP\SecretEngines\Engines\Transit\Request\DecryptData\DecryptDataBulkRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\DecryptDataResponse;
Expand All @@ -12,7 +12,7 @@
* Class DecryptDataBulkTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class DecryptDataBulkTest extends SecretEngineTest
final class DecryptDataBulkTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Request\DecryptData\DecryptDataRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\DecryptDataResponse;
use VaultPHP\SecretEngines\Engines\Transit\Transit;
Expand All @@ -11,7 +11,7 @@
* Class DecryptDataTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class DecryptDataTest extends SecretEngineTest
final class DecryptDataTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Response\DeleteKeyResponse;
use VaultPHP\SecretEngines\Engines\Transit\Transit;

/**
* Class DeleteKeyTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class DeleteKeyTest extends SecretEngineTest
final class DeleteKeyTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Request\EncryptData\EncryptData;
use VaultPHP\SecretEngines\Engines\Transit\Request\EncryptData\EncryptDataBulkRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\EncryptDataResponse;
Expand All @@ -12,7 +12,7 @@
* Class EncryptDataBulkTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class EncryptDataBulkTest extends SecretEngineTest
final class EncryptDataBulkTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\EncryptionType;
use VaultPHP\SecretEngines\Engines\Transit\Request\EncryptData\EncryptDataRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\EncryptDataResponse;
Expand All @@ -12,7 +12,7 @@
* Class EncryptDataTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class EncryptDataTest extends SecretEngineTest
final class EncryptDataTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/VaultPHP/SecretEngines/Engines/Transit/ListKeyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Response\ListKeysResponse;
use VaultPHP\SecretEngines\Engines\Transit\Transit;

/**
* Class ListKeyTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class ListKeyTest extends SecretEngineTest
final class ListKeyTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Test\VaultPHP\SecretEngines\Engines\Transit;

use Test\VaultPHP\SecretEngines\SecretEngineTest;
use Test\VaultPHP\SecretEngines\AbstractSecretEngineTestCase;
use VaultPHP\SecretEngines\Engines\Transit\Request\UpdateKeyConfigRequest;
use VaultPHP\SecretEngines\Engines\Transit\Response\UpdateKeyConfigResponse;
use VaultPHP\SecretEngines\Engines\Transit\Transit;
Expand All @@ -11,7 +11,7 @@
* Class UpdateKeyConfigTest
* @package Test\VaultPHP\SecretEngines\Transit
*/
final class UpdateKeyConfigTest extends SecretEngineTest
final class UpdateKeyConfigTest extends AbstractSecretEngineTestCase
{
public function testApiCall()
{
Expand Down