PHPStan

Author: Lustmored

src/Dto/CrudDto.php

@@ -2,7 +2,6 @@
 
 namespace EasyCorp\Bundle\EasyAdminBundle\Dto;
 
-use Closure;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\KeyValueStore;
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
@@ -468,6 +467,10 @@ public function getAutocompleteEntityNormalizer(): ?\Closure
 
     public function setAutocompleteEntityNormalizer(?callable $autocompleteEntityNormalizer): void
     {
-        $this->autocompleteEntityNormalizer = $autocompleteEntityNormalizer ? \Closure::fromCallable($autocompleteEntityNormalizer) : null;
+        if ($autocompleteEntityNormalizer) {
+            $autocompleteEntityNormalizer = \Closure::fromCallable($autocompleteEntityNormalizer);
+        }
+
+        $this->autocompleteEntityNormalizer = $autocompleteEntityNormalizer;
     }
 }

src/Orm/EntityPaginator.php

@@ -204,9 +204,14 @@ public function getResultsAsJson(?\Closure $entityAsStringNormalizer = null): st
         foreach ($this->getResults() ?? [] as $entityInstance) {
             $entityDto = $this->entityFactory->createForEntityInstance($entityInstance);
 
+            $entityAsString = $entityDto->toString();
+            if ($entityAsStringNormalizer) {
+                $entityAsString = $entityAsStringNormalizer($entityInstance);
+            }
+
             $jsonResult['results'][] = [
                 EA::ENTITY_ID => $entityDto->getPrimaryKeyValueAsString(),
-                'entityAsString' => $entityAsStringNormalizer ? $entityAsStringNormalizer($entityInstance) : $entityDto->toString(),
+                'entityAsString' => $entityAsString,
             ];
         }