diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 0a71b49f..e1af4dda 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -26,10 +26,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.4', '8.0', '8.1'] - dependencies: ['locked', 'latest'] + php: ['7.4', '8.0', '8.1', '8.2'] - name: PHP ${{ matrix.php }} unittests with ${{ matrix.dependencies }} deps + name: PHP ${{ matrix.php }} unittests steps: - uses: actions/checkout@v3 @@ -50,7 +49,4 @@ jobs: - run: composer install --no-interaction --no-suggest --no-progress - - run: composer update --no-interaction --no-suggest --no-progress - if: matrix.dependencies == 'latest' - - run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index af186d31..aeb1c42b 100644 --- a/composer.json +++ b/composer.json @@ -38,9 +38,6 @@ }, "config": { "optimize-autoloader": true, - "platform": { - "php": "7.4" - }, "sort-packages": true, "allow-plugins": { "phpstan/extension-installer": true, diff --git a/composer.lock b/composer.lock index 1b2735d0..8b700c94 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "995f73677d770fc2e83f4c2e8bc8923f", + "content-hash": "a1af62c1a724e255f07862cd552943f7", "packages": [ { "name": "composer/semver", @@ -3120,16 +3120,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -3170,9 +3170,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "phar-io/manifest", @@ -3575,22 +3575,22 @@ }, { "name": "phpstan/extension-installer", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/phpstan/extension-installer.git", - "reference": "f5e02d40f277d28513001976f444d9ff1dc15e9a" + "reference": "f45734bfb9984c6c56c4486b71230355f066a58a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f5e02d40f277d28513001976f444d9ff1dc15e9a", - "reference": "f5e02d40f277d28513001976f444d9ff1dc15e9a", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a", + "reference": "f45734bfb9984c6c56c4486b71230355f066a58a", "shasum": "" }, "require": { "composer-plugin-api": "^2.0", "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.8.0" + "phpstan/phpstan": "^1.9.0" }, "require-dev": { "composer/composer": "^2.0", @@ -3599,12 +3599,7 @@ }, "type": "composer-plugin", "extra": { - "class": "PHPStan\\ExtensionInstaller\\Plugin", - "phpstan/extension-installer": { - "ignore": [ - "phpstan/phpstan-phpunit" - ] - } + "class": "PHPStan\\ExtensionInstaller\\Plugin" }, "autoload": { "psr-4": { @@ -3618,28 +3613,29 @@ "description": "Composer plugin for automatic installation of PHPStan extensions", "support": { "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.3.0" + "source": "https://github.com/phpstan/extension-installer/tree/1.3.1" }, - "time": "2023-04-18T13:08:02+00:00" + "time": "2023-05-24T08:59:17+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.20.4", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd" + "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", - "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6df62b08faef4f899772bc7c3bbabb93d2b7a21c", + "reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", @@ -3663,9 +3659,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.0" }, - "time": "2023-05-02T09:19:37+00:00" + "time": "2023-05-17T13:13:44+00:00" }, { "name": "phpstan/phpstan", @@ -5832,8 +5828,5 @@ "php": "^7.4 || ^8.0" }, "platform-dev": [], - "platform-overrides": { - "php": "7.4" - }, "plugin-api-version": "2.3.0" } diff --git a/src/Domain/Model/Deployment.php b/src/Domain/Model/Deployment.php index 0a243fb2..398d397d 100644 --- a/src/Domain/Model/Deployment.php +++ b/src/Domain/Model/Deployment.php @@ -18,6 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareTrait; use TYPO3\Surf\Domain\Enum\DeploymentStatus; use TYPO3\Surf\Exception as SurfException; +use TYPO3\Surf\Integration\LoggerAwareTrait; use UnexpectedValueException; /** @@ -26,6 +27,7 @@ */ class Deployment implements LoggerAwareInterface, ContainerAwareInterface { + use LoggerAwareTrait; use ContainerAwareTrait; /** @@ -285,13 +287,6 @@ public function setWorkflow(Workflow $workflow): self return $this; } - public function setLogger(LoggerInterface $logger): self - { - $this->logger = $logger; - - return $this; - } - /** * Get the deployment release identifier * diff --git a/src/Integration/LoggerAwareTrait.php b/src/Integration/LoggerAwareTrait.php index edebf808..fafb1ae2 100644 --- a/src/Integration/LoggerAwareTrait.php +++ b/src/Integration/LoggerAwareTrait.php @@ -17,7 +17,7 @@ trait LoggerAwareTrait { protected LoggerInterface $logger; - public function setLogger(LoggerInterface $logger) + public function setLogger(LoggerInterface $logger): void { $this->logger = $logger; }