Finx wrong merge, add additional multi type type hint test

Author: wol-soft

src/Templates/Model.phptpl

@@ -102,7 +102,7 @@ class {{ class }} implements \PHPModelGenerator\Interfaces\JSONModelInterface
          * {% if property.getTypeHint(true) %}@return {{ property.getTypeHint(true) }}{% endif %}
          */
         public function get{{ viewHelper.ucfirst(property.getAttribute()) }}()
-            {% if property.getType(true) %}: {% if viewHelper.implicitNull(property) %}?{% endif %}{{ property.getType(true) }}{% endif %}
+            {% if property.getType(true) %}: {% if viewHelper.isPropertyNullable(property) %}?{% endif %}{{ property.getType(true) }}{% endif %}
         {
             return $this->{{ property.getAttribute() }};
         }

tests/AbstractPHPModelGeneratorTest.php

@@ -408,7 +408,7 @@ public function namespaceDataProvider(): array
      *
      * @return string
      */
-    protected function getPropertyType($object, string $property): string
+    protected function getPropertyTypeAnnotation($object, string $property): string
     {
         $matches = [];
         preg_match(
@@ -428,7 +428,7 @@ protected function getPropertyType($object, string $property): string
      *
      * @return string
      */
-    protected function getMethodReturnType($object, string $method): string
+    protected function getMethodReturnTypeAnnotation($object, string $method): string
     {
         $matches = [];
         preg_match(

tests/ComposedValue/ComposedAllOfTest.php

@@ -97,8 +97,8 @@ public function testAllOfTypePropertyHasTypeAnnotation(): void
         $object = new $className([]);
         $regexp = '/ComposedAllOfTest[\w]*_Merged_[\w]*/';
 
-        $this->assertRegExp($regexp, $this->getPropertyType($object, 'property'));
-        $this->assertRegExp($regexp, $this->getMethodReturnType($object, 'getProperty'));
+        $this->assertRegExp($regexp, $this->getPropertyTypeAnnotation($object, 'property'));
+        $this->assertRegExp($regexp, $this->getMethodReturnTypeAnnotation($object, 'getProperty'));
 
         // base class, merged property class and two classes for validating the composition components
         $this->assertCount(4, $this->getGeneratedFiles());

tests/ComposedValue/ComposedAnyOfTest.php

@@ -132,8 +132,8 @@ public function testAnyOfTypePropertyHasTypeAnnotation(
     ): void {
         $className = $this->generateClassFromFile($schema);
 
-        $this->assertRegExp($annotationPattern, $this->getPropertyType($className, 'property'));
-        $this->assertRegExp($annotationPattern, $this->getMethodReturnType($className, 'getProperty'));
+        $this->assertRegExp($annotationPattern, $this->getPropertyTypeAnnotation($className, 'property'));
+        $this->assertRegExp($annotationPattern, $this->getMethodReturnTypeAnnotation($className, 'getProperty'));
 
         $this->assertCount($generatedClasses, $this->getGeneratedFiles());
     }
@@ -143,7 +143,7 @@ public function annotationDataProvider(): array
         return [
             'Multiple scalar types (no merged property)' => [
                 'AnyOfType.json',
-                '/^string\|int\|bool\|null$/',
+                '/^null\|string\|int\|bool$/',
                 1,
             ],
             'Multiple scalar types required (no merged property)' => [
@@ -153,17 +153,17 @@ public function annotationDataProvider(): array
             ],
             'Object with scalar type (no merged property - redirect to generated object)' => [
                 'ReferencedObjectSchema.json',
-                '/^string\|ComposedAnyOfTest[\w]*Property[\w]*\|null$/',
+                '/^null\|string\|ComposedAnyOfTest[\w]*Property[\w]*$/',
                 2,
             ],
             'Multiple objects (merged property created)' => [
                 'ReferencedObjectSchema2.json',
-                '/^ComposedAnyOfTest[\w]*_Merged_[\w]*\|null$/',
+                '/^null\|ComposedAnyOfTest[\w]*_Merged_[\w]*$/',
                 4,
             ],
             'Scalar type and multiple objects (merged property created)' => [
                 'ReferencedObjectSchema3.json',
-                '/^string\|ComposedAnyOfTest[\w]*_Merged_[\w]*\|null$/',
+                '/^null\|string\|ComposedAnyOfTest[\w]*_Merged_[\w]*$/',
                 4,
             ],
         ];

tests/ComposedValue/ComposedOneOfTest.php

@@ -130,8 +130,8 @@ public function testOneOfTypePropertyHasTypeAnnotation(string $schema, string $a
         $className = $this->generateClassFromFile($schema);
 
         $object = new $className([]);
-        $this->assertRegExp($annotationPattern, $this->getPropertyType($object, 'property'));
-        $this->assertRegExp($annotationPattern, $this->getMethodReturnType($object, 'getProperty'));
+        $this->assertRegExp($annotationPattern, $this->getPropertyTypeAnnotation($object, 'property'));
+        $this->assertRegExp($annotationPattern, $this->getMethodReturnTypeAnnotation($object, 'getProperty'));
     }
 
     public function annotationDataProvider(): array

tests/Objects/MultiTypePropertyTest.php

@@ -29,6 +29,19 @@ public function testNotProvidedOptionalMultiTypePropertyIsValid(): void
         $this->assertNull($object->getProperty());
     }
 
+    /**
+     * @dataProvider implicitNullDataProvider
+     */
+    public function testMultiTypeAnnotation(bool $implicitNull): void
+    {
+        $className = $this->generateClassFromFile('MultiTypeProperty.json', null, false, $implicitNull);
+
+        $expectedTypeHint = $implicitNull ? 'null|float|string|array' : 'float|string|array';
+
+        $this->assertSame($expectedTypeHint, $this->getPropertyTypeAnnotation($className, 'property'));
+        $this->assertSame($expectedTypeHint, $this->getMethodReturnTypeAnnotation($className, 'getProperty'));
+    }
+
     /**
      * @dataProvider validValueDataProvider
      *
@@ -40,9 +53,6 @@ public function testValidProvidedValuePassesValidation($propertyValue): void
 
         $object = new $className(['property' => $propertyValue]);
         $this->assertEquals($propertyValue, $object->getProperty());
-
-        $this->assertSame('null|float|string|array', $this->getPropertyType($object, 'property'));
-        $this->assertSame('null|float|string|array', $this->getMethodReturnType($object, 'getProperty'));
     }
 
     public function validValueDataProvider(): array