diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ec10a83e..aa01ed09 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 cb5033ab..720d5087 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 f1db7bc7..84e6c460 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 7acf9b59..800bad1a 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 999e6bc6..4f3b1a81 100644 --- a/composer.json +++ b/composer.json @@ -26,13 +26,13 @@ ], "require": { "php": "^7.2.5 || ^8.0", - "guzzlehttp/guzzle": "^7.7", - "guzzlehttp/command": "^1.3", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/guzzle": "^7.8", + "guzzlehttp/command": "^1.3.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "guzzlehttp/uri-template": "^1.0.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/GuzzleClient.php b/src/GuzzleClient.php index 22d9b5ae..168c88fa 100644 --- a/src/GuzzleClient.php +++ b/src/GuzzleClient.php @@ -34,12 +34,9 @@ class GuzzleClient extends ServiceClient * - response_locations: Associative array of location types mapping to * ResponseLocationInterface objects. * - * @param ClientInterface $client HTTP client to use. - * @param DescriptionInterface $description Guzzle service description - * @param callable $commandToRequestTransformer - * @param callable $responseToResultTransformer - * @param HandlerStack $commandHandlerStack - * @param array $config Configuration options + * @param ClientInterface $client HTTP client to use. + * @param DescriptionInterface $description Guzzle service description + * @param array $config Configuration options */ public function __construct( ClientInterface $client, diff --git a/src/Parameter.php b/src/Parameter.php index 29bab183..4b2f5d22 100644 --- a/src/Parameter.php +++ b/src/Parameter.php @@ -78,7 +78,7 @@ class Parameter implements ToArrayInterface /** @var string */ private $format; - private $propertiesCache = null; + private $propertiesCache; /** @var Description */ private $serviceDescription; diff --git a/src/ResponseLocation/XmlLocation.php b/src/ResponseLocation/XmlLocation.php index cea1db81..7fafb5fb 100644 --- a/src/ResponseLocation/XmlLocation.php +++ b/src/ResponseLocation/XmlLocation.php @@ -48,8 +48,8 @@ public function after( ) { // Handle additional, undefined properties $additional = $model->getAdditionalProperties(); - if ($additional instanceof Parameter && - $additional->getLocation() == $this->locationName + if ($additional instanceof Parameter + && $additional->getLocation() == $this->locationName ) { $result = new Result(array_merge( $result->toArray(), diff --git a/src/Serializer.php b/src/Serializer.php index 145c48fb..d9090118 100644 --- a/src/Serializer.php +++ b/src/Serializer.php @@ -132,8 +132,6 @@ protected function createRequest(CommandInterface $command) /** * Create a request for an operation with a uri merged onto a base URI * - * @param \GuzzleHttp\Command\Guzzle\Operation $operation - * * @return \GuzzleHttp\Psr7\Request */ private function createCommandWithUri( diff --git a/tests/ResponseLocation/JsonLocationTest.php b/tests/ResponseLocation/JsonLocationTest.php index cba64776..eb8fdb5c 100644 --- a/tests/ResponseLocation/JsonLocationTest.php +++ b/tests/ResponseLocation/JsonLocationTest.php @@ -39,9 +39,6 @@ public function testVisitsLocation() /** * @group ResponseLocation - * - * @param $name - * @param $expected */ public function testVisitsWiredArray() { diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json index c9dd5ee4..3e8c9dfb 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"