fix: remove implicit null, add php 8.4 (#599)

Author: bshaffer

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
                 extensions: [""]
                 tools: [""]
                 composerflags: [""]

src/ApiException.php

@@ -61,7 +61,7 @@ class ApiException extends Exception
     public function __construct(
         string $message,
         int $code,
-        string $status = null,
+        ?string $status = null,
         array $optionalArgs = []
     ) {
         $optionalArgs += [
@@ -162,8 +162,8 @@ public static function createFromStdClass(stdClass $status)
     public static function createFromApiResponse(
         $basicMessage,
         $rpcCode,
-        array $metadata = null,
-        Exception $previous = null
+        ?array $metadata = null,
+        ?Exception $previous = null
     ) {
         return self::create(
             $basicMessage,
@@ -186,8 +186,8 @@ public static function createFromApiResponse(
     public static function createFromRestApiResponse(
         $basicMessage,
         $rpcCode,
-        array $metadata = null,
-        Exception $previous = null
+        ?array $metadata = null,
+        ?Exception $previous = null
     ) {
         return self::create(
             $basicMessage,
@@ -243,7 +243,7 @@ private static function create(
         int $rpcCode,
         $metadata,
         array $decodedMetadata,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $containsErrorInfo = self::containsErrorInfo($decodedMetadata);
         $rpcStatus = ApiStatus::statusFromRpcCode($rpcCode);

src/ApiKeyHeaderCredentials.php

@@ -47,7 +47,7 @@ class ApiKeyHeaderCredentials implements HeaderCredentialsInterface, GetQuotaPro
      * @param string|null $quotaProject The quota project associated with the API key.
      * @throws ValidationException
      */
-    public function __construct(string $apiKey, string $quotaProject = null)
+    public function __construct(string $apiKey, ?string $quotaProject = null)
     {
         if (empty($apiKey)) {
             throw new ValidationException('API key cannot be empty');

src/Call.php

@@ -61,7 +61,7 @@ class Call
      */
     public function __construct(
         string $method,
-        string $decodeType = null,
+        ?string $decodeType = null,
         $message = null,
         $descriptor = [],
         int $callType = Call::UNARY_CALL

src/CredentialsWrapper.php

@@ -75,7 +75,7 @@ class CredentialsWrapper implements HeaderCredentialsInterface, ProjectIdProvide
      */
     public function __construct(
         FetchAuthTokenInterface $credentialsFetcher,
-        callable $authHttpHandler = null,
+        ?callable $authHttpHandler = null,
         string $universeDomain = GetUniverseDomainInterface::DEFAULT_UNIVERSE_DOMAIN
     ) {
         $this->credentialsFetcher = $credentialsFetcher;
@@ -200,7 +200,7 @@ public function getQuotaProject(): ?string
         return null;
     }
 
-    public function getProjectId(callable $httpHandler = null): ?string
+    public function getProjectId(?callable $httpHandler = null): ?string
     {
         // Ensure that FetchAuthTokenCache does not throw an exception
         if ($this->credentialsFetcher instanceof FetchAuthTokenCache
@@ -317,12 +317,12 @@ private function shouldCheckUniverseDomain(): bool
      * @throws ValidationException
      */
     private static function buildApplicationDefaultCredentials(
-        array $scopes = null,
-        callable $authHttpHandler = null,
-        array $authCacheOptions = null,
-        CacheItemPoolInterface $authCache = null,
+        ?array $scopes = null,
+        ?callable $authHttpHandler = null,
+        ?array $authCacheOptions = null,
+        ?CacheItemPoolInterface $authCache = null,
         $quotaProject = null,
-        array $defaultScopes = null
+        ?array $defaultScopes = null
     ) {
         try {
             return ApplicationDefaultCredentials::getCredentials(

src/GapicClientTrait.php

@@ -337,7 +337,7 @@ private function createTransport(
         string $apiEndpoint,
         $transport,
         $transportConfig,
-        callable $clientCertSource = null,
+        ?callable $clientCertSource = null,
         bool $hasEmulator = false
     ) {
         if (!is_string($transport)) {
@@ -536,7 +536,7 @@ private function startAsyncCall(
      */
     private function startApiCall(
         string $methodName,
-        Message $request = null,
+        ?Message $request = null,
         array $optionalArgs = []
     ) {
         $methodDescriptors = $this->validateCallConfig($methodName);
@@ -598,9 +598,9 @@ private function startCall(
         string $methodName,
         string $decodeType,
         array $optionalArgs = [],
-        Message $request = null,
+        ?Message $request = null,
         int $callType = Call::UNARY_CALL,
-        string $interfaceName = null
+        ?string $interfaceName = null
     ) {
         $optionalArgs = $this->configureCallOptions($optionalArgs);
         $callStack = $this->createCallStack(
@@ -752,8 +752,8 @@ private function startOperationsCall(
         array $optionalArgs,
         Message $request,
         $client,
-        string $interfaceName = null,
-        string $operationClass = null
+        ?string $interfaceName = null,
+        ?string $operationClass = null
     ) {
         $optionalArgs = $this->configureCallOptions($optionalArgs);
         $callStack = $this->createCallStack(
@@ -808,7 +808,7 @@ private function getPagedListResponse(
         array $optionalArgs,
         string $decodeType,
         Message $request,
-        string $interfaceName = null
+        ?string $interfaceName = null
     ) {
         return $this->getPagedListResponseAsync(
             $methodName,
@@ -833,7 +833,7 @@ private function getPagedListResponseAsync(
         array $optionalArgs,
         string $decodeType,
         Message $request,
-        string $interfaceName = null
+        ?string $interfaceName = null
     ) {
         $optionalArgs = $this->configureCallOptions($optionalArgs);
         $callStack = $this->createCallStack(
@@ -864,7 +864,7 @@ private function getPagedListResponseAsync(
      *
      * @return string
      */
-    private function buildMethod(string $interfaceName = null, string $methodName = null)
+    private function buildMethod(?string $interfaceName = null, ?string $methodName = null)
     {
         return sprintf(
             '%s/%s',
@@ -879,7 +879,7 @@ private function buildMethod(string $interfaceName = null, string $methodName =
      *
      * @return array
      */
-    private function buildRequestParamsHeader(array $headerParams, Message $request = null)
+    private function buildRequestParamsHeader(array $headerParams, ?Message $request = null)
     {
         $headers = [];
 

src/Page.php

@@ -110,7 +110,7 @@ public function getNextPageToken()
      * @throws ApiException if the call to fetch the next page fails.
      * @return Page
      */
-    public function getNextPage(int $pageSize = null)
+    public function getNextPage(?int $pageSize = null)
     {
         if (!$this->hasNextPage()) {
             throw new ValidationException(

src/PathTemplate.php

@@ -54,7 +54,7 @@ class PathTemplate implements ResourceTemplateInterface
      * @param string $path A path template string
      * @throws ValidationException When $path cannot be parsed into a valid PathTemplate
      */
-    public function __construct(string $path = null)
+    public function __construct(?string $path = null)
     {
         if (empty($path)) {
             throw new ValidationException('Cannot construct PathTemplate from empty string');

src/RequestBuilder.php

@@ -233,8 +233,8 @@ private function buildBindings(array $placeholders, Message $message)
         foreach ($placeholders as $placeholder => $metadata) {
             $value = array_reduce(
                 $metadata['getters'],
-                function (Message $result = null, $getter) {
-                    if ($result) {
+                function (?Message $result = null, $getter = null) {
+                    if ($result && $getter) {
                         return $result->$getter();
                     }
                 },

src/ResourceHelperTrait.php

@@ -82,7 +82,7 @@ private static function getPathTemplate(string $key)
         return self::$templateMap[$key] ?? null;
     }
 
-    private static function parseFormattedName(string $formattedName, string $template = null): array
+    private static function parseFormattedName(string $formattedName, ?string $template = null): array
     {
         if (is_null(self::$templateMap)) {
             self::registerPathTemplates();