doctrine / orm

tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php

Indentation +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         $this->entityManager->getConnection()->setDatabasePlatform(new PostgreSqlPlatform);
 
         $query = $this->entityManager->createQuery(
-           'SELECT u, g, COUNT(g.id) AS hidden g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC'
+            'SELECT u, g, COUNT(g.id) AS hidden g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC'
         );
         $limitQuery = clone $query;
         $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Pagination;
 

tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php

Indentation +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     {
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
-              'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
+                'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
             . ' of \'Doctrine\Tests\ORM\Mapping\HierarchyBase\' to be properly mapped in the inheritance hierarchy.'
             . ' Alternatively you can make \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' an abstract class to'
             . ' avoid this exception from occurring.'

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 

tests/Doctrine/Tests/Models/Forum/ForumUser.php

Indentation +4 added lines, -4 removed lines

@@ -24,18 +24,18 @@
     public $avatar;
 
     public function getId() {
-    	return $this->id;
+        return $this->id;
     }
 
     public function getUsername() {
-    	return $this->username;
+        return $this->username;
     }
 
     public function getAvatar() {
-    	return $this->avatar;
+        return $this->avatar;
     }
 
     public function setAvatar(ForumAvatar $avatar) {
-    	$this->avatar = $avatar;
+        $this->avatar = $avatar;
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Forum;
 

tests/Doctrine/Tests/OrmPerformanceTestCase.php

Indentation +2 added lines, -2 removed lines

@@ -25,12 +25,12 @@
 
         if ($this->maxRunningTime != 0 && $time > $this->maxRunningTime) {
             $this->fail(
-              sprintf(
+                sprintf(
                 'expected running time: <= %s but was: %s',
 
                 $this->maxRunningTime,
                 $time
-              )
+                )
             );
         }
     }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -48,7 +48,7 @@ 
      */
     public function setMaxRunningTime($maxRunningTime)
     {
-        if (! (is_int($maxRunningTime) && $maxRunningTime >= 0)) {
+        if ( ! (is_int($maxRunningTime) && $maxRunningTime >= 0)) {
             throw new \InvalidArgumentException;
         }
 

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\Common\Util\ClassUtils;
-
 use Doctrine\ORM\Mapping\FetchMode;
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\OneToOneAssociationMetadata;

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 
@@ -59,11 +59,11 @@ 
         $data = array_merge($data, $persister->getIdentifier($entity)); // why update has no identifier values ?
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $name => $association) {
-            if (! isset($data[$name]) || $association instanceof FieldMetadata) {
+            if ( ! isset($data[$name]) || $association instanceof FieldMetadata) {
                 continue;
             }
 
-            if (! $association instanceof ToOneAssociationMetadata) {
+            if ( ! $association instanceof ToOneAssociationMetadata) {
                 unset($data[$name]);
 
                 continue;
@@ -73,7 +73,7 @@ 
             $targetClassMetadata = $this->em->getClassMetadata($targetEntity);
             $targetPersister     = $this->uow->getEntityPersister($targetEntity);
 
-            if (! $association->getCache()) {
+            if ( ! $association->getCache()) {
                 $owningAssociation   = ! $association->isOwningSide()
                     ? $targetClassMetadata->getProperty($association->getMappedBy())
                     : $association;
@@ -121,7 +121,7 @@ 
                 continue;
             }
 
-            if (! $association->isPrimaryKey()) {
+            if ( ! $association->isPrimaryKey()) {
                 $targetClass = ClassUtils::getClass($data[$name]);
                 $targetId    = $this->uow->getEntityIdentifier($data[$name]);
                 $data[$name] = new AssociationCacheEntry($targetClass, $targetId);
@@ -171,7 +171,7 @@ 
                 ($association instanceof OneToOneAssociationMetadata && ! $association->isOwningSide())
             );
 
-            if (! $isEagerLoad) {
+            if ( ! $isEagerLoad) {
                 $data[$name] = $this->em->getReference($assocClass, $assocId);
 
                 continue;

lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php

Doc Comments +1 added lines

@@ -45,6 +45,7 @@
      * {@inheritDoc}
      *
      * @param MultiGetCache $cache
+     * @param string $name
      */
     public function __construct($name, MultiGetCache $cache, $lifetime = 0)
     {

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Region;
 

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

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use PDO;
-use Doctrine\ORM\Mapping\ClassMetadata;
 
 /**
  * The ArrayHydrator produces a nested array "graph" that is often (not always)

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Internal\Hydration;
 
@@ -97,10 +97,10 @@ 
                 // It's a joined result
 
                 $parent = $this->rsm->parentAliasMap[$dqlAlias];
-                $path   = $parent . '.' . $dqlAlias;
+                $path   = $parent.'.'.$dqlAlias;
 
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
-                if ( ! isset($nonemptyComponents[$parent]) ) {
+                if ( ! isset($nonemptyComponents[$parent])) {
                     continue;
                 }
 
@@ -109,9 +109,9 @@ 
                 if ($this->rsm->isMixed && isset($this->rootAliases[$parent])) {
                     $first = reset($this->resultPointers);
                     // TODO: Exception if $key === null ?
-                    $baseElement =& $this->resultPointers[$parent][key($first)];
+                    $baseElement = & $this->resultPointers[$parent][key($first)];
                 } else if (isset($this->resultPointers[$parent])) {
-                    $baseElement =& $this->resultPointers[$parent];
+                    $baseElement = & $this->resultPointers[$parent];
                 } else {
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
 
@@ -123,7 +123,7 @@ 
                 $relation      = $parentClass->getProperty($relationAlias);
 
                 // Check the type of the relation (many or single-valued)
-                if (! $relation instanceof ToOneAssociationMetadata) {
+                if ( ! $relation instanceof ToOneAssociationMetadata) {
                     $oneToOne = false;
 
                     if ( ! isset($baseElement[$relationAlias])) {
@@ -162,7 +162,7 @@ 
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -174,7 +174,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])) {
                     $result[] = $this->rsm->isMixed
                         ? [$entityKey => null]
                         : null;
@@ -235,7 +235,7 @@ 
                 $resultKey = $this->resultCounter - 1;
             }
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
             $onlyOneRootAlias = 0 === $scalarCount && 1 === count($rowData['newObjects']);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
@@ -274,13 +274,13 @@ 
         }
 
         if ($oneToOne) {
-            $this->resultPointers[$dqlAlias] =& $coll;
+            $this->resultPointers[$dqlAlias] = & $coll;
 
             return;
         }
 
         if ($index !== false) {
-            $this->resultPointers[$dqlAlias] =& $coll[$index];
+            $this->resultPointers[$dqlAlias] = & $coll[$index];
 
             return;
         }
@@ -290,7 +290,7 @@ 
         }
 
         end($coll);
-        $this->resultPointers[$dqlAlias] =& $coll[key($coll)];
+        $this->resultPointers[$dqlAlias] = & $coll[key($coll)];
 
         return;
     }

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

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use PDO;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Event\PostLoadEventDispatcher;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Proxy\Proxy;

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;
 
@@ -68,7 +68,7 @@ 
      */
     protected function prepare()
     {
-        if (! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
+        if ( ! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
             $this->hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
         }
 
@@ -78,13 +78,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);
             }
 
@@ -110,7 +110,7 @@ 
                 $class        = $this->getClassMetadata($className);
                 $inverseAssoc = $class->getProperty($association->getInversedBy());
 
-                if (! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
+                if ( ! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
                     continue;
                 }
 
@@ -176,14 +176,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())
@@ -193,10 +193,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;
@@ -314,10 +314,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;
                 }
@@ -348,15 +348,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);
                         }
 
@@ -364,7 +364,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)) {
@@ -400,7 +400,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 Proxy && ! $reflFieldValue->__isInitialized())) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
@@ -461,7 +461,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 {
@@ -517,13 +517,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;
@@ -536,7 +536,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
@@ -548,7 +548,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/ORMInvalidArgumentException.php

Doc Comments -1 removed lines

@@ -207,7 +207,6 @@
 
     /**
      * @param ClassMetadata $targetClass
-     * @param array         $assoc
      * @param mixed         $actualValue
      *
      * @return self

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 use Doctrine\ORM\Mapping\AssociationMetadata;
@@ -21,7 +21,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -31,7 +31,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -41,7 +41,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -53,7 +53,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -65,7 +65,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -121,7 +121,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
             "from the database or registered as new through EntityManager#persist");
     }
 
@@ -133,7 +133,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -144,7 +144,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -155,7 +155,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -167,8 +167,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -176,7 +176,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }