diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ec10a83e9..aa01ed09c 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 60714487d..f5efeacbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download dependencies run: composer update --no-interaction --no-progress --prefer-stable --prefer-lowest @@ -84,7 +84,7 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download dependencies run: | @@ -126,7 +126,7 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download dependencies run: composer update --no-interaction --no-progress diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 54609c750..799401385 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 @@ -39,7 +39,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -63,7 +63,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 7acf9b590..800bad1ae 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 72defd614..69583d7cc 100644 --- a/composer.json +++ b/composer.json @@ -63,10 +63,10 @@ }, "require-dev": { "ext-curl": "*", - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json index ffac55c2b..3e8c9dfbb 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.23.0" + "friendsofphp/php-cs-fixer": "3.40.2" }, "config": { "preferred-install": "dist" diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json index fc48f6ddb..62076918f 100644 --- a/vendor-bin/phpstan/composer.json +++ b/vendor-bin/phpstan/composer.json @@ -1,7 +1,7 @@ { "require": { "php": "^7.4 || ^8.0", - "phpstan/phpstan": "1.10.32", + "phpstan/phpstan": "1.10.47", "phpstan/phpstan-deprecation-rules": "1.1.4" }, "config": { diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json index fae19dcd0..2f215e858 100644 --- a/vendor-bin/psalm/composer.json +++ b/vendor-bin/psalm/composer.json @@ -1,7 +1,7 @@ { "require": { "php": "^7.4 || ^8.0", - "psalm/phar": "5.15.0" + "psalm/phar": "5.16.0" }, "config": { "preferred-install": "dist"