PHP 8.4 support

aws · Sep 29, 2024 · abbb2a0 · abbb2a0
1 parent ea3563a
commit abbb2a0
Show file tree

Hide file tree

Showing 60 changed files with 148 additions and 148 deletions.
diff --git a/build/Burgomaster.php b/build/Burgomaster.php
@@ -150,21 +150,21 @@ public function deepCopy($from, $to)
      *
      * Any LICENSE file is automatically copied.
      *
-     * @param string    $sourceDir  Source directory to copy from
-     * @param string    $destDir    Directory to copy the files to that is relative
-     *                              to the the stage base directory.
-     * @param array     $extensions File extensions to copy from the $sourceDir.
-     *                              Defaults to "php" files only (e.g., ['php']).
-     * @param Iterator|null  $files Files to copy from the source directory, each
-     *                              yielded out as an SplFileInfo object.
-     *                              Defaults to a recursive iterator of $sourceDir
+     * @param string        $sourceDir  Source directory to copy from
+     * @param string        $destDir    Directory to copy the files to that is relative
+     *                                  to the the stage base directory.
+     * @param array         $extensions File extensions to copy from the $sourceDir.
+     *                                  Defaults to "php" files only (e.g., ['php']).
+     * @param Iterator|null $files      Files to copy from the source directory, each
+     *                                  yielded out as an SplFileInfo object.
+     *                                  Defaults to a recursive iterator of $sourceDir
      * @throws \InvalidArgumentException if the source directory is invalid.
      */
     function recursiveCopy(
         $sourceDir,
         $destDir,
         $extensions = array('php', 'php.gz'),
-        Iterator $files = null
+        Iterator|null $files = null
     ) {
         if (!realpath($sourceDir)) {
             throw new \InvalidArgumentException("$sourceDir not found");

diff --git a/features/bootstrap/Aws/Test/Integ/SmokeContext.php b/features/bootstrap/Aws/Test/Integ/SmokeContext.php
@@ -391,9 +391,9 @@ public function theResponseShouldContainA($key)
      * @Then the error code should be :errorCode
      *
      * @param string $errorCode
-     * @param PyStringNode $string
+     * @param PyStringNode|null $string
      */
-    public function theErrorCodeShouldBe($errorCode, PyStringNode $string = null)
+    public function theErrorCodeShouldBe($errorCode, PyStringNode|null $string = null)
     {
         $this->iExpectTheResponseErrorCodeToBe($errorCode);
 

diff --git a/features/bootstrap/Aws/Test/UsesServiceTrait.php b/features/bootstrap/Aws/Test/UsesServiceTrait.php
@@ -59,16 +59,16 @@ private function getTestClient($service, array $args = [])
      *
      * @param AwsClientInterface $client
      * @param Result[]|array[]   $results
-     * @param callable $onFulfilled Callback to invoke when the return value is fulfilled.
-     * @param callable $onRejected  Callback to invoke when the return value is rejected.
+     * @param callable|null      $onFulfilled Callback to invoke when the return value is fulfilled.
+     * @param callable|null      $onRejected  Callback to invoke when the return value is rejected.
      *
      * @return AwsClientInterface
      */
     private function addMockResults(
         AwsClientInterface $client,
         array $results,
-        callable $onFulfilled = null,
-        callable $onRejected = null
+        callable|null $onFulfilled = null,
+        callable|null $onRejected = null
     ) {
         foreach ($results as &$res) {
             if (is_array($res)) {

diff --git a/src/Api/ApiProvider.php b/src/Api/ApiProvider.php
@@ -202,10 +202,10 @@ public function __invoke($type, $service, $version)
     }
 
     /**
-     * @param string $modelsDir Directory containing service models.
-     * @param array  $manifest  The API version manifest data.
+     * @param string     $modelsDir Directory containing service models.
+     * @param array|null $manifest  The API version manifest data.
      */
-    private function __construct($modelsDir, array $manifest = null)
+    private function __construct($modelsDir, array|null $manifest = null)
     {
         $this->manifest = $manifest;
         $this->modelsDir = rtrim($modelsDir, '/');

diff --git a/src/Api/ErrorParser/AbstractErrorParser.php b/src/Api/ErrorParser/AbstractErrorParser.php
@@ -21,7 +21,7 @@ abstract class AbstractErrorParser
     /**
      * @param Service $api
      */
-    public function __construct(Service $api = null)
+    public function __construct(Service|null $api = null)
     {
         $this->api = $api;
     }
@@ -47,7 +47,7 @@ protected function extractPayload(
     protected function populateShape(
         array &$data,
         ResponseInterface $response,
-        CommandInterface $command = null
+        CommandInterface|null $command = null
     ) {
         $data['body'] = [];
 

diff --git a/src/Api/ErrorParser/JsonRpcErrorParser.php b/src/Api/ErrorParser/JsonRpcErrorParser.php
@@ -15,15 +15,15 @@ class JsonRpcErrorParser extends AbstractErrorParser
 
     private $parser;
 
-    public function __construct(Service $api = null, JsonParser $parser = null)
+    public function __construct(Service|null $api = null, JsonParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new JsonParser();
     }
 
     public function __invoke(
         ResponseInterface $response,
-        CommandInterface $command = null
+        CommandInterface|null $command = null
     ) {
         $data = $this->genericHandler($response);
 

diff --git a/src/Api/ErrorParser/RestJsonErrorParser.php b/src/Api/ErrorParser/RestJsonErrorParser.php
@@ -16,15 +16,15 @@ class RestJsonErrorParser extends AbstractErrorParser
 
     private $parser;
 
-    public function __construct(Service $api = null, JsonParser $parser = null)
+    public function __construct(Service|null $api = null, JsonParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new JsonParser();
     }
 
     public function __invoke(
         ResponseInterface $response,
-        CommandInterface $command = null
+        CommandInterface|null $command = null
     ) {
         $data = $this->genericHandler($response);
 

diff --git a/src/Api/ErrorParser/XmlErrorParser.php b/src/Api/ErrorParser/XmlErrorParser.php
@@ -17,15 +17,15 @@ class XmlErrorParser extends AbstractErrorParser
 
     protected $parser;
 
-    public function __construct(Service $api = null, XmlParser $parser = null)
+    public function __construct(Service|null $api = null, XmlParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new XmlParser();
     }
 
     public function __invoke(
         ResponseInterface $response,
-        CommandInterface $command = null
+        CommandInterface|null $command = null
     ) {
         $code = (string) $response->getStatusCode();
 

diff --git a/src/Api/Parser/JsonRpcParser.php b/src/Api/Parser/JsonRpcParser.php
@@ -17,10 +17,10 @@ class JsonRpcParser extends AbstractParser
     use PayloadParserTrait;
 
     /**
-     * @param Service    $api    Service description
-     * @param JsonParser $parser JSON body builder
+     * @param Service         $api    Service description
+     * @param JsonParser|null $parser JSON body builder
      */
-    public function __construct(Service $api, JsonParser $parser = null)
+    public function __construct(Service $api, JsonParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new JsonParser();

diff --git a/src/Api/Parser/QueryParser.php b/src/Api/Parser/QueryParser.php
@@ -19,15 +19,15 @@ class QueryParser extends AbstractParser
     private $honorResultWrapper;
 
     /**
-     * @param Service   $api                Service description
-     * @param XmlParser $xmlParser          Optional XML parser
-     * @param bool      $honorResultWrapper Set to false to disable the peeling
+     * @param Service        $api                Service description
+     * @param XmlParser|null $xmlParser          Optional XML parser
+     * @param bool           $honorResultWrapper Set to false to disable the peeling
      *                                      back of result wrappers from the
      *                                      output structure.
      */
     public function __construct(
         Service $api,
-        XmlParser $xmlParser = null,
+        XmlParser|null $xmlParser = null,
         $honorResultWrapper = true
     ) {
         parent::__construct($api);

diff --git a/src/Api/Parser/RestJsonParser.php b/src/Api/Parser/RestJsonParser.php
@@ -14,10 +14,10 @@ class RestJsonParser extends AbstractRestParser
     use PayloadParserTrait;
 
     /**
-     * @param Service    $api    Service description
-     * @param JsonParser $parser JSON body builder
+     * @param Service         $api    Service description
+     * @param JsonParser|null $parser JSON body builder
      */
-    public function __construct(Service $api, JsonParser $parser = null)
+    public function __construct(Service $api, JsonParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new JsonParser();

diff --git a/src/Api/Parser/RestXmlParser.php b/src/Api/Parser/RestXmlParser.php
@@ -14,10 +14,10 @@ class RestXmlParser extends AbstractRestParser
     use PayloadParserTrait;
 
     /**
-     * @param Service   $api    Service description
-     * @param XmlParser $parser XML body parser
+     * @param Service        $api    Service description
+     * @param XmlParser|null $parser XML body parser
      */
-    public function __construct(Service $api, XmlParser $parser = null)
+    public function __construct(Service $api, XmlParser|null $parser = null)
     {
         parent::__construct($api);
         $this->parser = $parser ?: new XmlParser();

diff --git a/src/Api/Serializer/JsonRpcSerializer.php b/src/Api/Serializer/JsonRpcSerializer.php
@@ -29,14 +29,14 @@ class JsonRpcSerializer
     private $contentType;
 
     /**
-     * @param Service  $api           Service description
-     * @param string   $endpoint      Endpoint to connect to
-     * @param JsonBody $jsonFormatter Optional JSON formatter to use
+     * @param Service       $api           Service description
+     * @param string        $endpoint      Endpoint to connect to
+     * @param JsonBody|null $jsonFormatter Optional JSON formatter to use
      */
     public function __construct(
         Service $api,
         $endpoint,
-        JsonBody $jsonFormatter = null
+        JsonBody|null $jsonFormatter = null
     ) {
         $this->endpoint = $endpoint;
         $this->api = $api;

diff --git a/src/Api/Serializer/QuerySerializer.php b/src/Api/Serializer/QuerySerializer.php
@@ -24,7 +24,7 @@ class QuerySerializer
     public function __construct(
         Service $api,
         $endpoint,
-        callable $paramBuilder = null
+        callable|null $paramBuilder = null
     ) {
         $this->api = $api;
         $this->endpoint = $endpoint;

diff --git a/src/Api/Serializer/RestJsonSerializer.php b/src/Api/Serializer/RestJsonSerializer.php
@@ -17,14 +17,14 @@ class RestJsonSerializer extends RestSerializer
     private $contentType;
 
     /**
-     * @param Service  $api           Service API description
-     * @param string   $endpoint      Endpoint to connect to
-     * @param JsonBody $jsonFormatter Optional JSON formatter to use
+     * @param Service       $api           Service API description
+     * @param string        $endpoint      Endpoint to connect to
+     * @param JsonBody|null $jsonFormatter Optional JSON formatter to use
      */
     public function __construct(
         Service $api,
         $endpoint,
-        JsonBody $jsonFormatter = null
+        JsonBody|null $jsonFormatter = null
     ) {
         parent::__construct($api, $endpoint);
         $this->contentType = JsonBody::getContentType($api);

diff --git a/src/Api/Serializer/RestXmlSerializer.php b/src/Api/Serializer/RestXmlSerializer.php
@@ -13,14 +13,14 @@ class RestXmlSerializer extends RestSerializer
     private $xmlBody;
 
     /**
-     * @param Service $api      Service API description
-     * @param string  $endpoint Endpoint to connect to
-     * @param XmlBody $xmlBody  Optional XML formatter to use
+     * @param Service      $api      Service API description
+     * @param string       $endpoint Endpoint to connect to
+     * @param XmlBody|null $xmlBody  Optional XML formatter to use
      */
     public function __construct(
         Service $api,
         $endpoint,
-        XmlBody $xmlBody = null
+        XmlBody|null $xmlBody = null
     ) {
         parent::__construct($api, $endpoint);
         $this->xmlBody = $xmlBody ?: new XmlBody($api);

diff --git a/src/Api/Service.php b/src/Api/Service.php
@@ -114,7 +114,7 @@ public static function createSerializer(Service $api, $endpoint)
      * @return callable
      * @throws \UnexpectedValueException
      */
-    public static function createErrorParser($protocol, Service $api = null)
+    public static function createErrorParser($protocol, Service|null $api = null)
     {
         static $mapping = [
             'json'      => ErrorParser\JsonRpcErrorParser::class,

diff --git a/src/Api/Validator.php b/src/Api/Validator.php
@@ -20,12 +20,12 @@ class Validator
     ];
 
     /**
-     * @param array $constraints Associative array of constraints to enforce.
-     *                           Accepts the following keys: "required", "min",
-     *                           "max", and "pattern". If a key is not
-     *                           provided, the constraint will assume false.
+     * @param array|null $constraints Associative array of constraints to enforce.
+     *                                Accepts the following keys: "required", "min",
+     *                                "max", and "pattern". If a key is not
+     *                                provided, the constraint will assume false.
      */
-    public function __construct(array $constraints = null)
+    public function __construct(array|null $constraints = null)
     {
         static $assumedFalseValues = [
             'required' => false,

diff --git a/src/Auth/AuthSchemeResolver.php b/src/Auth/AuthSchemeResolver.php
@@ -37,7 +37,7 @@ class AuthSchemeResolver implements AuthSchemeResolverInterface
 
     public function __construct(
         callable $credentialProvider,
-        callable $tokenProvider = null,
+        callable|null $tokenProvider = null,
         array $authSchemeMap = []
     ){
         $this->credentialProvider = $credentialProvider;

diff --git a/src/CloudSearchDomain/CloudSearchDomainClient.php b/src/CloudSearchDomain/CloudSearchDomainClient.php
@@ -51,7 +51,7 @@ private function searchByPost()
         return static function (callable $handler) {
             return function (
                 CommandInterface $c,
-                RequestInterface $r = null
+                RequestInterface|null $r = null
             ) use ($handler) {
                 if ($c->getName() !== 'Search') {
                     return $handler($c, $r);

diff --git a/src/Command.php b/src/Command.php
@@ -22,11 +22,11 @@ class Command implements CommandInterface
      *
      * - @http: (array) Associative array of transfer options.
      *
-     * @param string      $name           Name of the command
-     * @param array       $args           Arguments to pass to the command
-     * @param HandlerList $list           Handler list
+     * @param string           $name           Name of the command
+     * @param array            $args           Arguments to pass to the command
+     * @param HandlerList|null $list           Handler list
      */
-    public function __construct($name, array $args = [], HandlerList $list = null)
+    public function __construct($name, array $args = [], HandlerList|null $list = null)
     {
         $this->name = $name;
         $this->data = $args;

diff --git a/src/EndpointV2/EndpointV2Middleware.php b/src/EndpointV2/EndpointV2Middleware.php
@@ -77,7 +77,7 @@ public function __construct(
         EndpointProviderV2 $endpointProvider,
         Service $api,
         array $args,
-        callable $credentialProvider = null
+        callable|null $credentialProvider = null
     )
     {
         $this->nextHandler = $nextHandler;

diff --git a/src/Exception/AwsException.php b/src/Exception/AwsException.php
@@ -42,13 +42,13 @@ class AwsException extends \RuntimeException implements
      * @param string           $message Exception message
      * @param CommandInterface $command
      * @param array            $context Exception context
-     * @param \Exception       $previous  Previous exception (if any)
+     * @param \Exception|null  $previous  Previous exception (if any)
      */
     public function __construct(
         $message,
         CommandInterface $command,
         array $context = [],
-        \Exception $previous = null
+        \Exception|null $previous = null
     ) {
         $this->data = isset($context['body']) ? $context['body'] : [];
         $this->command = $command;

diff --git a/src/Exception/CouldNotCreateChecksumException.php b/src/Exception/CouldNotCreateChecksumException.php
@@ -9,7 +9,7 @@ class CouldNotCreateChecksumException extends \RuntimeException implements
 {
     use HasMonitoringEventsTrait;
 
-    public function __construct($algorithm, \Exception $previous = null)
+    public function __construct($algorithm, \Exception|null $previous = null)
     {
         $prefix = $algorithm === 'md5' ? "An" : "A";
         parent::__construct("{$prefix} {$algorithm} checksum could not be "

diff --git a/src/Glacier/GlacierClient.php b/src/Glacier/GlacierClient.php
@@ -124,7 +124,7 @@ private function getChecksumsMiddleware()
         return function (callable $handler) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                RequestInterface|null $request = null
             ) use ($handler) {
                 // Accept "ContentSHA256" with a lowercase "c" to match other Glacier params.
                 if (!$command['ContentSHA256'] && $command['contentSHA256']) {
@@ -195,7 +195,7 @@ private function getApiVersionMiddleware()
         return function (callable $handler) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                RequestInterface|null $request = null
             ) use ($handler) {
                 return $handler($command, $request->withHeader(
                     'x-amz-glacier-version',

diff --git a/src/Handler/GuzzleV5/GuzzleHandler.php b/src/Handler/GuzzleV5/GuzzleHandler.php
@@ -44,7 +44,7 @@ class GuzzleHandler
     /**
      * @param ClientInterface $client
      */
-    public function __construct(ClientInterface $client = null)
+    public function __construct(ClientInterface|null $client = null)
     {
         $this->client = $client ?: new Client();
     }