feat: add support for PHP 8.4

.github/workflows/code-standards.yml

@@ -29,7 +29,8 @@ on:
             "whitespace_after_comma_in_array": true,
             "no_whitespace_in_blank_line": true,
             "binary_operator_spaces": {"default": "at_least_single_space"},
-            "no_extra_blank_lines": true
+            "no_extra_blank_lines": true,
+            "nullable_type_declaration_for_default_null_value": true
           }
       add-rules:
         type: string

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ ubuntu-latest ]
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
         name: PHP ${{matrix.php }} Unit Test
         steps:
             - uses: actions/checkout@v4

examples/class_vars.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\ClassVars;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/class_vars.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\ClassVars;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/kitchen_sink.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\KitchenSink;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 use Google\Cloud\Dlp\V2\InspectConfig;

examples/kitchen_sink.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\KitchenSink;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/mixins.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\Mixins;
 
 use Google\Cloud\SecretManager\V1\SecretManagerServiceClient;
 use Google\Cloud\Iam\V1\Binding;

examples/mixins.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\Mixins;
 
 use Google\Cloud\Iam\V1\Binding;
 use Google\Cloud\Iam\V1\GetIamPolicyRequest;

examples/multiple_clients.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\MultipleClients;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/multiple_clients.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\MultipleClients;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/no_args.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\NoArgs;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 

examples/no_args.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\NoArgs;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\ListInfoTypesRequest;

examples/non_rpc_methods.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\NonRpcMethods;
 
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;

examples/non_rpc_methods.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\NonRpcMethods;
 
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;

examples/optional_args.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgs;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 use Google\Cloud\Dlp\V2\InspectConfig;

examples/optional_args.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgs;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/optional_args_array_keyword.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgsArrayKeyword;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 use Google\Cloud\Dlp\V2\InspectConfig;

examples/optional_args_array_keyword.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgsArrayKeyword;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/optional_args_variable.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgsVariable;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 use Google\Cloud\Dlp\V2\InspectConfig;

examples/optional_args_variable.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\OptionalArgsVariable;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/required_and_optional_args.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\RequiredAndOptionalArgs;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 use Google\Cloud\Dlp\V2\InspectConfig;

examples/required_and_optional_args.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\RequiredAndOptionalArgs;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/required_args.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\RequiredArgs;
 
 use Google\Cloud\Dlp\V2\DlpServiceClient;
 

examples/required_args.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\RequiredArgs;
 
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;
 use Google\Cloud\Dlp\V2\CreateDlpJobRequest;

examples/var_typehint.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarTypehint;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/var_typehint.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarTypehint;
 
 // new client surface doesn't exist (yet)
 use Google\ApiCore\LongRunning\OperationsClient;

examples/vars_defined_elsewhere.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarsDefinedElsewhere;
 
 // new client surface exists
 use Google\Cloud\Dlp\V2\DlpServiceClient;

examples/vars_defined_elsewhere.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarsDefinedElsewhere;
 
 // new client surface exists
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;

examples/vars_in_constructor.legacy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarsInConstructor;
 
 // new client surface exists
 use Google\Cloud\Dlp\V2\DlpServiceClient;

examples/vars_in_constructor.new.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Google\Cloud\Samples\Dlp;
+namespace Google\Cloud\Samples\VarsInConstructor;
 
 // new client surface exists
 use Google\Cloud\Dlp\V2\Client\DlpServiceClient;

src/TestUtils/CloudFunctionDeploymentTrait.php

@@ -153,7 +153,7 @@ public function getBaseUri()
      * @param int $retries the number of times to retry entry lookup
      * @param int sleep the number of seconds sleep before executing the log lookup
      */
-    private function processFunctionLogs(string $startTime, callable $process, int $retries = null, int $sleep = null)
+    private function processFunctionLogs(string $startTime, callable $process, ?int $retries = null, ?int $sleep = null)
     {
         if (empty(self::$loggingClient)) {
             self::$loggingClient = new LoggingClient([

src/TestUtils/ExponentialBackoffTrait.php

@@ -53,7 +53,7 @@ private function useDeadlineExceededBackoff($retries = null)
         });
     }
 
-    private function useBackoff($retries = null, callable $retryFunction = null)
+    private function useBackoff($retries = null, ?callable $retryFunction = null)
     {
         $backoff = new ExponentialBackoff(
             $retries ?: $this->expontentialBackoffRetryCount,

src/TestUtils/FileUtil.php

@@ -30,14 +30,14 @@ public static function randomName($length)
         return join('', $array);
     }
 
-    public static function cloneDirectoryIntoTmp($projectDir = '.', ProgressBar $progress = null)
+    public static function cloneDirectoryIntoTmp($projectDir = '.', ?ProgressBar $progress = null)
     {
         $tmpDir = sys_get_temp_dir() . '/test-' . self::randomName(8);
         self::copyDir($projectDir, $tmpDir, $progress);
         return $tmpDir;
     }
 
-    public static function copyDir($src, $dst, ProgressBar $progress = null)
+    public static function copyDir($src, $dst, ?ProgressBar $progress = null)
     {
         @mkdir($dst);
         $dir = opendir($src);

src/TestUtils/GcloudWrapper/CloudFunction.php

@@ -70,7 +70,7 @@ public function __construct(
         string $entryPoint,
         string $functionSignatureType,
         string $region,
-        string $dir = null
+        ?string $dir = null
     ) {
         $this->projectId = $projectId;
         $this->entryPoint = $entryPoint;
@@ -137,7 +137,7 @@ public function getFunctionName()
      *
      * @return bool true if deployment suceeds, false upon failure
      */
-    public function deploy(array $flags = [], string $trigger = self::DEFAULT_TRIGGER, int $retries = 3, string $channel = null)
+    public function deploy(array $flags = [], string $trigger = self::DEFAULT_TRIGGER, int $retries = 3, ?string $channel = null)
     {
         if ($this->deployed) {
             $this->errorLog('The function has already been deployed.');
@@ -237,7 +237,7 @@ public function getBaseUrl($force = false, $retries = 3)
      * @param array $args
      * @return \Symfony\Component\Process\Process
      */
-    private function gcloudCommand(array $args, string $channel = null)
+    private function gcloudCommand(array $args, ?string $channel = null)
     {
         if (!in_array($channel, [null, 'alpha', 'beta'])) {
             $this->errorLog('gcloud channel must use product (null), "alpha" or "beta". Defaulting to production.');
@@ -271,7 +271,7 @@ private function gcloudCommand(array $args, string $channel = null)
      * @return \Symfony\Component\Process\Process returns the php server process
      * @throws \Symfony\Component\Process\Exception\ProcessFailedException
      */
-    public function run(array $env = [], string $port = self::DEFAULT_PORT, string $phpBin = null)
+    public function run(array $env = [], string $port = self::DEFAULT_PORT, ?string $phpBin = null)
     {
         $this->localUri = 'localhost:' . $port;
 
@@ -306,7 +306,7 @@ public function run(array $env = [], string $port = self::DEFAULT_PORT, string $
      * @return \Symfony\Component\Process\Process returns the php server process
      * @throws \Symfony\Component\Process\Exception\ProcessFailedException
      */
-    public function runCloudEventFunction(string $port = self::DEFAULT_PORT, string $phpBin = null)
+    public function runCloudEventFunction(string $port = self::DEFAULT_PORT, ?string $phpBin = null)
     {
         return $this->run(true, $port, $phpBin);
     }

src/Utils/ExponentialBackoff.php

@@ -59,7 +59,7 @@ class ExponentialBackoff
      * @param int $retries [optional] Number of retries for a failed request.
      * @param callable $retryFunction [optional] returns bool for whether or not to retry
      */
-    public function __construct($retries = null, callable $retryFunction = null)
+    public function __construct($retries = null, ?callable $retryFunction = null)
     {
         $this->retries = $retries !== null ? (int) $retries : 3;
         $this->retryFunction = $retryFunction;

src/Utils/Flex/FlexExecCommand.php

@@ -46,7 +46,7 @@ class FlexExecCommand extends Command
     /* @var Gcloud */
     private $gcloud;
 
-    public function __construct(Gcloud $gcloud = null)
+    public function __construct(?Gcloud $gcloud = null)
     {
         parent::__construct();
         $this->gcloud = ($gcloud == null) ? new Gcloud() : $gcloud;

src/Utils/WordPress/Project.php

@@ -44,7 +44,7 @@ class Project extends BaseProject
     private $filesystem;
     private $wordPressDir;
 
-    public function __construct(InputInterface $input, OutputInterface $output, QuestionHelper $helper = null)
+    public function __construct(InputInterface $input, OutputInterface $output, ?QuestionHelper $helper = null)
     {
         $this->input = $input;
         $this->output = $output;