Improve nullable formatting

src/Formatter/XsdTypeFormatter.php

@@ -4,14 +4,15 @@
 namespace Soap\WsdlReader\Formatter;
 
 use Soap\Engine\Metadata\Model\XsdType;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredNullableType;
 
 final class XsdTypeFormatter
 {
     public function __invoke(XsdType $xsdType): string
     {
         $meta = $xsdType->getMeta();
         $isList = $meta->isList()->unwrapOr(false) && !$meta->isAlias()->unwrapOr(false);
-        $isNullable = $meta->isNullable()->unwrapOr(false);
+        $isNullable = (new IsConsideredNullableType())($meta);
         $min = $meta->minOccurs()->unwrapOr(1);
         $max = $meta->maxOccurs()->unwrapOr(1);
 

src/Metadata/Predicate/IsConsideredNullableType.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace Soap\WsdlReader\Metadata\Predicate;
+
+use Soap\Engine\Metadata\Model\TypeMeta;
+
+final class IsConsideredNullableType
+{
+    public function __invoke(TypeMeta $meta): bool
+    {
+        if ($meta->isNullable()->unwrapOr(false)) {
+            return true;
+        }
+
+        if ($meta->isNil()->unwrapOr(false)) {
+            return true;
+        }
+
+        if ($meta->isAttribute()->unwrapOr(false)) {
+            // If no 'use' is defined, XSD attributes get an implicit default "optional" value
+            if ($meta->use()->unwrapOr('optional') === 'optional') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/Metadata/Predicate/IsConsideredScalarType.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Soap\WsdlReader\Metadata\Predicate;
+
+use Soap\Engine\Metadata\Model\TypeMeta;
+
+final class IsConsideredScalarType
+{
+    public function __invoke(TypeMeta $meta): bool
+    {
+        return $meta->isSimple()->unwrapOr(false)
+            || $meta->isAttribute()->unwrapOr(false);
+    }
+}

tests/PhpCompatibility/schema037.phpt

@@ -20,5 +20,5 @@ Methods:
 Types:
   > http://test-uri/:testType {
     string $str
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema038.phpt

@@ -21,5 +21,5 @@ Methods:
 Types:
   > http://test-uri/:testType {
     string $str
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema039.phpt

@@ -23,5 +23,5 @@ Methods:
 Types:
   > http://test-uri/:testType {
     string $str
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema040.phpt

@@ -24,5 +24,5 @@ Methods:
 Types:
   > http://test-uri/:testType {
     string $str
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema042.phpt

@@ -21,5 +21,5 @@ Methods:
 Types:
   > http://test-uri/:testType extends int {
     int $_
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema043.phpt

@@ -28,10 +28,10 @@ Methods:
 Types:
   > http://test-uri/:testType2 extends int {
     int $_
-    @int $int
+    @?int $int
   }
   > http://test-uri/:testType extends testType2 {
     int $_
-    @int $int
-    @int $int2
+    @?int $int
+    @?int $int2
   }

tests/PhpCompatibility/schema044.phpt

@@ -21,5 +21,5 @@ Methods:
 Types:
   > http://test-uri/:testType extends int {
     int $_
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema045.phpt

@@ -28,10 +28,10 @@ Methods:
 Types:
   > http://test-uri/:testType2 extends int {
     int $_
-    @int $int
+    @?int $int
   }
   > http://test-uri/:testType extends testType2 {
     int $_
-    @int $int
-    @int $int2
+    @?int $int
+    @?int $int2
   }

tests/PhpCompatibility/schema046.phpt

@@ -28,10 +28,10 @@ Methods:
 Types:
   > http://test-uri/:testType2 extends int {
     int $_
-    @int $int
+    @?int $int
   }
   > http://test-uri/:testType extends testType2 {
     int $_
-    @int $int
-    @int $int2
+    @?int $int
+    @?int $int2
   }

tests/PhpCompatibility/schema047.phpt

@@ -29,5 +29,5 @@ Types:
   }
   > http://test-uri/:testType extends testType2 {
     int $int
-    @int $int2
+    @?int $int2
   }

tests/PhpCompatibility/schema048.phpt

@@ -28,10 +28,10 @@ Methods:
 Types:
   > http://test-uri/:testType2 extends int {
     int $_
-    @int $int
+    @?int $int
   }
   > http://test-uri/:testType extends testType2 {
     int $_
-    @int $int
-    @int $int2
+    @?int $int
+    @?int $int2
   }

tests/PhpCompatibility/schema062.phpt

@@ -21,5 +21,5 @@ Methods:
 Types:
   > http://test-uri/:testType extends int {
     int $_
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema065.phpt

@@ -17,6 +17,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema066.phpt

@@ -17,6 +17,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema067.phpt

@@ -17,6 +17,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema068.phpt

@@ -17,6 +17,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema069.phpt

@@ -18,6 +18,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema070.phpt

@@ -20,6 +20,6 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @string $str
-    @int $int
+    @?string $str
+    @?int $int
   }

tests/PhpCompatibility/schema074.phpt

@@ -21,5 +21,5 @@ Methods:
 Types:
   > http://test-uri/:testType {
     string $str
-    @int $int
+    @?int $int
   }

tests/PhpCompatibility/schema075.phpt

@@ -19,7 +19,7 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @int $int1
-    @int $int2
-    @int $int3
+    @?int $int1
+    @?int $int2
+    @?int $int3
   }

tests/PhpCompatibility/schema076.phpt

@@ -19,7 +19,7 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @int $int1
-    @int $int2
-    @int $int3
+    @?int $int1
+    @?int $int2
+    @?int $int3
   }

tests/PhpCompatibility/schema077.phpt

@@ -19,7 +19,7 @@ Methods:
 
 Types:
   > http://test-uri/:testType {
-    @int $int1
-    @int $int2
-    @int $int3
+    @?int $int1
+    @?int $int2
+    @?int $int3
   }

tests/PhpCompatibility/schema1002.phpt

@@ -25,9 +25,9 @@ Methods:
 Types:
   > http://test-uri/:VoluntaryChangesType {
     ?Penalty $Penalty
-    @boolean $VolChangeInd
+    @?boolean $VolChangeInd
   }
   > http://test-uri/:Penalty {
-    @string $PenaltyType
-    @string $DepartureStatus
+    @?string $PenaltyType
+    @?string $DepartureStatus
   }

tests/PhpCompatibility/schema1003.phpt

@@ -30,5 +30,5 @@ Types:
     array<int<1, 15>, SpecialEquipPref> $SpecialEquipPref
   }
   > http://test-uri/:SpecialEquipPref {
-    @string $Action
+    @?string $Action
   }

tests/PhpCompatibility/schema1004.phpt

@@ -34,7 +34,7 @@ Types:
   > http://test-uri/:StringLength1to128 extends string
   > http://test-uri/:EmailType extends StringLength1to128 {
     StringLength1to128 $_
-    @string $EmailType
+    @?string $EmailType
   }
   > http://test-uri/:VerificationType {
     ?EmailType $Email

tests/PhpCompatibility/schema1007.phpt

@@ -36,14 +36,14 @@ Methods:
 Types:
   > http://test-uri/:LocationType extends string {
     string $_
-    @string $LocationCode
+    @?string $LocationCode
   }
   > http://test-uri/:VerificationType {
     ?string $Email
     ?StartLocation $StartLocation
   }
   > http://test-uri/:StartLocation extends LocationType {
     string $_
-    @string $LocationCode
-    @dateTime $AssociatedDateTime
+    @?string $LocationCode
+    @?dateTime $AssociatedDateTime
   }

tests/PhpCompatibility/schema1008.phpt

@@ -0,0 +1,22 @@
+--TEST--
+SOAP XML Schema 66: Required Attribute
+--FILE--
+<?php
+include __DIR__."/test_schema.inc";
+$schema = <<<EOF
+    <complexType name="testType">
+        <attribute name="optional" type="string" use="optional" />
+        <attribute name="required" type="string" use="required" />
+    </complexType>
+EOF;
+test_schema($schema,'type="tns:testType"');
+?>
+--EXPECTF--
+Methods:
+  > test(testType $testParam): void
+
+Types:
+  > http://test-uri/:testType {
+    @?string $optional
+    @string $required
+  }

tests/Unit/Metadata/Predicate/IsConsideredNullableTypeTest.php

@@ -0,0 +1,60 @@
+<?php
+declare(strict_types=1);
+
+namespace Soap\WsdlReader\Test\Unit\Metadata\Predicate;
+
+use PHPUnit\Framework\TestCase;
+use Soap\Engine\Metadata\Model\TypeMeta;
+use Soap\WsdlReader\Metadata\Predicate\IsConsideredNullableType;
+
+final class IsConsideredNullableTypeTest extends TestCase
+{
+    /**
+     * @dataProvider provideTests
+     *
+     */
+    public function test_it_knows_if_a_type_is_considered_nullable(TypeMeta $meta, bool $expected): void
+    {
+        static::assertSame($expected, (new IsConsideredNullableType())($meta));
+    }
+
+    public static function provideTests()
+    {
+        yield 'empty' => [
+            (new TypeMeta()),
+            false,
+        ];
+        yield 'nullable' => [
+            (new TypeMeta())->withIsNullable(true),
+            true,
+        ];
+        yield 'not-nullable' => [
+            (new TypeMeta())->withIsNullable(false),
+            false,
+        ];
+        yield 'nillable' => [
+            (new TypeMeta())->withIsNil(true),
+            true,
+        ];
+        yield 'not-nillable' => [
+            (new TypeMeta())->withIsNil(false),
+            false,
+        ];
+        yield 'default-attribute' => [
+            (new TypeMeta())->withIsAttribute(true),
+            true,
+        ];
+        yield 'optional-attribute' => [
+            (new TypeMeta())->withIsAttribute(true)->withUse('optional'),
+            true,
+        ];
+        yield 'required-attribute' => [
+            (new TypeMeta())->withIsAttribute(true)->withUse('required'),
+            false,
+        ];
+        yield 'prohibit-attribute' => [
+            (new TypeMeta())->withIsAttribute(true)->withUse('prohibit'),
+            false,
+        ];
+    }
+}