diff --git a/.github/workflows/ci-php.yaml b/.github/workflows/ci-php.yaml index 8fa10073..6646136f 100644 --- a/.github/workflows/ci-php.yaml +++ b/.github/workflows/ci-php.yaml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - version: ["7.4", "8.0", "8.1", "8.2"] + version: ["8.1", "8.2", "8.3"] steps: - name: checkout uses: actions/checkout@v3 diff --git a/php/devcontainers/php-7.4/.devcontainer/devcontainer.json b/php/devcontainers/php-7.4/.devcontainer/devcontainer.json deleted file mode 100644 index 39bfb95f..00000000 --- a/php/devcontainers/php-7.4/.devcontainer/devcontainer.json +++ /dev/null @@ -1,27 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/php -{ - "name": "PHP", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/php:0-7.4", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - // Configure tool-specific properties. - // "customizations": {}, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [ - 8080 - ], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html" - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - //"remoteUser": "root", - "customizations": { - "vscode": { - "extensions": [ - "xdebug.php-debug", - "recca0120.vscode-phpunit" - ] - } - } -} \ No newline at end of file diff --git a/php/devcontainers/php-8.0/.devcontainer/devcontainer.json b/php/devcontainers/php-8.0/.devcontainer/devcontainer.json deleted file mode 100644 index 92cc2bf7..00000000 --- a/php/devcontainers/php-8.0/.devcontainer/devcontainer.json +++ /dev/null @@ -1,27 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/php -{ - "name": "PHP", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/php:1-8.0", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - // Configure tool-specific properties. - // "customizations": {}, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [ - 8080 - ], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html" - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - //"remoteUser": "root", - "customizations": { - "vscode": { - "extensions": [ - "xdebug.php-debug", - "recca0120.vscode-phpunit" - ] - } - } -} \ No newline at end of file diff --git a/php/src/vaas/composer.json b/php/src/vaas/composer.json index a93d52b0..adfa0e43 100644 --- a/php/src/vaas/composer.json +++ b/php/src/vaas/composer.json @@ -13,13 +13,13 @@ "license": "MIT", "homepage": "https://github.com/GDATASoftwareAG/vaas", "require": { - "php": "^7.4 || ^8", + "php": "^8.1", "ramsey/uuid": "^4.7 || ^4.2", "textalk/websocket": "^1.6 || ^1.5", - "netresearch/jsonmapper": "^4.1", + "netresearch/jsonmapper": "^4.4", "guzzlehttp/guzzle": "^7", "psr/log": "^1.1 || ^2.0 || ^3.0", - "league/oauth2-client": "^2.4.0" + "league/oauth2-client": "^2.7" }, "autoload": { "psr-4": { diff --git a/php/tests/vaas/VaasTest.php b/php/tests/vaas/VaasTest.php index b437a842..0f432937 100644 --- a/php/tests/vaas/VaasTest.php +++ b/php/tests/vaas/VaasTest.php @@ -22,8 +22,6 @@ use VaasSdk\Message\Verdict; use VaasSdk\Sha256; -use function PHPUnit\Framework\assertEquals; - final class VaasTest extends TestCase { use ProphecyTrait; @@ -382,7 +380,8 @@ private function getUuid(): string * @throws VaasAuthenticationException * @throws TimeoutException */ - public function testForUrl_WithInvalidUrl_ThrowsVaasClientException() { + public function testForUrl_WithInvalidUrl_ThrowsVaasClientException() + { $vaas = new Vaas($_ENV["VAAS_URL"], $this->_getDebugLogger()); $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage("Url is not valid"); @@ -397,7 +396,8 @@ public function testForUrl_WithInvalidUrl_ThrowsVaasClientException() { * @throws VaasAuthenticationException * @throws TimeoutException */ - public function testForUrl_WithNull_ThrowsVaasClientException() { + public function testForUrl_WithNull_ThrowsVaasClientException() + { $vaas = new Vaas($_ENV["VAAS_URL"], $this->_getDebugLogger()); $this->expectException(\TypeError::class); $vaas->Connect($this->getClientCredentialsGrantAuthenticator()->getToken()); @@ -411,7 +411,8 @@ public function testForUrl_WithNull_ThrowsVaasClientException() { * @throws VaasAuthenticationException * @throws TimeoutException */ - public function testForUrl_WithStatus4xx_ThrowsVaasClientException() { + public function testForUrl_WithStatus4xx_ThrowsVaasClientException() + { $vaas = new Vaas($_ENV["VAAS_URL"], $this->_getDebugLogger()); $this->expectException(VaasClientException::class); $this->expectExceptionMessage("Call failed with status code 404 (Not Found): GET https://upload.production.vaas.gdatasecurity.de/nocontenthere");