doctrine / orm

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

Doc Comments +3 added lines, -1 removed lines

@@ -268,7 +268,7 @@ 
     /**
      * Generates a string of currently query
      *
-     * @param array   $query
+     * @param string   $query
      * @param string  $criteria
      * @param array   $orderBy
      * @param integer $limit
@@ -335,6 +335,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $fieldName
      */
     public function getOwningTable($fieldName)
     {
@@ -367,6 +368,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\Models\Cache\Country $entity
      */
     public function insert($entity)
     {

Indentation +3 added lines, -3 removed lines

@@ -50,9 +50,9 @@
      */
     protected $class;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

lib/Doctrine/ORM/UnitOfWork.php

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -390,7 +390,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
                     }
 
@@ -475,7 +475,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = [];
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -558,7 +558,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;
             }
         }
@@ -612,7 +612,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
                         }
 
@@ -650,7 +650,7 @@ 
                         // Check if original value exists
                         if ($orgValue instanceof PersistentCollection) {
                             // A PersistentCollection was de-referenced, so delete it.
-                            if (! $this->isCollectionScheduledForDeletion($orgValue)) {
+                            if ( ! $this->isCollectionScheduledForDeletion($orgValue)) {
                                 $this->scheduleCollectionDeletion($orgValue);
 
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
@@ -673,7 +673,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;
             }
 
@@ -777,13 +777,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(),
@@ -845,7 +845,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;
         }
@@ -878,7 +878,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);
         }
 
@@ -900,7 +900,7 @@ 
                     break;
 
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -1053,7 +1053,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()) {
@@ -1100,7 +1100,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;
                 }
 
@@ -1114,7 +1114,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);
@@ -1408,7 +1408,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1641,7 +1641,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);
@@ -1711,7 +1711,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));
         }
 
     }
@@ -1780,7 +1780,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;
             }
 
@@ -1829,7 +1829,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;
             }
 
@@ -1845,7 +1845,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,
@@ -1860,7 +1860,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1891,7 +1891,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;
             }
 
@@ -1975,7 +1975,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();
                 }
 
@@ -2196,7 +2196,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2245,7 +2245,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])])) {
@@ -2295,7 +2295,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2304,7 +2304,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();
             }
 
@@ -2321,7 +2321,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 &&
@@ -2358,7 +2358,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);
 
@@ -2765,7 +2765,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2905,7 +2905,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2915,7 +2915,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }

lib/Doctrine/ORM/Cache/DefaultQueryCache.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -96,7 +96,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']);
         };
 
@@ -167,7 +167,7 @@ 
                     continue;
                 }
 
-                $generateKeys = function ($id) use ($assocMetadata): EntityCacheKey {
+                $generateKeys = function($id) use ($assocMetadata): EntityCacheKey {
                     return new EntityCacheKey($assocMetadata->getRootClassName(), $id);
                 };
 
@@ -348,9 +348,9 @@ 
             $assocIdentifier = $unitOfWork->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/Cache/DefaultCache.php

Indentation +9 added lines, -9 removed lines

@@ -31,9 +31,9 @@ 
      */
     private $uow;
 
-     /**
-     * @var \Doctrine\ORM\Cache\CacheFactory
-     */
+        /**
+         * @var \Doctrine\ORM\Cache\CacheFactory
+         */
     private $cacheFactory;
 
     /**
@@ -273,12 +273,12 @@ 
         return $this->queryCaches[$regionName];
     }
 
-     /**
-     * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
-     * @param mixed                               $identifier The entity identifier.
-     *
-     * @return \Doctrine\ORM\Cache\EntityCacheKey
-     */
+        /**
+         * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
+         * @param mixed                               $identifier The entity identifier.
+         *
+         * @return \Doctrine\ORM\Cache\EntityCacheKey
+         */
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
     {
         if (! is_array($identifier)) {

Spacing +5 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -205,7 +205,7 @@ 
 
         foreach ($metadatas as $metadata) {
             foreach ($metadata->getDeclaredPropertiesIterator() as $association) {
-                if (! $association instanceof ToManyAssociationMetadata) {
+                if ( ! $association instanceof ToManyAssociationMetadata) {
                     continue;
                 }
 
@@ -262,8 +262,7 @@ 
     public function getQueryCache($regionName = null)
     {
         if ($regionName === null) {
-            return $this->defaultQueryCache ?:
-                $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
+            return $this->defaultQueryCache ?: $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
         }
 
         if ( ! isset($this->queryCaches[$regionName])) {
@@ -281,7 +280,7 @@ 
      */
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
     {
-        if (! is_array($identifier)) {
+        if ( ! is_array($identifier)) {
             $identifier = $this->toIdentifierArray($metadata, $identifier);
         }
 
@@ -297,7 +296,7 @@ 
      */
     private function buildCollectionCacheKey(ClassMetadata $metadata, $association, $ownerIdentifier)
     {
-        if (! is_array($ownerIdentifier)) {
+        if ( ! is_array($ownerIdentifier)) {
             $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier);
         }