type guessing

DocPlanner · Feb 16, 2024 · 2239da8 · 2239da8
1 parent b035900
commit 2239da8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/Builder/DatagridBuilder.php b/Builder/DatagridBuilder.php
@@ -88,7 +88,7 @@ public function addFilter(DatagridInterface $datagrid, $type = null, FieldDescri
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
 
-            $type = $guessType->getType();
+            $type = (null === $guessType) ? null : $guessType->getType();
 
             $fieldDescription->setType($type);
 

diff --git a/Builder/ListBuilder.php b/Builder/ListBuilder.php
@@ -74,7 +74,7 @@ public function buildField($type = null, FieldDescriptionInterface $fieldDescrip
     {
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
-            $fieldDescription->setType($guessType->getType());
+            $fieldDescription->setType((null === $guessType) ? null : $guessType->getType());
         } else {
             $fieldDescription->setType($type);
         }

diff --git a/Builder/ShowBuilder.php b/Builder/ShowBuilder.php
@@ -31,7 +31,7 @@ public function addField(FieldDescriptionCollection $list, $type = null, FieldDe
     {
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
-            $fieldDescription->setType($guessType->getType());
+            $fieldDescription->setType((null === $guessType) ? null : $guessType->getType());
         } else {
             $fieldDescription->setType($type);
         }

diff --git a/Guesser/AbstractTypeGuesser.php b/Guesser/AbstractTypeGuesser.php
@@ -29,6 +29,10 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
         $guesser = new TypeGuesser();
         $guessedType = $guesser->guessType($class, $property);
 
+        if (null === $guessedType) {
+            return null;
+        }
+
         if ($guessedType->getType() === 'checkbox') {
             return new TypeGuess('boolean', $guessedType->getOptions(), $guessedType->getConfidence());
         }

diff --git a/Tests/Builder/ListBuilderTest.php b/Tests/Builder/ListBuilderTest.php
@@ -195,7 +195,7 @@ public function testAddListActionField(): void
     public function testCorrectFixedActionsFieldType(): void
     {
         $this->typeGuesser->expects($this->once())->method('guessType')
-            ->willReturn(new TypeGuess(null, array(), Guess::LOW_CONFIDENCE));
+            ->willReturn(null);
         $this->admin->expects($this->atLeastOnce())->method('getModelManager')
             ->willReturn($this->modelManager);
 

diff --git a/Tests/Builder/ShowBuilderTest.php b/Tests/Builder/ShowBuilderTest.php
@@ -56,7 +56,7 @@ public function testCantAddFieldWithoutType(): void
         $this->typeGuesser
             ->expects($this->once())
             ->method('guessType')
-            ->willReturn(new TypeGuess(null, [], TypeGuess::HIGH_CONFIDENCE));
+            ->willReturn(null);
 
         $builder = new ShowBuilder($this->typeGuesser);
         $field = new FieldDescription();