Migrate classes with the fewest changes to PHP 8

Author: greg0ire

lib/Doctrine/ORM/EntityNotFoundException.php

@@ -18,12 +18,9 @@ class EntityNotFoundException extends RuntimeException implements ORMException
     /**
      * Static constructor.
      *
-     * @param string   $className
      * @param string[] $id
-     *
-     * @return self
      */
-    public static function fromClassNameAndIdentifier($className, array $id)
+    public static function fromClassNameAndIdentifier(string $className, array $id): self
     {
         $ids = [];
 

lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php

@@ -17,10 +17,8 @@ class LoadClassMetadataEventArgs extends BaseLoadClassMetadataEventArgs
 {
     /**
      * Retrieve associated EntityManager.
-     *
-     * @return EntityManagerInterface
      */
-    public function getEntityManager()
+    public function getEntityManager(): EntityManagerInterface
     {
         return $this->getObjectManager();
     }

lib/Doctrine/ORM/Event/OnFlushEventArgs.php

@@ -21,10 +21,8 @@ class OnFlushEventArgs extends ManagerEventArgs
      * Retrieve associated EntityManager.
      *
      * @deprecated 2.13. Use {@see getObjectManager} instead.
-     *
-     * @return EntityManagerInterface
      */
-    public function getEntityManager()
+    public function getEntityManager(): EntityManagerInterface
     {
         Deprecation::trigger(
             'doctrine/orm',

lib/Doctrine/ORM/Event/PostFlushEventArgs.php

@@ -21,10 +21,8 @@ class PostFlushEventArgs extends ManagerEventArgs
      * Retrieves associated EntityManager.
      *
      * @deprecated 2.13. Use {@see getObjectManager} instead.
-     *
-     * @return EntityManagerInterface
      */
-    public function getEntityManager()
+    public function getEntityManager(): EntityManagerInterface
     {
         Deprecation::trigger(
             'doctrine/orm',

lib/Doctrine/ORM/Event/PreFlushEventArgs.php

@@ -17,12 +17,8 @@
  */
 class PreFlushEventArgs extends ManagerEventArgs
 {
-    /**
-     * @deprecated 2.13. Use {@see getObjectManager} instead.
-     *
-     * @return EntityManagerInterface
-     */
-    public function getEntityManager()
+    /** @deprecated 2.13. Use {@see getObjectManager} instead. */
+    public function getEntityManager(): EntityManagerInterface
     {
         Deprecation::trigger(
             'doctrine/orm',

lib/Doctrine/ORM/Event/PreUpdateEventArgs.php

@@ -17,7 +17,7 @@
 class PreUpdateEventArgs extends LifecycleEventArgs
 {
     /** @var array<string, array{mixed, mixed}|PersistentCollection> */
-    private $entityChangeSet;
+    private array $entityChangeSet;
 
     /**
      * @param object    $entity
@@ -37,31 +37,25 @@ public function __construct($entity, EntityManagerInterface $em, array &$changeS
      * @return mixed[][]
      * @psalm-return array<string, array{mixed, mixed}|PersistentCollection>
      */
-    public function getEntityChangeSet()
+    public function getEntityChangeSet(): array
     {
         return $this->entityChangeSet;
     }
 
     /**
      * Checks if field has a changeset.
-     *
-     * @param string $field
-     *
-     * @return bool
      */
-    public function hasChangedField($field)
+    public function hasChangedField(string $field): bool
     {
         return isset($this->entityChangeSet[$field]);
     }
 
     /**
      * Gets the old value of the changeset of the changed field.
      *
-     * @param string $field
-     *
      * @return mixed
      */
-    public function getOldValue($field)
+    public function getOldValue(string $field)
     {
         $this->assertValidField($field);
 
@@ -71,11 +65,9 @@ public function getOldValue($field)
     /**
      * Gets the new value of the changeset of the changed field.
      *
-     * @param string $field
-     *
      * @return mixed
      */
-    public function getNewValue($field)
+    public function getNewValue(string $field)
     {
         $this->assertValidField($field);
 
@@ -84,13 +76,8 @@ public function getNewValue($field)
 
     /**
      * Sets the new value of this field.
-     *
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return void
      */
-    public function setNewValue($field, $value)
+    public function setNewValue(string $field, mixed $value): void
     {
         $this->assertValidField($field);
 

lib/Doctrine/ORM/Exception/EntityMissingAssignedId.php

@@ -10,8 +10,7 @@
 
 final class EntityMissingAssignedId extends LogicException implements ORMException
 {
-    /** @param object $entity */
-    public static function forField($entity, string $field): self
+    public static function forField(object $entity, string $field): self
     {
         return new self('Entity of type ' . get_debug_type($entity) . " is missing an assigned ID for field  '" . $field . "'. " .
             'The identifier generation strategy for this entity requires the ID field to be populated before ' .

lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php

@@ -20,7 +20,6 @@
 use function class_exists;
 use function constant;
 use function defined;
-use function get_class;
 
 class AttributeDriver implements MappingDriver
 {
@@ -31,7 +30,7 @@ class AttributeDriver implements MappingDriver
         Mapping\MappedSuperclass::class => 2,
     ];
 
-    private AttributeReader $reader;
+    private readonly AttributeReader $reader;
 
     /** @param array<string> $paths */
     public function __construct(array $paths)
@@ -46,7 +45,7 @@ public function isTransient(string $className): bool
 
         foreach ($classAttributes as $a) {
             $attr = $a instanceof RepeatableAttributeCollection ? $a[0] : $a;
-            if (isset(self::ENTITY_ATTRIBUTE_CLASSES[get_class($attr)])) {
+            if (isset(self::ENTITY_ATTRIBUTE_CLASSES[$attr::class])) {
                 return false;
             }
         }

lib/Doctrine/ORM/PessimisticLockException.php

@@ -9,8 +9,7 @@
 
 class PessimisticLockException extends RuntimeException implements ORMException
 {
-    /** @return PessimisticLockException */
-    public static function lockFailed()
+    public static function lockFailed(): self
     {
         return new self('The pessimistic lock failed.');
     }

lib/Doctrine/ORM/Query/Exec/SingleSelectExecutor.php

@@ -23,10 +23,8 @@ public function __construct(SelectStatement $AST, SqlWalker $sqlWalker)
 
     /**
      * {@inheritDoc}
-     *
-     * @return Result
      */
-    public function execute(Connection $conn, array $params, array $types)
+    public function execute(Connection $conn, array $params, array $types): Result
     {
         return $conn->executeQuery($this->_sqlStatements, $params, $types, $this->queryCacheProfile);
     }