Small improvements and micro optimizations (#2309)

* Fixed some annotations

* Mark comment as a TODO. CS.

* Micro-optimization. Use isset instead of array_key_exists

* Don't use reflection property to access protected property from parent

* Small fixes

Co-authored-by: Alexandr Zolotukhin <[email protected]>

Author: phansys

src/Mapping/Event/Adapter/ORM.php

@@ -167,13 +167,13 @@ public function clearObjectChangeSet($uow, $object)
     /**
      * Creates a ORM specific LifecycleEventArgs.
      *
-     * @param object                                $document
-     * @param \Doctrine\ODM\MongoDB\DocumentManager $documentManager
+     * @param object                               $document
+     * @param \Doctrine\ORM\EntityManagerInterface $entityManager
      *
-     * @return \Doctrine\ODM\MongoDB\Event\LifecycleEventArgs
+     * @return \Doctrine\ORM\Event\LifecycleEventArgs
      */
-    public function createLifecycleEventArgsInstance($document, $documentManager)
+    public function createLifecycleEventArgsInstance($document, $entityManager)
     {
-        return new LifecycleEventArgs($document, $documentManager);
+        return new LifecycleEventArgs($document, $entityManager);
     }
 }

src/Mapping/MappedEventSubscriber.php

@@ -92,7 +92,7 @@ public function __construct()
     protected function getEventAdapter(EventArgs $args)
     {
         $class = get_class($args);
-        if (preg_match('@Doctrine\\\([^\\\]+)@', $class, $m) && in_array($m[1], ['ODM', 'ORM'])) {
+        if (preg_match('@Doctrine\\\([^\\\]+)@', $class, $m) && in_array($m[1], ['ODM', 'ORM'], true)) {
             if (!isset($this->adapters[$m[1]])) {
                 $adapterClass = $this->getNamespace().'\\Mapping\\Event\\Adapter\\'.$m[1];
                 if (!class_exists($adapterClass)) {

src/SoftDeleteable/Filter/ODM/SoftDeleteableFilter.php

@@ -23,9 +23,10 @@ class SoftDeleteableFilter extends BsonFilter
     public function addFilterCriteria(ClassMetadata $targetEntity): array
     {
         $class = $targetEntity->getName();
-        if (array_key_exists($class, $this->disabled) && true === $this->disabled[$class]) {
+        if (true === ($this->disabled[$class] ?? false)) {
             return [];
-        } elseif (array_key_exists($targetEntity->rootDocumentName, $this->disabled) && true === $this->disabled[$targetEntity->rootDocumentName]) {
+        }
+        if (true === ($this->disabled[$targetEntity->rootDocumentName] ?? false)) {
             return [];
         }
 

src/SoftDeleteable/Filter/SoftDeleteableFilter.php

@@ -37,13 +37,16 @@ class SoftDeleteableFilter extends SQLFilter
      * @param string $targetTableAlias
      *
      * @return string
+     *
+     * @throws \Doctrine\DBAL\Exception
      */
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
         $class = $targetEntity->getName();
-        if (array_key_exists($class, $this->disabled) && true === $this->disabled[$class]) {
+        if (true === ($this->disabled[$class] ?? false)) {
             return '';
-        } elseif (array_key_exists($targetEntity->rootEntityName, $this->disabled) && true === $this->disabled[$targetEntity->rootEntityName]) {
+        }
+        if (true === ($this->disabled[$targetEntity->rootEntityName] ?? false)) {
             return '';
         }
 
@@ -53,8 +56,7 @@ public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAli
             return '';
         }
 
-        $conn = $this->getEntityManager()->getConnection();
-        $platform = $conn->getDatabasePlatform();
+        $platform = $this->getConnection()->getDatabasePlatform();
         $column = $targetEntity->getQuotedColumnName($config['fieldName'], $platform);
 
         $addCondSql = $platform->getIsNullExpression($targetTableAlias.'.'.$column);

src/SoftDeleteable/Query/TreeWalker/Exec/MultiTableDeleteExecutor.php

@@ -24,11 +24,7 @@ public function __construct(Node $AST, $sqlWalker, ClassMetadataInfo $meta, Abst
     {
         parent::__construct($AST, $sqlWalker);
 
-        $getSqlStatements = \Closure::bind(function (): array {
-            return $this->_sqlStatements;
-        }, $this, static::class);
-
-        $sqlStatements = $getSqlStatements();
+        $sqlStatements = $this->_sqlStatements;
 
         foreach ($sqlStatements as $index => $stmt) {
             $matches = [];
@@ -47,10 +43,6 @@ public function __construct(Node $AST, $sqlWalker, ClassMetadataInfo $meta, Abst
             }
         }
 
-        $setSqlStatements = \Closure::bind(function (array $sqlStatements): void {
-            $this->_sqlStatements = $sqlStatements;
-        }, $this, static::class);
-
-        $setSqlStatements($sqlStatements);
+        $this->_sqlStatements = $sqlStatements;
     }
 }

src/SoftDeleteable/SoftDeleteableListener.php

@@ -49,6 +49,7 @@ public function getSubscribedEvents()
     public function onFlush(EventArgs $args)
     {
         $ea = $this->getEventAdapter($args);
+        /** @var \Doctrine\ORM\EntityManagerInterface|\Doctrine\ODM\MongoDB\DocumentManager $om */
         $om = $ea->getObjectManager();
         $uow = $om->getUnitOfWork();
         $evm = $om->getEventManager();