Update SA tooling and support for symfony/options-resolver:^7.0

Author: GrahamCampbell

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [11.13.0] - UPCOMING
+
+* Add support for `symfony/options-resolver:^7.0`
+
 ## [11.12.0] - 2023-10-08
 
 * Add PHP 8.3 support

composer.json

@@ -29,16 +29,16 @@
         "php": "^7.4.15 || ^8.0.2",
         "ext-json": "*",
         "ext-xml": "*",
-        "php-http/cache-plugin": "^1.8",
-        "php-http/client-common": "^2.7",
-        "php-http/discovery": "^1.19",
+        "php-http/cache-plugin": "^1.8.1",
+        "php-http/client-common": "^2.7.1",
+        "php-http/discovery": "^1.19.2",
         "php-http/httplug": "^2.4",
         "php-http/multipart-stream-builder": "^1.3",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "psr/http-client-implementation": "^1.0",
         "psr/http-factory-implementation": "^1.0",
         "psr/http-message": "^1.1 || ^2.0",
-        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
+        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/polyfill-php80": "^1.26"
     },
     "require-dev": {

phpstan.neon.dist

@@ -7,7 +7,6 @@ includes:
 rules:
     - Ergebnis\PHPStan\Rules\Closures\NoNullableReturnTypeDeclarationRule
     - Ergebnis\PHPStan\Rules\Expressions\NoCompactRule
-    - Ergebnis\PHPStan\Rules\Expressions\NoEmptyRule
     - Ergebnis\PHPStan\Rules\Expressions\NoEvalRule
     - Ergebnis\PHPStan\Rules\Files\DeclareStrictTypesRule
     - Ergebnis\PHPStan\Rules\Methods\PrivateInFinalClassRule

phpunit.xml.dist

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
   <testsuites>
     <testsuite name="Test Suite">
       <directory suffix="Test.php">./tests</directory>
     </testsuite>
   </testsuites>
-  <coverage>
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
-  </coverage>
+  </source>
 </phpunit>

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.7.6@ae4ec68e00e4880e3f00b1edd2da891236d749ab">
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
   <file src="src/Api/AbstractApi.php">
     <InvalidArgument>
       <code><![CDATA[function () use ($filename, $mode, &$ex): void {

src/HttpClient/Plugin/Authentication.php

@@ -19,6 +19,7 @@
 use Http\Client\Common\Plugin;
 use Http\Promise\Promise;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Add authentication to the request.
@@ -54,7 +55,7 @@ public function __construct(string $method, string $token, string $sudo = null)
      * @param callable         $next
      * @param callable         $first
      *
-     * @return Promise
+     * @return Promise<ResponseInterface>
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {

src/HttpClient/Plugin/ExceptionThrower.php

@@ -42,7 +42,7 @@ final class ExceptionThrower implements Plugin
      * @param callable         $next
      * @param callable         $first
      *
-     * @return Promise
+     * @return Promise<ResponseInterface>
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {

vendor-bin/phpstan/composer.json

@@ -1,11 +1,11 @@
 {
     "require": {
         "php": "^8.1",
-        "phpstan/phpstan": "1.10.3",
-        "phpstan/phpstan-deprecation-rules": "1.1.2",
-        "phpstan/phpstan-strict-rules": "1.5.0",
+        "phpstan/phpstan": "1.10.47",
+        "phpstan/phpstan-deprecation-rules": "1.1.4",
+        "phpstan/phpstan-strict-rules": "1.5.2",
         "thecodingmachine/phpstan-strict-rules": "1.0.0",
-        "ergebnis/phpstan-rules": "1.0.0"
+        "ergebnis/phpstan-rules": "2.1.0"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/phpunit/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4.15 || ^8.0.2",
-        "phpunit/phpunit": "^9.6.3 || ^10.0.12"
+        "phpunit/phpunit": "^9.6.15 || ^10.5.1"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/psalm/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^8.1",
-        "psalm/phar": "5.7.6"
+        "psalm/phar": "5.16.0"
     },
     "config": {
         "preferred-install": "dist"