doctrine / orm

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

Unused Use Statements -4 removed lines

@@ -5,15 +5,11 @@
 
 namespace Doctrine\ORM\Cache;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Cache\Persister\CachedPersister;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\AssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\PersistentCollection;
-use Doctrine\Common\Proxy\Proxy;
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Query;
 use ProxyManager\Proxy\GhostObjectInterface;

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -101,7 +101,7 @@ 
 
         $cm = $this->em->getClassMetadata($entityName);
 
-        $generateKeys = function (array $entry) use ($cm): EntityCacheKey {
+        $generateKeys = function(array $entry) use ($cm): EntityCacheKey {
             return new EntityCacheKey($cm->getRootClassName(), $entry['identifier']);
         };
 
@@ -172,7 +172,7 @@ 
                     continue;
                 }
 
-                $generateKeys = function ($id) use ($assocMetadata): EntityCacheKey {
+                $generateKeys = function($id) use ($assocMetadata): EntityCacheKey {
                     return new EntityCacheKey($assocMetadata->getRootClassName(), $id);
                 };
 
@@ -336,9 +336,9 @@ 
             $assocIdentifier = $this->uow->getEntityIdentifier($assocValue);
             $entityKey       = new EntityCacheKey($assocMetadata->getRootClassName(), $assocIdentifier);
 
-            if ((! $assocValue instanceof GhostObjectInterface && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
+            if (( ! $assocValue instanceof GhostObjectInterface && ($key->cacheMode & Cache::MODE_REFRESH)) || ! $assocRegion->contains($entityKey)) {
                 // Entity put fail
-                if (! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
+                if ( ! $assocPersister->storeEntityCache($assocValue, $entityKey)) {
                     return null;
                 }
             }

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ORM\Internal\Hydration;
 
-use Doctrine\ORM\Event\PostLoadEventDispatcher;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Internal\Hydration;
 
@@ -67,7 +67,7 @@ 
      */
     protected function prepare()
     {
-        if (! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
+        if ( ! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
             $this->hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
         }
 
@@ -77,13 +77,13 @@ 
 
             // Remember which associations are "fetch joined", so that we know where to inject
             // collection stubs or proxies and where not.
-            if (! isset($this->rsm->relationMap[$dqlAlias])) {
+            if ( ! isset($this->rsm->relationMap[$dqlAlias])) {
                 continue;
             }
 
             $parent = $this->rsm->parentAliasMap[$dqlAlias];
 
-            if (! isset($this->rsm->aliasMap[$parent])) {
+            if ( ! isset($this->rsm->aliasMap[$parent])) {
                 throw HydrationException::parentObjectOfRelationNotFound($dqlAlias, $parent);
             }
 
@@ -109,7 +109,7 @@ 
                 $class        = $this->getClassMetadata($className);
                 $inverseAssoc = $class->getProperty($association->getInversedBy());
 
-                if (! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
+                if ( ! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
                     continue;
                 }
 
@@ -175,14 +175,14 @@ 
         $value       = $association->getValue($entity);
         $oid         = spl_object_hash($entity);
 
-        if (! $value instanceof PersistentCollection) {
+        if ( ! $value instanceof PersistentCollection) {
             $value = $association->wrap($entity, $value, $this->em);
 
             $association->setValue($entity, $value);
 
             $this->uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else if (
             isset($this->hints[Query::HINT_REFRESH]) ||
             (isset($this->hints['fetched'][$parentDqlAlias][$fieldName]) && ! $value->isInitialized())
@@ -192,10 +192,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -313,10 +313,10 @@ 
                 $parentAlias = $this->rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
-                if (! isset($nonemptyComponents[$parentAlias])) {
+                if ( ! isset($nonemptyComponents[$parentAlias])) {
                     // TODO: Add special case code where we hydrate the right join objects into identity map at least
                     continue;
                 }
@@ -347,15 +347,15 @@ 
                 $oid = spl_object_hash($parentObject);
 
                 // Check the type of the relation (many or single-valued)
-                if (! ($association instanceof ToOneAssociationMetadata)) {
+                if ( ! ($association instanceof ToOneAssociationMetadata)) {
                     // PATH A: Collection-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
-                        } else if (! isset($this->existingCollections[$collKey])) {
+                        } else if ( ! isset($this->existingCollections[$collKey])) {
                             $reflFieldValue = $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
                         }
 
@@ -363,7 +363,7 @@ 
                         $index          = $indexExists ? $this->identifierMap[$path][$id[$parentAlias]][$id[$dqlAlias]] : false;
                         $indexIsValid   = $index !== false ? isset($reflFieldValue[$index]) : false;
 
-                        if (! $indexExists || ! $indexIsValid) {
+                        if ( ! $indexExists || ! $indexIsValid) {
                             if (isset($this->existingCollections[$collKey])) {
                                 // Collection exists, only look for the element in the identity map.
                                 if ($element = $this->getEntityFromIdentityMap($entityName, $data)) {
@@ -399,7 +399,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
-                    if (! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
+                    if ( ! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
                         ($reflFieldValue instanceof GhostObjectInterface && ! $reflFieldValue->isProxyInitialized())) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
@@ -460,7 +460,7 @@ 
                 $entityKey = $this->rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->rsm->isMixed) {
                         $result[] = [$entityKey => null];
                     } else {
@@ -516,13 +516,13 @@ 
             }
         }
 
-        if ( ! isset($resultKey) ) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = (isset($this->rsm->indexByMap['scalars']))
                     ? $row[$this->rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -535,7 +535,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
@@ -547,7 +547,7 @@ 
                 $args   = $newObject['args'];
                 $obj    = $class->newInstanceArgs($args);
 
-                if ($hasNoScalars && \count($rowData['newObjects']) === 1 ) {
+                if ($hasNoScalars && \count($rowData['newObjects']) === 1) {
                     $result[$resultKey] = $obj;
 
                     continue;

lib/Doctrine/ORM/Query/Parser.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Persistence\Mapping\MappingException;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query;

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -471,7 +471,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError(
             $message,
@@ -621,7 +621,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -670,13 +670,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->getClassName() . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->getClassName().".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->getClassName() . " must contain the identifier.",
+                    "The partial field selection of class ".$class->getClassName()." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -745,9 +745,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -786,8 +786,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= \count($expectedStringTypes) === 1
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -956,7 +956,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -1041,7 +1041,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1054,8 +1054,8 @@ 
         $qComp = $this->queryComponents[$identVariable];
         $class = $qComp['metadata'];
 
-        if (! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2477,7 +2477,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], ["=",  "<", "<=", "<>", ">", ">=", "!="]) ||
+        if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) ||
             in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2582,7 +2582,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Unused Use Statements -2 removed lines

@@ -4,11 +4,9 @@
 
 namespace Doctrine\ORM\Tools;
 
-use Doctrine\Common\Persistence\Proxy;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\UnitOfWork;

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -77,20 +77,20 @@ 
         fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n");
 
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, "Class: ". $className . "\n");
+            fwrite($fh, "Class: ".$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n");
+                fwrite($fh, " Entity: ".$this->getIdString($entity, $uow)." ".spl_object_hash($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->getDeclaredPropertiesIterator() as $field => $association) {
-                    if (! ($association instanceof AssociationMetadata)) {
+                    if ( ! ($association instanceof AssociationMetadata)) {
                         continue;
                     }
 
-                    fwrite($fh, "   " . $field . " ");
+                    fwrite($fh, "   ".$field." ");
 
                     $value = $association->getValue($entity);
 
@@ -101,25 +101,25 @@ 
                     }
 
                     if ($association instanceof ToOneAssociationMetadata) {
-                        if ($value instanceof GhostObjectInterface && !$value->isProxyInitialized()) {
+                        if ($value instanceof GhostObjectInterface && ! $value->isProxyInitialized()) {
                             fwrite($fh, "[PROXY] ");
                         }
 
-                        fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n");
+                        fwrite($fh, $this->getIdString($value, $uow)." ".spl_object_hash($value)."\n");
                     } else {
-                        $initialized = !($value instanceof PersistentCollection) || $value->isInitialized();
+                        $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
 
                         if ($initialized) {
-                            fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n");
+                            fwrite($fh, "[INITIALIZED] ".$this->getType($value)." ".count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, "[PROXY] ".$this->getType($value)." unknown element size\n");
 
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         }
                     }

lib/Doctrine/ORM/UnitOfWork.php

Doc Comments +5 added lines, -5 removed lines

@@ -1173,7 +1173,7 @@ 
     /**
      * Schedules an entity for being updated.
      *
-     * @param object $entity The entity to schedule for being updated.
+     * @param \Doctrine\Tests\Models\Forum\ForumUser $entity The entity to schedule for being updated.
      *
      * @return void
      *
@@ -1241,7 +1241,7 @@ 
     /**
      * Checks whether an entity is registered to be checked in the unit of work.
      *
-     * @param object $entity
+     * @param \Doctrine\Tests\ORM\NotifyChangedEntity $entity
      *
      * @return boolean
      */
@@ -2822,9 +2822,9 @@ 
     /**
      * Notifies this UnitOfWork of a property change in an entity.
      *
-     * @param object $entity       The entity that owns the property.
+     * @param \Doctrine\Tests\Models\CustomType\CustomTypeParent $entity       The entity that owns the property.
      * @param string $propertyName The name of the property that changed.
-     * @param mixed  $oldValue     The old value of the property.
+     * @param integer|null  $oldValue     The old value of the property.
      * @param mixed  $newValue     The new value of the property.
      *
      * @return void
@@ -3023,7 +3023,7 @@ 
     /**
      * Verifies if two given entities actually are the same based on identifier comparison
      *
-     * @param object $entity1
+     * @param GhostObjectInterface $entity1
      * @param object $entity2
      *
      * @return bool

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -375,7 +375,7 @@ 
             // Entity deletions come last and need to be in reverse commit order
             if ($this->entityDeletions) {
                 foreach (array_reverse($commitOrder) as $committedEntityName) {
-                    if (! $this->entityDeletions) {
+                    if ( ! $this->entityDeletions) {
                         break; // just a performance optimisation
                     }
 
@@ -460,7 +460,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = [];
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -543,7 +543,7 @@ 
                     || ! $class->getProperty($name) instanceof FieldMetadata
                     || ! $class->getProperty($name)->hasValueGenerator()
                     || $class->getProperty($name)->getValueGenerator()->getType() !== GeneratorType::IDENTITY
-                ) && (! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
+                ) && ( ! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
                 $actualData[$name] = $value;
             }
         }
@@ -597,7 +597,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $property);
                     } else if ($owner !== $entity) { // no clone, we have to fix
-                        if (! $actualValue->isInitialized()) {
+                        if ( ! $actualValue->isInitialized()) {
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
                         }
 
@@ -637,7 +637,7 @@ 
                             // A PersistentCollection was de-referenced, so delete it.
                             $coid = spl_object_hash($orgValue);
 
-                            if (!isset($this->collectionDeletions[$coid])) {
+                            if ( ! isset($this->collectionDeletions[$coid])) {
                                 $this->collectionDeletions[$coid] = $orgValue;
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
                             }
@@ -659,7 +659,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getDeclaredPropertiesIterator() as $property) {
-            if (! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
+            if ( ! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
                 continue;
             }
 
@@ -763,13 +763,13 @@ 
         $targetClass    = $this->em->getClassMetadata($targetEntity);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $association, $entry);
             }
 
             $state = $this->getEntityState($entry, self::STATE_NEW);
 
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMException::unexpectedAssociationValue(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -828,7 +828,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $generationPlan->executeImmediate($this->em, $entity);
 
-        if (! $generationPlan->containsDeferred()) {
+        if ( ! $generationPlan->containsDeferred()) {
             $id = $this->em->getIdentifierFlattener()->flattenIdentifier($class, $persister->getIdentifier($entity));
             $this->entityIdentifiers[$oid] = $id;
         }
@@ -861,7 +861,7 @@ 
     {
         $oid = spl_object_hash($entity);
 
-        if (! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
+        if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
 
@@ -883,7 +883,7 @@ 
                     break;
 
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -1036,7 +1036,7 @@ 
             // Entity with this $oid after deletion treated as NEW, even if the $oid
             // is obtained by a new entity because the old one went out of scope.
             //$this->entityStates[$oid] = self::STATE_NEW;
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1083,7 +1083,7 @@ 
         // Calculate dependencies for new nodes
         while ($class = array_pop($newNodes)) {
             foreach ($class->getDeclaredPropertiesIterator() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
@@ -1097,7 +1097,7 @@ 
 
                 $weight = ! array_filter(
                     $property->getJoinColumns(),
-                    function (JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
+                    function(JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
                 );
 
                 $calc->addDependency($targetClass->getClassName(), $class->getClassName(), $weight);
@@ -1391,7 +1391,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1626,7 +1626,7 @@ 
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
 
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
 
         $this->cascadePersist($entity, $visited);
@@ -1696,7 +1696,7 @@ 
             case self::STATE_DETACHED:
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
 
     }
@@ -1765,7 +1765,7 @@ 
         $class = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade()))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade()))) {
                 continue;
             }
 
@@ -1812,7 +1812,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade()))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade()))) {
                 continue;
             }
 
@@ -1828,7 +1828,7 @@ 
 
                 case ($relatedEntities instanceof Collection):
                 case (is_array($relatedEntities)):
-                    if (! ($association instanceof ToManyAssociationMetadata)) {
+                    if ( ! ($association instanceof ToManyAssociationMetadata)) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1843,7 +1843,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1874,7 +1874,7 @@ 
         $class             = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade()))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade()))) {
                 continue;
             }
 
@@ -1957,7 +1957,7 @@ 
             case LockMode::NONE === $lockMode:
             case LockMode::PESSIMISTIC_READ === $lockMode:
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
-                if (!$this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2189,7 +2189,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2238,7 +2238,7 @@ 
                 continue;
             }
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 // use the given entity association
                 if (isset($data[$field]) && is_object($data[$field]) &&
                     isset($this->entityStates[spl_object_hash($data[$field])])) {
@@ -2288,7 +2288,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2297,7 +2297,7 @@ 
             }
 
             // @todo guilhermeblanco Can we remove the need of this somehow?
-            if (!isset($hints['fetchMode'][$class->getClassName()][$field])) {
+            if ( ! isset($hints['fetchMode'][$class->getClassName()][$field])) {
                 $hints['fetchMode'][$class->getClassName()][$field] = $association->getFetchMode();
             }
 
@@ -2314,7 +2314,7 @@ 
                     // If this is an uninitialized proxy, we are deferring eager loads,
                     // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                     // then we can append this entity for eager loading!
-                    if (!$targetClass->isIdentifierComposite() &&
+                    if ( ! $targetClass->isIdentifierComposite() &&
                         $newValue instanceof GhostObjectInterface &&
                         isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                         $hints['fetchMode'][$class->getClassName()][$field] === FetchMode::EAGER &&
@@ -2351,7 +2351,7 @@ 
                             break;
 
                         // Deferred eager load only works for single identifier classes
-                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && !$targetClass->isIdentifierComposite()):
+                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && ! $targetClass->isIdentifierComposite()):
                             // TODO: Is there a faster approach?
                             $this->eagerLoadingEntities[$targetClass->getRootClassName()][$relatedIdHash] = current($normalizedAssociatedId);
 
@@ -2764,7 +2764,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2904,7 +2904,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2914,7 +2914,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }

tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\FetchMode;
 use Doctrine\Tests\Models\ECommerce\ECommerceCart;
 use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;

tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Doctrine\Tests\Models\CMS\CmsTag;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\OrmFunctionalTestCase;
-use Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser as CmsUserProxy;
 use ProxyManager\Configuration;
 use ProxyManager\Proxy\GhostObjectInterface;
 

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php

Doc Comments +15 added lines

@@ -86,6 +86,9 @@ 
         }
     }
 
+    /**
+     * @param string $propName
+     */
     protected function onPropertyChanged($propName, $oldValue, $newValue) {
         foreach ($this->listeners as $listener) {
             $listener->propertyChanged($this, $propName, $oldValue, $newValue);
@@ -112,11 +115,17 @@ 
         return $this->name;
     }
 
+    /**
+     * @param string $name
+     */
     function setName($name) {
         $this->onPropertyChanged('name', $this->name, $name);
         $this->name = $name;
     }
 
+    /**
+     * @param DDC1690Child $child
+     */
     function setChild($child) {
         $this->child = $child;
     }
@@ -145,11 +154,17 @@ 
         return $this->name;
     }
 
+    /**
+     * @param string $name
+     */
     function setName($name) {
         $this->onPropertyChanged('name', $this->name, $name);
         $this->name = $name;
     }
 
+    /**
+     * @param DDC1690Parent $parent
+     */
     function setParent($parent) {
         $this->parent = $parent;
     }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -81,7 +81,7 @@ 
     public $listeners = [];
 
     public function addPropertyChangedListener(PropertyChangedListener $listener) {
-        if (! \in_array($listener, $this->listeners, true)) {
+        if ( ! \in_array($listener, $this->listeners, true)) {
             $this->listeners[] = $listener;
         }
     }

tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -183,7 +183,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -411,7 +411,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -451,7 +451,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -492,7 +492,7 @@ 
         $user->username = 'gblanco';
         $user->status = 'developer';
 
-        for ($i=0; $i<3; ++$i) {
+        for ($i = 0; $i < 3; ++$i) {
             $phone = new CmsPhonenumber;
             $phone->phonenumber = 100 + $i;
             $user->addPhonenumber($phone);
@@ -875,7 +875,7 @@ 
 
         self::assertInstanceOf(GhostObjectInterface::class, $fetchedUser, "It IS a proxy, ...");
         self::assertTrue($fetchedUser->isProxyInitialized(), "...but its initialized!");
-        self::assertEquals($qc+2, $this->getCurrentQueryCount());
+        self::assertEquals($qc + 2, $this->getCurrentQueryCount());
     }
 
     /**
@@ -936,7 +936,7 @@ 
 
         $this->expectException(ORMInvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'Expected value of type "Doctrine\Tests\Models\CMS\CmsAddress" for association field ' .
+            'Expected value of type "Doctrine\Tests\Models\CMS\CmsAddress" for association field '.
             '"Doctrine\Tests\Models\CMS\CmsUser#$address", got "Doctrine\Tests\Models\CMS\CmsUser" instead.'
         );