Merge branch '3.x'

sonata-project · Jul 13, 2020 · f921160 · f921160
2 parents 538d137 + fcd6059
commit f921160
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/Guesser/AbstractTypeGuesser.php b/src/Guesser/AbstractTypeGuesser.php
@@ -31,7 +31,7 @@ protected function getParentMetadataForProperty($baseClass, $propertyFullName, M
             return $modelManager->getParentMetadataForProperty($baseClass, $propertyFullName);
         } catch (MappingException $e) {
             // no metadata not found.
-            return;
+            return null;
         }
     }
 }
diff --git a/tests/Admin/FieldDescriptionTest.php b/tests/Admin/FieldDescriptionTest.php
@@ -315,13 +315,13 @@ public function testIsIdentifierFromFieldMapping(): void
         $fieldMapping = [
             'type' => 'integer',
             'fieldName' => 'position',
-            'id' => 'someId',
+            'id' => true,
         ];
 
         $field = new FieldDescription();
         $field->setFieldMapping($fieldMapping);
 
-        $this->assertSame('someId', $field->isIdentifier());
+        $this->assertTrue($field->isIdentifier());
     }
 
     public function testGetFieldMapping(): void

diff --git a/tests/Builder/ShowBuilderTest.php b/tests/Builder/ShowBuilderTest.php
@@ -62,9 +62,6 @@ public function testGetBaseList(): void
         $this->assertInstanceOf(FieldDescriptionCollection::class, $this->showBuilder->getBaseList());
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAddFieldNoType(): void
     {
         $typeGuess = $this->prophesize(TypeGuess::class);
@@ -90,9 +87,6 @@ public function testAddFieldNoType(): void
         );
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAddFieldWithType(): void
     {
         $fieldDescription = new FieldDescription();