Build updated dependencies for PHP 8.4

Author: bryannielsen

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - Filesystem Adapter for integrating with Backblaze B2 service
+- Support for PHP 8.4
 
 ### Fixed
 

vendor-build/aws/aws-crt-php/format-check.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+import argparse
+import os
+from pathlib import Path
+import re
+from subprocess import list2cmdline, run
+from tempfile import NamedTemporaryFile
+
+CLANG_FORMAT_VERSION = '18.1.6'
+
+INCLUDE_REGEX = re.compile(r'^ext/.*\.(c|h|inl)$')
+EXCLUDE_REGEX = re.compile(r'^$')
+
+arg_parser = argparse.ArgumentParser(description="Check with clang-format")
+arg_parser.add_argument('-i', '--inplace-edit', action='store_true',
+                        help="Edit files inplace")
+args = arg_parser.parse_args()
+
+os.chdir(Path(__file__).parent)
+
+# create file containing list of all files to format
+filepaths_file = NamedTemporaryFile(delete=False)
+for dirpath, dirnames, filenames in os.walk('.'):
+    for filename in filenames:
+        # our regexes expect filepath to use forward slash
+        filepath = Path(dirpath, filename).as_posix()
+        if not INCLUDE_REGEX.match(filepath):
+            continue
+        if EXCLUDE_REGEX.match(filepath):
+            continue
+
+        filepaths_file.write(f"{filepath}\n".encode())
+filepaths_file.close()
+
+# use pipx to run clang-format from PyPI
+# this is a simple way to run the same clang-format version regardless of OS
+cmd = ['pipx', 'run', f'clang-format=={CLANG_FORMAT_VERSION}',
+       f'--files={filepaths_file.name}']
+if args.inplace_edit:
+    cmd += ['-i']
+else:
+    cmd += ['--Werror', '--dry-run']
+
+print(f"{Path.cwd()}$ {list2cmdline(cmd)}")
+if run(cmd).returncode:
+    exit(1)

vendor-build/aws/aws-crt-php/src/AWS/CRT/Auth/AwsCredentials.php

@@ -39,10 +39,10 @@ function __construct(array $options = [])
         $this->secret_access_key = $options->secret_access_key->asString();
         $this->session_token = $options->session_token ? $options->session_token->asString() : null;
         $this->expiration_timepoint_seconds = $options->expiration_timepoint_seconds->asInt();
-        if (\strlen($this->access_key_id) == 0) {
+        if (strlen($this->access_key_id) == 0) {
             throw new \InvalidArgumentException("access_key_id must be provided");
         }
-        if (\strlen($this->secret_access_key) == 0) {
+        if (strlen($this->secret_access_key) == 0) {
             throw new \InvalidArgumentException("secret_access_key must be provided");
         }
         $creds_options = self::$crt->aws_credentials_options_new();

vendor-build/aws/aws-crt-php/src/AWS/CRT/Auth/Signable.php

@@ -12,7 +12,7 @@ class Signable extends NativeResource
 {
     public static function fromHttpRequest($http_message)
     {
-        return new Signable(function () use($http_message) {
+        return new Signable(function () use ($http_message) {
             return self::$crt->signable_new_from_http_request($http_message->native);
         });
     }
@@ -21,13 +21,13 @@ public static function fromChunk($chunk_stream, $previous_signature = "")
         if (!$chunk_stream instanceof InputStream) {
             $chunk_stream = new InputStream($chunk_stream);
         }
-        return new Signable(function () use($chunk_stream, $previous_signature) {
+        return new Signable(function () use ($chunk_stream, $previous_signature) {
             return self::$crt->signable_new_from_chunk($chunk_stream->native, $previous_signature);
         });
     }
     public static function fromCanonicalRequest($canonical_request)
     {
-        return new Signable(function () use($canonical_request) {
+        return new Signable(function () use ($canonical_request) {
             return self::$crt->signable_new_from_canonical_request($canonical_request);
         });
     }

vendor-build/aws/aws-crt-php/src/AWS/CRT/Auth/Signing.php

@@ -11,7 +11,7 @@ abstract class Signing extends NativeResource
 {
     static function signRequestAws($signable, $signing_config, $on_complete)
     {
-        return self::$crt->sign_request_aws($signable->native, $signing_config->native, function ($result, $error_code) use($on_complete) {
+        return self::$crt->sign_request_aws($signable->native, $signing_config->native, function ($result, $error_code) use ($on_complete) {
             $signing_result = SigningResult::fromNative($result);
             $on_complete($signing_result, $error_code);
         }, null);

vendor-build/aws/aws-crt-php/src/AWS/CRT/Auth/SigningConfigAWS.php

@@ -12,7 +12,7 @@ class SigningConfigAWS extends NativeResource
 {
     public static function defaults()
     {
-        return ['algorithm' => SigningAlgorithm::SIGv4, 'signature_type' => SignatureType::HTTP_REQUEST_HEADERS, 'credentials_provider' => null, 'region' => null, 'service' => null, 'use_double_uri_encode' => \false, 'should_normalize_uri_path' => \false, 'omit_session_token' => \false, 'signed_body_value' => null, 'signed_body_header_type' => SignedBodyHeaderType::NONE, 'expiration_in_seconds' => 0, 'date' => \time(), 'should_sign_header' => null];
+        return ['algorithm' => SigningAlgorithm::SIGv4, 'signature_type' => SignatureType::HTTP_REQUEST_HEADERS, 'credentials_provider' => null, 'region' => null, 'service' => null, 'use_double_uri_encode' => \false, 'should_normalize_uri_path' => \false, 'omit_session_token' => \false, 'signed_body_value' => null, 'signed_body_header_type' => SignedBodyHeaderType::NONE, 'expiration_in_seconds' => 0, 'date' => time(), 'should_sign_header' => null];
     }
     private $options;
     public function __construct(array $options = [])

vendor-build/aws/aws-crt-php/src/AWS/CRT/CRT.php

@@ -20,7 +20,7 @@ final class CRT
     private static $refcount = 0;
     function __construct()
     {
-        if (\is_null(self::$impl)) {
+        if (is_null(self::$impl)) {
             try {
                 self::$impl = new Extension();
             } catch (RuntimeException $rex) {
@@ -40,7 +40,7 @@ function __destruct()
      */
     public static function isLoaded()
     {
-        return !\is_null(self::$impl);
+        return !is_null(self::$impl);
     }
     /**
      * @return bool whether or not the CRT is available via one of the possible backends

vendor-build/aws/aws-crt-php/src/AWS/CRT/HTTP/Headers.php

@@ -27,14 +27,14 @@ public static function unmarshall($buf)
     {
         $strings = Encoding::readStrings($buf);
         $headers = [];
-        for ($idx = 0; $idx < \count($strings);) {
+        for ($idx = 0; $idx < count($strings);) {
             $headers[$strings[$idx++]] = $strings[$idx++];
         }
         return new Headers($headers);
     }
     public function count()
     {
-        return \count($this->headers);
+        return count($this->headers);
     }
     public function get($header)
     {

vendor-build/aws/aws-crt-php/src/AWS/CRT/HTTP/Message.php

@@ -44,16 +44,16 @@ protected static function _unmarshall($buf, $class = Message::class)
     {
         $method = Encoding::readString($buf);
         $path_and_query = Encoding::readString($buf);
-        $parts = \explode("?", $path_and_query, 2);
+        $parts = explode("?", $path_and_query, 2);
         $path = isset($parts[0]) ? $parts[0] : "";
         $query = isset($parts[1]) ? $parts[1] : "";
         $headers = Headers::unmarshall($buf);
         // Turn query params back into a dictionary
-        if (\strlen($query)) {
-            $query = \rawurldecode($query);
-            $query = \explode("&", $query);
-            $query = \array_reduce($query, function ($params, $pair) {
-                list($param, $value) = \explode("=", $pair, 2);
+        if (strlen($query)) {
+            $query = rawurldecode($query);
+            $query = explode("&", $query);
+            $query = array_reduce($query, function ($params, $pair) {
+                list($param, $value) = explode("=", $pair, 2);
                 $params[$param] = $value;
                 return $params;
             }, []);
@@ -67,11 +67,11 @@ public function pathAndQuery()
         $path = $this->path;
         $queries = [];
         foreach ($this->query as $param => $value) {
-            $queries[] = \urlencode($param) . "=" . \urlencode($value);
+            $queries[] = urlencode($param) . "=" . urlencode($value);
         }
-        $query = \implode("&", $queries);
-        if (\strlen($query)) {
-            $path = \implode("?", [$path, $query]);
+        $query = implode("&", $queries);
+        if (strlen($query)) {
+            $path = implode("?", [$path, $query]);
         }
         return $path;
     }

vendor-build/aws/aws-crt-php/src/AWS/CRT/HTTP/Request.php

@@ -13,8 +13,8 @@ class Request extends Message
     public function __construct($method, $path, $query = [], $headers = [], $body_stream = null)
     {
         parent::__construct($method, $path, $query, $headers);
-        if (!\is_null($body_stream) && !$body_stream instanceof InputStream) {
-            throw InvalidArgumentException('body_stream must be an instance of ' . InputStream::class);
+        if (!is_null($body_stream) && !$body_stream instanceof InputStream) {
+            throw new \InvalidArgumentException('body_stream must be an instance of ' . InputStream::class);
         }
         $this->body_stream = $body_stream;
     }