diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ec10a83..aa01ed0 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Composer normalize uses: docker://ergebnis/composer-normalize-action diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb5033a..720d508 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: extensions: mbstring - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress @@ -37,7 +37,7 @@ jobs: strategy: max-parallel: 10 matrix: - php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] steps: - name: Set up PHP @@ -49,7 +49,7 @@ jobs: extensions: mbstring - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: composer update --no-interaction --no-progress diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index f1db7bc..84e6c46 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 7acf9b5..800bad1 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -8,6 +8,9 @@ '@Symfony' => true, 'declare_strict_types' => false, 'global_namespace_import' => false, + 'no_superfluous_phpdoc_tags' => [ + 'allow_mixed' => true, + ], 'phpdoc_annotation_without_dot' => false, 'phpdoc_summary' => false, 'phpdoc_to_comment' => false, diff --git a/composer.json b/composer.json index 379e59e..621e794 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "require": { "php": "^7.2.5 || ^8.0", - "guzzlehttp/guzzle": "^7.5.1", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5" + "guzzlehttp/guzzle": "^7.8", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "phpunit/phpunit": "^8.5.19 || ^9.5.8" }, "autoload": { diff --git a/src/Exception/CommandException.php b/src/Exception/CommandException.php index e1847ad..89631f1 100644 --- a/src/Exception/CommandException.php +++ b/src/Exception/CommandException.php @@ -57,10 +57,8 @@ public static function fromPrevious(CommandInterface $command, \Exception $prev) } /** - * @param string $message Exception message - * @param \Exception $previous Previous exception (if any) - * @param RequestInterface $request - * @param ResponseInterface $response + * @param string $message Exception message + * @param \Exception|null $previous Previous exception (if any) */ public function __construct( $message, diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json index c9dd5ee..3e8c9df 100644 --- a/vendor-bin/php-cs-fixer/composer.json +++ b/vendor-bin/php-cs-fixer/composer.json @@ -1,7 +1,7 @@ { "require": { "php": "^7.4 || ^8.0", - "friendsofphp/php-cs-fixer": "3.16.0" + "friendsofphp/php-cs-fixer": "3.40.2" }, "config": { "preferred-install": "dist"