ci: fix php-cs-fixer errors

src/CloudProvider/Aws/AbstractClient.php

@@ -134,7 +134,7 @@ protected function parseResponseStatusCode(array $response): int
     /**
      * Makes a request to the AWS API for the given URI.
      */
-    protected function request(string $method, string $uri, string $body = null, array $headers = []): array
+    protected function request(string $method, string $uri, ?string $body = null, array $headers = []): array
     {
         $arguments = [
             'headers' => $this->mergeHeaders($this->createBaseHeaders($body), $headers),

src/CloudProvider/Aws/S3Client.php

@@ -220,7 +220,7 @@ protected function getService(): string
     /**
      * Makes a request to the AWS S3 API for the given object key.
      */
-    protected function request(string $method, string $key, string $body = null, array $headers = []): array
+    protected function request(string $method, string $key, ?string $body = null, array $headers = []): array
     {
         return parent::request($method, $this->createRequestUri($key), $body, $headers);
     }

src/CloudStorage/AbstractCloudStorageStreamWrapper.php

@@ -87,7 +87,7 @@ public static function getProtocol(): string
     /**
      * Register the cloud storage stream wrapper.
      */
-    public static function register(CloudStorageClientInterface $client, \ArrayObject $cache = null)
+    public static function register(CloudStorageClientInterface $client, ?\ArrayObject $cache = null)
     {
         if (in_array(static::getProtocol(), stream_get_wrappers())) {
             stream_wrapper_unregister(static::getProtocol());

src/Console/RunAllCronCommand.php

@@ -45,7 +45,7 @@ class RunAllCronCommand extends AbstractCommand
     /**
      * Constructor.
      */
-    public function __construct(ConsoleClientInterface $consoleClient, EventManager $eventManager, WpCli $wpCli, \WP_Site_Query $siteQuery = null)
+    public function __construct(ConsoleClientInterface $consoleClient, EventManager $eventManager, WpCli $wpCli, ?\WP_Site_Query $siteQuery = null)
     {
         parent::__construct($wpCli);
 

src/Subscriber/ContentDeliveryNetworkImageProcessingSubscriber.php

@@ -67,7 +67,7 @@ class ContentDeliveryNetworkImageProcessingSubscriber implements SubscriberInter
     /**
      * {@inheritdoc}
      */
-    public function __construct(array $baseImageSizes, bool $isMultisite, string $uploadsUrl, int $contentWidthGlobal = null)
+    public function __construct(array $baseImageSizes, bool $isMultisite, string $uploadsUrl, ?int $contentWidthGlobal = null)
     {
         $this->baseImageSizes = $baseImageSizes;
         $this->contentWidthGlobal = $contentWidthGlobal;
@@ -128,10 +128,10 @@ public function generateScaledDownImage($image, $attachmentId, $size)
         list($width, $height, $cropped) = $this->getImageAttachmentDimensions((int) $attachmentId, $size);
 
         return [
-             $this->generateImageUrl($imageUrl, $height, $width, $cropped),
-             $width ?? false,
-             $height ?? false,
-             'full' !== $size,
+            $this->generateImageUrl($imageUrl, $height, $width, $cropped),
+            $width ?? false,
+            $height ?? false,
+            'full' !== $size,
         ];
     }
 

src/Support/Collection.php

@@ -120,7 +120,7 @@ public function each(callable $callback)
     /**
      * Run a filter over each collection item.
      */
-    public function filter(callable $callback = null): self
+    public function filter(?callable $callback = null): self
     {
         $filtered = $callback ? array_filter($this->items, $callback, ARRAY_FILTER_USE_BOTH) : array_filter($this->items);
 
@@ -283,15 +283,15 @@ public function shift(int $count = 1)
     /**
      * Extract a slice of the collection.
      */
-    public function slice(int $offset, int $length = null): self
+    public function slice(int $offset, ?int $length = null): self
     {
         return new self(array_slice($this->items, $offset, $length, true));
     }
 
     /**
      * Sort through each item with a callback.
      */
-    public function sort(callable $callback = null)
+    public function sort(?callable $callback = null)
     {
         $items = $this->items;
 

tests/Unit/CloudProvider/Aws/DynamoDbClientTest.php

@@ -46,7 +46,7 @@ public function testBatchGetItem()
                      'method' => 'POST',
                      'timeout' => 300,
                      'body' => '{"RequestItems":{"table":{"ConsistentRead":false,"Keys":[{"key":{"S":"forum"}}]}}}',
-                ])
+                 ])
              )
              ->willReturn([
                  'body' => '{"Responses": {"Forum": [{"Name":{"S":"Amazon DynamoDB"}, "Threads":{"N":"5"}, "Messages":{"N":"19"}, "Views":{"N":"35"}}]}}',

tests/Unit/CloudProvider/Aws/S3ClientTest.php

@@ -265,12 +265,12 @@ public function testObjectExists()
                  ])
              )
              ->willReturn([
-                'headers' => [
-                    'content-type' => 'text/plain',
-                    'content-length' => 42,
-                    'last-modified' => '10 September 2000',
-                ],
-                'response' => ['code' => 200],
+                 'headers' => [
+                     'content-type' => 'text/plain',
+                     'content-length' => 42,
+                     'last-modified' => '10 September 2000',
+                 ],
+                 'response' => ['code' => 200],
              ]);
 
         $gmdate = $this->getFunctionMock($this->getNamespace(S3Client::class), 'gmdate');