[php-*] Explicitly declare nullable parameters (#20524)

* [php-nextgen] Explicitly declare nullable parameters explicitly

* Fix some deprecation warnings in other php generators

* [php-nextgen] Fix PHP 8.4 deprecation warnings with nullable/optional array parameters

Author: JulianVennen

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpNextgenClientCodegen.java

@@ -211,15 +211,16 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
             }
 
             for (CodegenParameter param : operation.allParams) {
+                String paramType;
                 if (param.isArray || param.isMap) {
-                    param.vendorExtensions.putIfAbsent("x-php-param-type", "array");
+                    paramType = "array";
                 } else {
-                    String paramType = param.dataType;
-                    if ((!param.required || param.isNullable) && !paramType.equals("mixed")) { // optional or nullable but not mixed
-                        paramType = "?" + paramType;
-                    }
-                    param.vendorExtensions.putIfAbsent("x-php-param-type", paramType);
+                    paramType = param.dataType;
+                }
+                if ((!param.required || param.isNullable) && !paramType.equals("mixed")) { // optional or nullable but not mixed
+                    paramType = "?" + paramType;
                 }
+                param.vendorExtensions.putIfAbsent("x-php-param-type", paramType);
             }
         }
 

modules/openapi-generator/src/main/resources/php-dt-modern/ApiClientFactory.php.mustache

@@ -16,7 +16,7 @@ class ApiClientFactory implements PM\ServiceFactoryInterface
         $this->configKey = $configKey;
     }
 
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): ApiClient
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): ApiClient
     {
         $config = new OAGAC\ApiClientOptions(\array_merge($this->getServiceConfig($container), $options ?? []));
         return new ApiClient(

modules/openapi-generator/src/main/resources/php-dt/ApiClientFactory.php.mustache

@@ -16,7 +16,7 @@ class ApiClientFactory implements PM\ServiceFactoryInterface
         $this->configKey = $configKey;
     }
 
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): ApiClient
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): ApiClient
     {
         $config = new OAGAC\ApiClientOptions(\array_merge($this->getServiceConfig($container), $options ?? []));
         return new ApiClient(

modules/openapi-generator/src/main/resources/php-mezzio-ph-modern/Factory.php.mustache

@@ -21,7 +21,7 @@ use Laminas\Stratigility\MiddlewarePipe;
 
 class Factory implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Application
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Application
     {
         $errorMiddleware = self::getErrorMiddleware($container);
         $pipeline = new MiddlewarePipe();

modules/openapi-generator/src/main/resources/php-mezzio-ph/Factory.php.mustache

@@ -21,7 +21,7 @@ use Laminas\Stratigility\MiddlewarePipe;
 
 class Factory implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Application
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Application
     {
         $errorMiddleware = self::getErrorMiddleware($container);
         $pipeline = new MiddlewarePipe();

modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache

@@ -498,7 +498,7 @@ class Configuration
     * @param array|null $variables    hash of variable and the corresponding value (optional)
     * @return string URL based on host settings
     */
-    public static function getHostString(array $hostSettings, int $hostIndex, array $variables = null): string
+    public static function getHostString(array $hostSettings, int $hostIndex, ?array $variables = null): string
     {
         if (null === $variables) {
             $variables = [];

modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache

@@ -56,7 +56,7 @@ class ObjectSerializer
      *
      * @return scalar|object|array|null serialized form of $data
      */
-    public static function sanitizeForSerialization(mixed $data, string $type = null, string $format = null): mixed
+    public static function sanitizeForSerialization(mixed $data, ?string $type = null, ?string $format = null): mixed
     {
         if (is_scalar($data) || null === $data) {
             return $data;
@@ -388,7 +388,7 @@ class ObjectSerializer
      *
      * @return mixed a single or an array of $class instances
      */
-    public static function deserialize(mixed $data, string $class, array $httpHeaders = null): mixed
+    public static function deserialize(mixed $data, string $class, ?array $httpHeaders = null): mixed
     {
         if (null === $data) {
             return null;

modules/openapi-generator/src/main/resources/php-nextgen/api.mustache

@@ -76,9 +76,9 @@ use {{invokerPackage}}\ObjectSerializer;
      * @param int                  $hostIndex (Optional) host index to select the list of hosts if defined in the OpenAPI spec
      */
     public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
+        ?ClientInterface $client = null,
+        ?Configuration $config = null,
+        ?HeaderSelector $selector = null,
         int $hostIndex = 0
     ) {
         $this->client = $client ?: new Client();

modules/openapi-generator/src/main/resources/php-nextgen/model_generic.mustache

@@ -245,7 +245,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
      *
      * @param array $data Associated array of property values initializing the model
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         {{#discriminator}}
         // Initialize discriminator property with the model name.

samples/client/echo_api/php-nextgen-streaming/src/Api/AuthApi.php

@@ -87,9 +87,9 @@ class AuthApi
      * @param int                  $hostIndex (Optional) host index to select the list of hosts if defined in the OpenAPI spec
      */
     public function __construct(
-        ClientInterface $client = null,
-        Configuration $config = null,
-        HeaderSelector $selector = null,
+        ?ClientInterface $client = null,
+        ?Configuration $config = null,
+        ?HeaderSelector $selector = null,
         int $hostIndex = 0
     ) {
         $this->client = $client ?: new Client();