diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c04eaa0..75d0d59 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,7 +8,6 @@ jobs: strategy: matrix: php_version: - - "7.4" - "8.0" - "8.1" - "8.2" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index afdf101..2977b88 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,7 +6,7 @@ jobs: integration_test: strategy: matrix: - php_version: [8.1, 8.2] # 8.3 is disabled for now, since Magento 2 does not support this yet. + php_version: [8.0, 8.1, 8.2, 8.3] # 8.4 is disabled for now, since Magento 2 does not support this yet. testsuite: [general, brancher] runs-on: ubuntu-latest steps: @@ -19,12 +19,12 @@ jobs: env: PHP_VERSION: ${{ matrix.php_version }} - name: Start SSH agent for brancher testsuite - if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.2' }} + if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.3' }} uses: webfactory/ssh-agent@v0.5.4 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Run brancher testsuite - if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.2' }} + if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.3' }} run: ./runtests.sh brancher shell: bash env: @@ -34,7 +34,7 @@ jobs: code_quality: strategy: matrix: - php_version: [7.4, 8.1, 8.2, 8.3, 8.4] + php_version: [8.0, 8.1, 8.2, 8.3, 8.4] runs-on: ubuntu-latest steps: - name: Checkout hypernode-deploy diff --git a/composer.json b/composer.json index ba2ab62..45b9823 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "guzzlehttp/guzzle": "^7.5", "hypernode/api-client": "^0.4", "hypernode/deploy-configuration": "^3.2", - "php-di/php-di": "^6.0", + "php-di/php-di": "^7.0", "psr/log": "^1.0", "symfony/console": "^5.4", "symfony/finder": "^5.4", diff --git a/composer.lock b/composer.lock index 1a79ac2..b90ade5 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": "380d904dca7d545c8ea98379f77f71d6", + "content-hash": "718a3a48634317cb62c8b864f48694fa", "packages": [ { "name": "clue/stream-filter", @@ -1175,39 +1175,36 @@ }, { "name": "php-di/php-di", - "version": "6.4.0", + "version": "7.0.7", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4" + "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/ae0f1b3b03d8b29dff81747063cbfd6276246cc4", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/e87435e3c0e8f22977adc5af0d5cdcc467e15cf1", + "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1", "shasum": "" }, "require": { "laravel/serializable-closure": "^1.0", - "php": ">=7.4.0", + "php": ">=8.0", "php-di/invoker": "^2.0", - "php-di/phpdoc-reader": "^2.0.1", - "psr/container": "^1.0" + "psr/container": "^1.1 || ^2.0" }, "provide": { "psr/container-implementation": "^1.0" }, "require-dev": { - "doctrine/annotations": "~1.10", - "friendsofphp/php-cs-fixer": "^2.4", - "mnapoli/phpunit-easymock": "^1.2", - "ocramius/proxy-manager": "^2.11.2", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^9.5" + "friendsofphp/php-cs-fixer": "^3", + "friendsofphp/proxy-manager-lts": "^1", + "mnapoli/phpunit-easymock": "^1.3", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.6" }, "suggest": { - "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", - "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" + "friendsofphp/proxy-manager-lts": "Install it if you want to use lazy injection (version ^1)" }, "type": "library", "autoload": { @@ -1235,7 +1232,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/PHP-DI/issues", - "source": "https://github.com/PHP-DI/PHP-DI/tree/6.4.0" + "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.7" }, "funding": [ { @@ -1247,49 +1244,7 @@ "type": "tidelift" } ], - "time": "2022-04-09T16:46:38+00:00" - }, - { - "name": "php-di/phpdoc-reader", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/PhpDocReader.git", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "require-dev": { - "mnapoli/hard-mode": "~0.3.0", - "phpunit/phpunit": "^8.5|^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpDocReader\\": "src/PhpDocReader" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", - "keywords": [ - "phpdoc", - "reflection" - ], - "support": { - "issues": "https://github.com/PHP-DI/PhpDocReader/issues", - "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" - }, - "time": "2020-10-12T12:39:22+00:00" + "time": "2024-07-21T15:55:45+00:00" }, { "name": "php-http/client-common", diff --git a/src/Bootstrap.php b/src/Bootstrap.php index 563bd06..bc1eb9f 100644 --- a/src/Bootstrap.php +++ b/src/Bootstrap.php @@ -55,7 +55,7 @@ private function initContainer(): Container { $builder = new ContainerBuilder(); $builder->useAutowiring(true); - $builder->useAnnotations(true); + $builder->useAttributes(true); $builder->addDefinitions(Di\ConsoleDefinition::getDefinition()); $builder->addDefinitions([ 'version' => $this->getVersion(), diff --git a/src/DeployRunner.php b/src/DeployRunner.php index 9307eb0..da0ddc7 100644 --- a/src/DeployRunner.php +++ b/src/DeployRunner.php @@ -181,8 +181,8 @@ private function configureDeployerTask(Task $deployerTask, TaskConfigurationInte if ($stage) { $deployerTask->select( sprintf( - "stage=${stage}&roles=%s", - implode(",stage=${stage}&roles=", $roles) + "stage={$stage}&roles=%s", + implode(",stage={$stage}&roles=", $roles) ) ); } else {