Ignore Type::$nullable (#1391)

nelmio · Aug 29, 2018 · 9983318 · 9983318
1 parent 0e72b64
commit 9983318
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/ModelDescriber/ObjectModelDescriber.php b/ModelDescriber/ObjectModelDescriber.php
@@ -110,6 +110,8 @@ public function describe(Model $model, Schema $schema)
                     $property->setType('string');
                     $property->setFormat('date-time');
                 } else {
+                    $type = new Type($type->getBuiltinType(), false, $type->getClassName(), $type->isCollection(), $type->getCollectionKeyType(), $type->getCollectionValueType()); // ignore nullable field
+
                     $property->setRef(
                         $this->modelRegistry->register(new Model($type, $model->getGroups()))
                     );

diff --git a/Tests/Functional/Entity/User.php b/Tests/Functional/Entity/User.php
@@ -66,6 +66,11 @@ class User
      */
     private $users;
 
+    /**
+     * @var User|null
+     */
+    private $friend;
+
     /**
      * @var string
      *
@@ -118,6 +123,10 @@ public function setUsers(array $users)
     {
     }
 
+    public function setFriend(self $friend = null)
+    {
+    }
+
     public function setDummy(Dummy $dummy)
     {
     }

diff --git a/Tests/Functional/FunctionalTest.php b/Tests/Functional/FunctionalTest.php
@@ -41,6 +41,8 @@ public function testFetchArticleAction()
         $modelProperties = $this->getModel('Article')->getProperties();
         $this->assertCount(1, $modelProperties);
         $this->assertTrue($modelProperties->has('author'));
+        $this->assertSame('#/definitions/User2', $modelProperties->get('author')->getRef());
+
         $this->assertFalse($modelProperties->has('content'));
     }
 
@@ -209,6 +211,9 @@ public function testUserModel()
                         ],
                         'type' => 'array',
                     ],
+                    'friend' => [
+                        '$ref' => '#/definitions/User',
+                    ],
                     'dummy' => [
                         '$ref' => '#/definitions/Dummy2',
                     ],