Narrow Model API

src/Admin/AbstractAdmin.php

@@ -580,11 +580,7 @@ public function update(object $object): object
             $extension->preUpdate($this, $object);
         }
 
-        $result = $this->getModelManager()->update($object);
-        // BC compatibility
-        if (null !== $result) {
-            $object = $result;
-        }
+        $this->getModelManager()->update($object);
 
         $this->postUpdate($object);
         foreach ($this->extensions as $extension) {
@@ -601,11 +597,7 @@ public function create(object $object): object
             $extension->prePersist($this, $object);
         }
 
-        $result = $this->getModelManager()->create($object);
-        // BC compatibility
-        if (null !== $result) {
-            $object = $result;
-        }
+        $this->getModelManager()->create($object);
 
         $this->postPersist($object);
         foreach ($this->extensions as $extension) {

src/Form/ChoiceList/ModelChoiceLoader.php

@@ -28,8 +28,6 @@
  */
 final class ModelChoiceLoader implements ChoiceLoaderInterface
 {
-    public $identifier;
-
     /**
      * @var \Sonata\AdminBundle\Model\ModelManagerInterface
      */
@@ -78,8 +76,6 @@ public function __construct(
         $this->query = $query;
         $this->choices = $choices;
 
-        $this->identifier = $this->modelManager->getIdentifierFieldNames($this->class);
-
         // The property option defines, which property (path) is used for
         // displaying entities as strings
         if ($property) {

src/Form/DataTransformer/ModelToIdPropertyTransformer.php

@@ -94,7 +94,11 @@ public function reverseTransform($value)
                 continue;
             }
 
-            $collection[] = $this->modelManager->find($this->className, $id);
+            $object = $this->modelManager->find($this->className, $id);
+
+            if (null !== $object) {
+                $collection[] = $object;
+            }
         }
 
         return $collection;

src/Model/AuditManager.php

@@ -21,12 +21,8 @@
 final class AuditManager implements AuditManagerInterface
 {
     /**
-     * @var array
-     */
-    private $classes = [];
-
-    /**
-     * @var array
+     * @var array<string, string[]>
+     * @phpstan-var array<string, class-string[]>
      */
     private $readers = [];
 
@@ -40,12 +36,12 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function setReader($serviceId, array $classes): void
+    public function setReader(string $serviceId, array $classes): void
     {
         $this->readers[$serviceId] = $classes;
     }
 
-    public function hasReader($class)
+    public function hasReader(string $class): bool
     {
         foreach ($this->readers as $classes) {
             if (\in_array($class, $classes, true)) {
@@ -56,7 +52,7 @@ public function hasReader($class)
         return false;
     }
 
-    public function getReader($class)
+    public function getReader(string $class): AuditReaderInterface
     {
         foreach ($this->readers as $readerId => $classes) {
             if (\in_array($class, $classes, true)) {

src/Model/AuditManagerInterface.php

@@ -21,27 +21,25 @@ interface AuditManagerInterface
     /**
      * Set AuditReaderInterface service id for array of $classes.
      *
-     * @param string $serviceId
+     * @param string[] $classes
+     *
+     * @phpstan-param class-string[] $classes
      */
-    public function setReader($serviceId, array $classes);
+    public function setReader(string $serviceId, array $classes): void;
 
     /**
      * Returns true if $class has AuditReaderInterface.
      *
-     * @param string $class
-     *
-     * @return bool
+     * @phpstan-param class-string $class
      */
-    public function hasReader($class);
+    public function hasReader(string $class): bool;
 
     /**
      * Get AuditReaderInterface service for $class.
      *
-     * @param string $class
-     *
      * @throws \LogicException
      *
-     * @return AuditReaderInterface
+     * @phpstan-param class-string $class
      */
-    public function getReader($class);
+    public function getReader(string $class): AuditReaderInterface;
 }

src/Model/AuditReaderInterface.php

@@ -19,46 +19,47 @@
 interface AuditReaderInterface
 {
     /**
-     * @param string $className
-     * @param string $id
-     * @param string $revision
+     * @template T of object
      *
-     * @return object
+     * @param mixed $id
+     * @param mixed $revisionId
+     *
+     * @phpstan-param class-string<T> $className
+     * @phpstan-return T|null
      */
-    public function find($className, $id, $revision);
+    public function find(string $className, $id, $revisionId): ?object;
 
     /**
-     * @param string $className
-     * @param int    $limit
-     * @param int    $offset
-     *
      * @return object[]
+     *
+     * @phpstan-param class-string $className
      */
-    public function findRevisionHistory($className, $limit = 20, $offset = 0);
+    public function findRevisionHistory(string $className, int $limit = 20, int $offset = 0): array;
 
     /**
-     * @param string $classname
-     * @param string $revision
+     * @param mixed $revisionId
      *
-     * @return object
+     * @phpstan-param class-string $className
      */
-    public function findRevision($classname, $revision);
+    public function findRevision(string $className, $revisionId): ?object;
 
     /**
-     * @param string $className
-     * @param string $id
+     * @param mixed $id
      *
      * @return object[]
+     *
+     * @phpstan-param class-string $className
      */
-    public function findRevisions($className, $id);
+    public function findRevisions(string $className, $id): array;
 
     /**
-     * @param string $className
-     * @param int    $id
-     * @param int    $oldRevision
-     * @param int    $newRevision
+     * @param mixed $id
+     * @param mixed $oldRevisionId
+     * @param mixed $newRevisionId
+     *
+     * @return array<string, array{old: mixed, new: mixed, same: mixed}>
      *
-     * @return array
+     * @phpstan-param class-string $className
      */
-    public function diff($className, $id, $oldRevision, $newRevision);
+    public function diff(string $className, $id, $oldRevisionId, $newRevisionId): array;
 }

src/Model/DatagridManagerInterface.php

@@ -21,16 +21,18 @@ interface DatagridManagerInterface
     /**
      * Return _sort_order, _sort_by, _page and _per_page values.
      *
-     * @param string $class
-     *
      * @return array<string, int|string>
+     *
+     * @phpstan-param class-string $class
      */
-    public function getDefaultSortValues($class);
+    public function getDefaultSortValues(string $class): array;
 
     /**
      * Return all the allowed _per_page values.
      *
-     * @return array<int>
+     * @return int[]
+     *
+     * @phpstan-param class-string $class
      */
     public function getDefaultPerPageOptions(string $class): array;
 }

src/Model/LockInterface.php

@@ -21,17 +21,12 @@
 interface LockInterface extends ModelManagerInterface
 {
     /**
-     * @param object $object
-     *
-     * @return mixed|null
+     * @return mixed
      */
-    public function getLockVersion($object);
+    public function getLockVersion(object $object);
 
     /**
-     * @param object $object
-     * @param mixed  $expectedVersion
-     *
      * @throws LockException
      */
-    public function lock($object, $expectedVersion);
+    public function lock(object $object, ?int $expectedVersion): void;
 }