doctrine / orm

lib/Doctrine/ORM/UnitOfWork.php

Spacing +28 added lines, -28 removed lines

@@ -499,7 +499,7 @@ 
         $state = $this->getEntityState($entity);
 
         if ($state !== self::STATE_MANAGED && $state !== self::STATE_REMOVED) {
-            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation " . self::objToStr($entity));
+            throw new \InvalidArgumentException("Entity has to be managed or scheduled for removal for single computation ".self::objToStr($entity));
         }
 
         $class = $this->em->getClassMetadata(get_class($entity));
@@ -555,7 +555,7 @@ 
         $oid  = spl_object_hash($entity);
         $data = [];
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -718,7 +718,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $assoc);
                     } 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
                         }
                         $newValue = clone $actualValue;
@@ -864,7 +864,7 @@ 
         $targetClass    = $this->em->getClassMetadata($assoc['targetEntity']);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetClass->name)) {
+            if ( ! ($entry instanceof $targetClass->name)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $assoc, $entry);
             }
 
@@ -942,7 +942,7 @@ 
 
             // Some identifiers may be foreign keys to new entities.
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $idValue)) {
                 $this->entityIdentifiers[$oid] = $idValue;
             }
         }
@@ -1091,7 +1091,7 @@ 
             }
         } else {
             foreach ($insertionsForClass as $oid => $entity) {
-                if (! isset($this->entityIdentifiers[$oid])) {
+                if ( ! isset($this->entityIdentifiers[$oid])) {
                     //entity was not added to identity map because some identifiers are foreign keys to new entities.
                     //add it now
                     $this->addToEntityIdentifiersAndEntityMap($class, $oid, $entity);
@@ -1256,7 +1256,7 @@ 
 
                 $joinColumns = reset($assoc['joinColumns']);
 
-                $calc->addDependency($targetClass->name, $class->name, (int)empty($joinColumns['nullable']));
+                $calc->addDependency($targetClass->name, $class->name, (int) empty($joinColumns['nullable']));
 
                 // If the target class has mapped subclasses, these share the same dependency.
                 if ( ! $targetClass->subClasses) {
@@ -1779,7 +1779,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);
@@ -1849,7 +1849,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));
         }
 
     }
@@ -1988,7 +1988,7 @@ 
      */
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
     {
-        if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
+        if ( ! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
             return;
         }
 
@@ -2013,7 +2013,7 @@ 
      */
     private function isLoaded($entity)
     {
-        return !($entity instanceof Proxy) || $entity->__isInitialized();
+        return ! ($entity instanceof Proxy) || $entity->__isInitialized();
     }
 
     /**
@@ -2171,7 +2171,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRefresh']; }
+            function($assoc) { return $assoc['isCascadeRefresh']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2214,7 +2214,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeDetach']; }
+            function($assoc) { return $assoc['isCascadeDetach']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2258,7 +2258,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeMerge']; }
+            function($assoc) { return $assoc['isCascadeMerge']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2297,7 +2297,7 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadePersist']; }
+            function($assoc) { return $assoc['isCascadePersist']; }
         );
 
         foreach ($associationMappings as $assoc) {
@@ -2326,7 +2326,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
+                    if ( ! $relatedEntities instanceof $assoc['targetEntity']) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($assoc['targetEntity']),
                             $assoc,
@@ -2357,13 +2357,13 @@ 
 
         $associationMappings = array_filter(
             $class->associationMappings,
-            function ($assoc) { return $assoc['isCascadeRemove']; }
+            function($assoc) { return $assoc['isCascadeRemove']; }
         );
 
         $entitiesToCascade = [];
 
         foreach ($associationMappings as $assoc) {
-            if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+            if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                 $entity->__load();
             }
 
@@ -2427,7 +2427,7 @@ 
                     return;
                 }
 
-                if ($entity instanceof Proxy && !$entity->__isInitialized__) {
+                if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                     $entity->__load();
                 }
 
@@ -2442,7 +2442,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();
                 }
 
@@ -2766,7 +2766,7 @@ 
                             // then we can append this entity for eager loading!
                             if ($hints['fetchMode'][$class->name][$field] == ClassMetadata::FETCH_EAGER &&
                                 isset($hints[self::HINT_DEFEREAGERLOAD]) &&
-                                !$targetClass->isIdentifierComposite &&
+                                ! $targetClass->isIdentifierComposite &&
                                 $newValue instanceof Proxy &&
                                 $newValue->__isInitialized__ === false) {
 
@@ -3131,7 +3131,7 @@ 
     public function getCollectionPersister(array $association)
     {
         $role = isset($association['cache'])
-            ? $association['sourceEntity'] . '::' . $association['fieldName']
+            ? $association['sourceEntity'].'::'.$association['fieldName']
             : $association['type'];
 
         if (isset($this->collectionPersisters[$role])) {
@@ -3349,7 +3349,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -3359,7 +3359,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -3455,11 +3455,11 @@ 
      */
     private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
     {
-        if (! $this->isLoaded($entity)) {
+        if ( ! $this->isLoaded($entity)) {
             return;
         }
 
-        if (! $this->isLoaded($managedCopy)) {
+        if ( ! $this->isLoaded($managedCopy)) {
             $managedCopy->__load();
         }
 
@@ -3482,7 +3482,7 @@ 
                     if ($other === null) {
                         $prop->setValue($managedCopy, null);
                     } else {
-                        if ($other instanceof Proxy && !$other->__isInitialized()) {
+                        if ($other instanceof Proxy && ! $other->__isInitialized()) {
                             // do not merge fields marked lazy that have not been fetched.
                             continue;
                         }
@@ -3569,7 +3569,7 @@ 
      */
     private function clearIdentityMapForEntityName($entityName)
     {
-        if (! isset($this->identityMap[$entityName])) {
+        if ( ! isset($this->identityMap[$entityName])) {
             return;
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
                 $this->_em->getClassMetadata(OwningSide::class),
                 $this->_em->getClassMetadata(InverseSide::class),
             ]);
-        } catch(ToolsException $e) {
+        } catch (ToolsException $e) {
             // ignored
         }
     }

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

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         $query = $this->_em->createQuery(
             'SELECT CONCAT(e.type, MIN(e.version)) pair'
-            . ' FROM ' . GH7286Entity::class . ' e'
+            . ' FROM '.GH7286Entity::class.' e'
             . ' WHERE e.type IS NOT NULL'
             . ' GROUP BY e.type'
             . ' ORDER BY e.type'
@@ -60,7 +60,7 @@ 
 
         $query = $this->_em->createQuery(
             'SELECT CC(e.type, MIN(e.version)) pair'
-            . ' FROM ' . GH7286Entity::class . ' e'
+            . ' FROM '.GH7286Entity::class.' e'
             . ' WHERE e.type IS NOT NULL AND e.type != :type'
             . ' GROUP BY e.type'
         );

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

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 {
     protected function _loadDriver()
     {
-        return new XmlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'xml');
+        return new XmlDriver(__DIR__.DIRECTORY_SEPARATOR.'xml');
     }
 
     public function testClassTableInheritanceDiscriminatorMap()
@@ -152,7 +152,7 @@ 
      */
     public function testValidateXmlSchema($xmlMappingFile)
     {
-        $xsdSchemaFile = __DIR__ . '/../../../../../doctrine-mapping.xsd';
+        $xsdSchemaFile = __DIR__.'/../../../../../doctrine-mapping.xsd';
         $dom           = new \DOMDocument();
 
         $dom->load($xmlMappingFile);
@@ -162,7 +162,7 @@ 
 
     static public function dataValidSchema()
     {
-        $list    = glob(__DIR__ . '/xml/*.xml');
+        $list    = glob(__DIR__.'/xml/*.xml');
         $invalid = [
             'Doctrine.Tests.Models.DDC889.DDC889Class.dcm'
         ];
@@ -171,7 +171,7 @@ 
             return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid);
         });
 
-        return array_map(function($item){
+        return array_map(function($item) {
             return [$item];
         }, $list);
     }

lib/Doctrine/ORM/EntityManager.php

Spacing +6 added lines, -6 removed lines

@@ -225,8 +225,8 @@ 
      */
     public function transactional($func)
     {
-        if (!is_callable($func)) {
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
+        if ( ! is_callable($func)) {
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
         }
 
         $this->conn->beginTransaction();
@@ -762,7 +762,7 @@ 
      */
     public function isOpen()
     {
-        return (!$this->closed);
+        return ( ! $this->closed);
     }
 
     /**
@@ -873,7 +873,7 @@ 
                 sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     is_object($connection) ? get_class($connection) : gettype($connection),
-                    is_object($connection) ? '' : ': "' . $connection . '"'
+                    is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }
@@ -923,13 +923,13 @@ 
     {
         switch ($lockMode) {
             case LockMode::OPTIMISTIC:
-                if (!$class->isVersioned) {
+                if ( ! $class->isVersioned) {
                     throw OptimisticLockException::notVersioned($class->name);
                 }
                 break;
             case LockMode::PESSIMISTIC_READ:
             case LockMode::PESSIMISTIC_WRITE:
-                if (!$this->getConnection()->isTransactionActive()) {
+                if ( ! $this->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
         }