Upgrade to PHP-CS-Fixer 3.17 (#1440)

Also add a rule to trim blank line inside `{}`, `[]` and `()`

Author: jderusse

src/AwsError/ChainAwsErrorFactory.php

@@ -16,7 +16,7 @@ class ChainAwsErrorFactory implements AwsErrorFactoryInterface
     /**
      * @param AwsErrorFactoryInterface[]|null $factories
      */
-    public function __construct(array $factories = null)
+    public function __construct(?array $factories = null)
     {
         $this->factories = $factories ?? [
             new JsonRestAwsErrorFactory(),

src/Credentials/CacheProvider.php

@@ -17,7 +17,7 @@
 final class CacheProvider implements CredentialProvider, ResetInterface
 {
     /**
-     * @var (null|Credentials)[]
+     * @var (Credentials|null)[]
      */
     private $cache = [];
 

src/Credentials/ConfigurationProvider.php

@@ -57,7 +57,7 @@ public function getCredentials(Configuration $configuration): ?Credentials
         return $credentials;
     }
 
-    private function getCredentialsFromRole(Credentials $credentials, string $region, string $roleArn, string $roleSessionName = null): ?Credentials
+    private function getCredentialsFromRole(Credentials $credentials, string $region, string $roleArn, ?string $roleSessionName = null): ?Credentials
     {
         $roleSessionName = $roleSessionName ?? uniqid('async-aws-', true);
         $stsClient = new StsClient(['region' => $region], $credentials, $this->httpClient);

src/Exception/Http/HttpExceptionTrait.php

@@ -24,7 +24,7 @@ trait HttpExceptionTrait
      */
     private $awsError;
 
-    public function __construct(ResponseInterface $response, AwsError $awsError = null)
+    public function __construct(ResponseInterface $response, ?AwsError $awsError = null)
     {
         $this->response = $response;
         /** @var int $code */

src/HttpClient/AwsHttpClientFactory.php

@@ -12,7 +12,7 @@
  */
 class AwsHttpClientFactory
 {
-    public static function createRetryableClient(HttpClientInterface $httpClient = null, LoggerInterface $logger = null): HttpClientInterface
+    public static function createRetryableClient(?HttpClientInterface $httpClient = null, ?LoggerInterface $logger = null): HttpClientInterface
     {
         if (null === $httpClient) {
             $httpClient = HttpClient::create();

src/HttpClient/AwsRetryStrategy.php

@@ -19,7 +19,7 @@ class AwsRetryStrategy extends GenericRetryStrategy
     private $awsErrorFactory;
 
     // Override Symfony default options for a better integration of AWS servers.
-    public function __construct(array $statusCodes = self::DEFAULT_RETRY_STATUS_CODES, int $delayMs = 1000, float $multiplier = 2.0, int $maxDelayMs = 0, float $jitter = 0.1, AwsErrorFactoryInterface $awsErrorFactory = null)
+    public function __construct(array $statusCodes = self::DEFAULT_RETRY_STATUS_CODES, int $delayMs = 1000, float $multiplier = 2.0, int $maxDelayMs = 0, float $jitter = 0.1, ?AwsErrorFactoryInterface $awsErrorFactory = null)
     {
         parent::__construct($statusCodes, $delayMs, $multiplier, $maxDelayMs, $jitter);
         $this->awsErrorFactory = $awsErrorFactory ?? new ChainAwsErrorFactory();

src/Response.php

@@ -100,7 +100,7 @@ class Response
      */
     private $exceptionMapping;
 
-    public function __construct(ResponseInterface $response, HttpClientInterface $httpClient, LoggerInterface $logger, AwsErrorFactoryInterface $awsErrorFactory = null, EndpointCache $endpointCache = null, Request $request = null, bool $debug = false, array $exceptionMapping = [])
+    public function __construct(ResponseInterface $response, HttpClientInterface $httpClient, LoggerInterface $logger, ?AwsErrorFactoryInterface $awsErrorFactory = null, ?EndpointCache $endpointCache = null, ?Request $request = null, bool $debug = false, array $exceptionMapping = [])
     {
         $this->httpResponse = $response;
         $this->httpClient = $httpClient;
@@ -186,7 +186,7 @@ public function resolve(?float $timeout = null): bool
      * @throws NetworkException
      * @throws HttpException
      */
-    final public static function wait(iterable $responses, float $timeout = null, bool $downloadBody = false): iterable
+    final public static function wait(iterable $responses, ?float $timeout = null, bool $downloadBody = false): iterable
     {
         /** @var self[] $responseMap */
         $responseMap = [];

src/Result.php

@@ -34,7 +34,7 @@ class Result
      */
     private $prefetchResults = [];
 
-    public function __construct(Response $response, AbstractApi $awsClient = null, $request = null)
+    public function __construct(Response $response, ?AbstractApi $awsClient = null, $request = null)
     {
         $this->response = $response;
         $this->awsClient = $awsClient;
@@ -78,7 +78,7 @@ final public function resolve(?float $timeout = null): bool
      * @throws NetworkException
      * @throws HttpException
      */
-    final public static function wait(iterable $results, float $timeout = null, bool $downloadBody = false): iterable
+    final public static function wait(iterable $results, ?float $timeout = null, bool $downloadBody = false): iterable
     {
         $resultMap = [];
         $responses = [];

src/Waiter.php

@@ -171,7 +171,7 @@ final public function cancel(): void
      *
      * @return bool true if a final state was reached
      */
-    final public function wait(float $timeout = null, float $delay = null): bool
+    final public function wait(?float $timeout = null, ?float $delay = null): bool
     {
         if (null !== $this->finalState) {
             return true;

tests/Unit/AbstractApiTest.php

@@ -66,7 +66,7 @@ public function getEndpoint(string $uri, array $query, ?string $region): string
         return parent::getEndpoint($uri, $query, $region);
     }
 
-    public function getResponseExposed(Request $request, RequestContext $context = null): Response
+    public function getResponseExposed(Request $request, ?RequestContext $context = null): Response
     {
         return parent::getResponse($request, $context);
     }