[php] Fix PHP generator validation for nullable required properties (#22292)

* [php] Fix null+required properties to accept null values in generated models. Also fix PHP annotations related to same.

* [php] Update samples.

Author: achton

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

@@ -284,7 +284,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
 
         {{#vars}}
         {{#required}}
-        if ($this->container['{{name}}'] === null) {
+        if ($this->container['{{name}}'] === null{{#isNullable}} && !$this->isNullableSetToNull('{{name}}'){{/isNullable}}) {
             $invalidProperties[] = "'{{name}}' can't be null";
         }
         {{/required}}
@@ -365,7 +365,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     /**
      * Gets {{name}}
      *
-     * @return {{{dataType}}}{{^required}}|null{{/required}}
+     * @return {{{dataType}}}{{^required}}|null{{/required}}{{#required}}{{#isNullable}}|null{{/isNullable}}{{/required}}
     {{#deprecated}}
      * @deprecated
     {{/deprecated}}
@@ -378,7 +378,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     /**
      * Sets {{name}}
      *
-     * @param {{{dataType}}}{{^required}}|null{{/required}} ${{name}}{{#description}} {{{.}}}{{/description}}{{^description}} {{{name}}}{{/description}}
+     * @param {{{dataType}}}{{#isNullable}}|null{{/isNullable}} ${{name}}{{#description}} {{{.}}}{{/description}}{{^description}} {{{name}}}{{/description}}
      *
      * @return self
     {{#deprecated}}

samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php

@@ -309,7 +309,7 @@ public function getMapProperty()
     /**
      * Sets map_property
      *
-     * @param array<string,string>|null $map_property map_property
+     * @param array<string,string> $map_property map_property
      *
      * @return self
      */
@@ -336,7 +336,7 @@ public function getMapOfMapProperty()
     /**
      * Sets map_of_map_property
      *
-     * @param array<string,array<string,string>>|null $map_of_map_property map_of_map_property
+     * @param array<string,array<string,string>> $map_of_map_property map_of_map_property
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/AllOfWithSingleRef.php

@@ -309,7 +309,7 @@ public function getUsername()
     /**
      * Sets username
      *
-     * @param string|null $username username
+     * @param string $username username
      *
      * @return self
      */
@@ -336,7 +336,7 @@ public function getSingleRefType()
     /**
      * Sets single_ref_type
      *
-     * @param \OpenAPI\Client\Model\SingleRefType|null $single_ref_type single_ref_type
+     * @param \OpenAPI\Client\Model\SingleRefType $single_ref_type single_ref_type
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php

@@ -342,7 +342,7 @@ public function getColor()
     /**
      * Sets color
      *
-     * @param string|null $color color
+     * @param string $color color
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php

@@ -316,7 +316,7 @@ public function getCode()
     /**
      * Sets code
      *
-     * @param int|null $code code
+     * @param int $code code
      *
      * @return self
      */
@@ -343,7 +343,7 @@ public function getType()
     /**
      * Sets type
      *
-     * @param string|null $type type
+     * @param string $type type
      *
      * @return self
      */
@@ -370,7 +370,7 @@ public function getMessage()
     /**
      * Sets message
      *
-     * @param string|null $message message
+     * @param string $message message
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php

@@ -302,7 +302,7 @@ public function getArrayArrayNumber()
     /**
      * Sets array_array_number
      *
-     * @param float[][]|null $array_array_number array_array_number
+     * @param float[][] $array_array_number array_array_number
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php

@@ -302,7 +302,7 @@ public function getArrayNumber()
     /**
      * Sets array_number
      *
-     * @param float[]|null $array_number array_number
+     * @param float[] $array_number array_number
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php

@@ -324,7 +324,7 @@ public function getArrayOfString()
     /**
      * Sets array_of_string
      *
-     * @param string[]|null $array_of_string array_of_string
+     * @param string[] $array_of_string array_of_string
      *
      * @return self
      */
@@ -358,7 +358,7 @@ public function getArrayArrayOfInteger()
     /**
      * Sets array_array_of_integer
      *
-     * @param int[][]|null $array_array_of_integer array_array_of_integer
+     * @param int[][] $array_array_of_integer array_array_of_integer
      *
      * @return self
      */
@@ -385,7 +385,7 @@ public function getArrayArrayOfModel()
     /**
      * Sets array_array_of_model
      *
-     * @param \OpenAPI\Client\Model\ReadOnlyFirst[][]|null $array_array_of_model array_array_of_model
+     * @param \OpenAPI\Client\Model\ReadOnlyFirst[][] $array_array_of_model array_array_of_model
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php

@@ -337,7 +337,7 @@ public function getSmallCamel()
     /**
      * Sets small_camel
      *
-     * @param string|null $small_camel small_camel
+     * @param string $small_camel small_camel
      *
      * @return self
      */
@@ -364,7 +364,7 @@ public function getCapitalCamel()
     /**
      * Sets capital_camel
      *
-     * @param string|null $capital_camel capital_camel
+     * @param string $capital_camel capital_camel
      *
      * @return self
      */
@@ -391,7 +391,7 @@ public function getSmallSnake()
     /**
      * Sets small_snake
      *
-     * @param string|null $small_snake small_snake
+     * @param string $small_snake small_snake
      *
      * @return self
      */
@@ -418,7 +418,7 @@ public function getCapitalSnake()
     /**
      * Sets capital_snake
      *
-     * @param string|null $capital_snake capital_snake
+     * @param string $capital_snake capital_snake
      *
      * @return self
      */
@@ -445,7 +445,7 @@ public function getScaEthFlowPoints()
     /**
      * Sets sca_eth_flow_points
      *
-     * @param string|null $sca_eth_flow_points sca_eth_flow_points
+     * @param string $sca_eth_flow_points sca_eth_flow_points
      *
      * @return self
      */
@@ -472,7 +472,7 @@ public function getAttName()
     /**
      * Sets att_name
      *
-     * @param string|null $att_name Name of the pet
+     * @param string $att_name Name of the pet
      *
      * @return self
      */

samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php

@@ -296,7 +296,7 @@ public function getDeclawed()
     /**
      * Sets declawed
      *
-     * @param bool|null $declawed declawed
+     * @param bool $declawed declawed
      *
      * @return self
      */