doctrine / orm

tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 
     protected function createRegion()
     {
-        $this->directory = sys_get_temp_dir() . '/doctrine_lock_' . uniqid();
+        $this->directory = sys_get_temp_dir().'/doctrine_lock_'.uniqid();
 
         $region = new DefaultRegion('concurren_region_test', $this->cache);
 
@@ -262,7 +262,7 @@ 
         $reflectionDirectory->setAccessible(true);
         $reflectionDirectory->setValue($region, str_repeat('a', 10000));
 
-        set_error_handler(static function () {
+        set_error_handler(static function() {
         }, E_WARNING);
         self::assertTrue($region->evictAll());
         restore_error_handler();
@@ -275,7 +275,7 @@ 
     {
         $path = $path ?: $this->directory;
 
-        if (! is_dir($path)) {
+        if ( ! is_dir($path)) {
             return;
         }
 

tests/Doctrine/Tests/ORM/PersistentCollectionTest.php

Spacing +3 added lines, -3 removed lines

@@ -173,7 +173,7 @@ 
             ->expects(self::once())
             ->method('loadCollection')
             ->with($this->collection)
-            ->willReturnCallback(static function (PersistentCollection $persistentCollection) use ($persistedElement) : void {
+            ->willReturnCallback(static function(PersistentCollection $persistentCollection) use ($persistedElement) : void {
                 $persistentCollection->unwrap()->add($persistedElement);
             });
 
@@ -210,7 +210,7 @@ 
             ->expects(self::once())
             ->method('loadCollection')
             ->with($this->collection)
-            ->willReturnCallback(static function (PersistentCollection $persistentCollection) use (
+            ->willReturnCallback(static function(PersistentCollection $persistentCollection) use (
                 $persistedElement,
                 $newElementThatIsAlsoPersisted
             ) : void {
@@ -252,7 +252,7 @@ 
             ->expects(self::once())
             ->method('loadCollection')
             ->with($this->collection)
-            ->willReturnCallback(static function (PersistentCollection $persistentCollection) use (
+            ->willReturnCallback(static function(PersistentCollection $persistentCollection) use (
                 $persistedElement,
                 $newElementThatIsAlsoPersisted
             ) : void {

tests/Doctrine/Tests/Models/CMS/CmsComment.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 
     public function __toString()
     {
-        return self::class . '[id=' . $this->id . ']';
+        return self::class.'[id='.$this->id.']';
     }
 }

tests/Doctrine/Tests/TestInit.php

Spacing +8 added lines, -8 removed lines

@@ -15,20 +15,20 @@
 error_reporting(E_ALL | E_STRICT);
 date_default_timezone_set('UTC');
 
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
     // dependencies were installed via composer - this is the main project
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
+    require __DIR__.'/../../../vendor/autoload.php';
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
     // installed as a dependency in `vendor`
-    require __DIR__ . '/../../../../../autoload.php';
+    require __DIR__.'/../../../../../autoload.php';
 } else {
     throw new Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
 }
 
-if (! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
-    throw new Exception('Could not create ' . __DIR__ . '/Proxies Folder.');
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
+    throw new Exception('Could not create '.__DIR__.'/Proxies Folder.');
 }
 
-if (! file_exists(__DIR__ . '/ORM/Proxy/generated') && ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
-    throw new Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
+    throw new Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
 }

lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php

Indentation +9 added lines, -9 removed lines

@@ -305,8 +305,8 @@ 
 
         // FIXME: Order with composite keys might not be correct
         $sql = 'SELECT ' . $columnName
-             . ' FROM ' . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+                . ' FROM ' . $tableName
+                . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
 
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
         $versionType = $versionProperty->getType();
@@ -519,8 +519,8 @@ 
         }
 
         $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+                . ' SET ' . implode(', ', $set)
+                . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -1641,9 +1641,9 @@ 
         $lock  = $this->getLockTablesSql($lockMode);
         $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
         $sql   = 'SELECT 1 '
-             . $lock
-             . $where
-             . $lockSql;
+                . $lock
+                . $where
+                . $lockSql;
 
         [$params, $types] = $this->expandParameters($criteria);
 
@@ -2112,8 +2112,8 @@ 
         $alias = $this->getSQLTableAlias($this->class->getTableName());
 
         $sql = 'SELECT 1 '
-             . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+                . $this->getLockTablesSql(null)
+                . ' WHERE ' . $this->getSelectConditionSQL($criteria);
 
         [$params, $types] = $this->expandParameters($criteria);
 

Spacing +72 added lines, -72 removed lines

@@ -295,16 +295,16 @@ 
         $tableName      = $versionedClass->table->getQuotedQualifiedName($this->platform);
         $columnName     = $this->platform->quoteIdentifier($versionProperty->getColumnName());
         $identifier     = array_map(
-            function ($columnName) {
+            function($columnName) {
                 return $this->platform->quoteIdentifier($columnName);
             },
             array_keys($versionedClass->getIdentifierColumns($this->em))
         );
 
         // FIXME: Order with composite keys might not be correct
-        $sql = 'SELECT ' . $columnName
-             . ' FROM ' . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+        $sql = 'SELECT '.$columnName
+             . ' FROM '.$tableName
+             . ' WHERE '.implode(' = ? AND ', $identifier).' = ?';
 
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
         $versionType = $versionProperty->getType();
@@ -343,13 +343,13 @@ 
         $tableName  = $this->class->getTableName();
         $updateData = $this->prepareUpdateData($entity);
 
-        if (! isset($updateData[$tableName])) {
+        if ( ! isset($updateData[$tableName])) {
             return;
         }
 
         $data = $updateData[$tableName];
 
-        if (! $data) {
+        if ( ! $data) {
             return;
         }
 
@@ -401,7 +401,7 @@ 
 
             if ($value !== null) {
                 // @todo guilhermeblanco Make sure we do not have flat association values.
-                if (! is_array($value)) {
+                if ( ! is_array($value)) {
                     $value = [$targetClass->identifier[0] => $value];
                 }
 
@@ -498,18 +498,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1';
+                    $set[] = $versionColumnName.' = '.$versionColumnName.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumnName.' = CURRENT_TIMESTAMP';
                     break;
             }
         }
 
-        $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+        $sql = 'UPDATE '.$quotedTableName
+             . ' SET '.implode(', ', $set)
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -526,7 +526,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -538,7 +538,7 @@ 
             $otherKeys         = [];
             $keys              = [];
 
-            if (! $owningAssociation->isOwningSide()) {
+            if ( ! $owningAssociation->isOwningSide()) {
                 $class             = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
@@ -648,7 +648,7 @@ 
             }
 
             // Only owning side of x-1 associations can have a FK column.
-            if (! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
+            if ( ! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -691,7 +691,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -811,7 +811,7 @@ 
             $sourceKeyColumn = $joinColumn->getReferencedColumnName();
             $targetKeyColumn = $joinColumn->getColumnName();
 
-            if (! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
+            if ( ! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
                 throw MappingException::joinColumnMustPointToMappedField(
                     $sourceClass->getClassName(),
                     $sourceKeyColumn
@@ -1038,7 +1038,7 @@ 
         $criteria    = [];
         $parameters  = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1066,7 +1066,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[]                                       = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1116,11 +1116,11 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
                 break;
         }
 
@@ -1131,14 +1131,14 @@ 
 
         if ($filterSql !== '') {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
-        $select = 'SELECT ' . $columnList;
-        $from   = ' FROM ' . $tableName . ' ' . $tableAlias;
-        $join   = $this->currentPersisterContext->selectJoinSql . $joinSql;
-        $where  = ($conditionSql ? ' WHERE ' . $conditionSql : '');
+        $select = 'SELECT '.$columnList;
+        $from   = ' FROM '.$tableName.' '.$tableAlias;
+        $join   = $this->currentPersisterContext->selectJoinSql.$joinSql;
+        $where  = ($conditionSql ? ' WHERE '.$conditionSql : '');
         $lock   = $this->platform->appendLockHint($from, $lockMode);
         $query  = $select
             . $lock
@@ -1146,7 +1146,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0).$lockSql;
     }
 
     /**
@@ -1165,13 +1165,13 @@ 
 
         if ($filterSql !== '') {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         return 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $tableAlias
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . 'FROM '.$tableName.' '.$tableAlias
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
     }
 
     /**
@@ -1186,7 +1186,7 @@ 
      */
     final protected function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1195,7 +1195,7 @@ 
         foreach ($orderBy as $fieldName => $orientation) {
             $orientation = strtoupper(trim($orientation));
 
-            if (! in_array($orientation, ['ASC', 'DESC'], true)) {
+            if ( ! in_array($orientation, ['ASC', 'DESC'], true)) {
                 throw InvalidOrientation::fromClassNameAndField($this->class->getClassName(), $fieldName);
             }
 
@@ -1205,11 +1205,11 @@ 
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             } elseif ($property instanceof AssociationMetadata) {
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     throw InvalidFindByCall::fromInverseSideUsage(
                         $this->class->getClassName(),
                         $fieldName
@@ -1225,7 +1225,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1234,7 +1234,7 @@ 
             throw UnrecognizedField::byName($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1276,7 +1276,7 @@ 
                     $isAssocToOneInverseSide = $property instanceof ToOneAssociationMetadata && ! $property->isOwningSide();
                     $isAssocFromOneEager     = ! $property instanceof ManyToManyAssociationMetadata && $property->getFetchMode() === FetchMode::EAGER;
 
-                    if (! ($isAssocFromOneEager || $isAssocToOneInverseSide)) {
+                    if ( ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) {
                         break;
                     }
 
@@ -1291,7 +1291,7 @@ 
                         break; // now this is why you shouldn't use inheritance
                     }
 
-                    $assocAlias = 'e' . ($eagerAliasCounter++);
+                    $assocAlias = 'e'.($eagerAliasCounter++);
 
                     $this->currentPersisterContext->rsm->addJoinedEntityResult($targetEntity, $assocAlias, 'r', $fieldName);
 
@@ -1319,14 +1319,14 @@ 
                         $this->currentPersisterContext->rsm->addIndexBy($assocAlias, $property->getIndexedBy());
                     }
 
-                    if (! $property->isOwningSide()) {
+                    if ( ! $property->isOwningSide()) {
                         $owningAssociation = $eagerEntity->getProperty($property->getMappedBy());
                     }
 
                     $joinTableAlias = $this->getSQLTableAlias($eagerEntity->getTableName(), $assocAlias);
                     $joinTableName  = $eagerEntity->table->getQuotedQualifiedName($this->platform);
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForAssociation($property);
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForAssociation($property);
 
                     $sourceClass      = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
                     $targetClass      = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
@@ -1350,7 +1350,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1372,7 +1372,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1412,7 +1412,7 @@ 
         $owningAssociation = $association;
         $sourceTableAlias  = $this->getSQLTableAlias($this->class->getTableName());
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $targetEntity      = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssociation = $targetEntity->getProperty($association->getMappedBy());
         }
@@ -1433,7 +1433,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1497,7 +1497,7 @@ 
                     break;
 
                 case $property instanceof FieldMetadata:
-                    if ((! $property->hasValueGenerator() || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY)
+                    if (( ! $property->hasValueGenerator() || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY)
                         || $this->class->identifier[0] !== $name) {
                         $columnName = $property->getColumnName();
 
@@ -1554,7 +1554,7 @@ 
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->getClassName());
 
-        return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias;
+        return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias;
     }
 
     /**
@@ -1568,14 +1568,14 @@ 
     protected function getSQLTableAlias($tableName, $assocName = '')
     {
         if ($tableName) {
-            $tableName .= '#' . $assocName;
+            $tableName .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) {
             return $this->currentPersisterContext->sqlTableAliases[$tableName];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias;
 
@@ -1601,7 +1601,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql   = 'SELECT 1 '
              . $lock
              . $where
@@ -1624,7 +1624,7 @@ 
         $tableName = $this->class->table->getQuotedQualifiedName($this->platform);
 
         return $this->platform->appendLockHint(
-            'FROM ' . $tableName . ' ' . $this->getSQLTableAlias($this->class->getTableName()),
+            'FROM '.$tableName.' '.$this->getSQLTableAlias($this->class->getTableName()),
             $lockMode
         );
     }
@@ -1674,19 +1674,19 @@ 
 
             if ($comparison !== null) {
                 // special case null value handling
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && $value ===null) {
-                    $selectedColumns[] = $column . ' IS NULL';
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && $value === null) {
+                    $selectedColumns[] = $column.' IS NULL';
 
                     continue;
                 }
 
                 if ($comparison === Comparison::NEQ && $value === null) {
-                    $selectedColumns[] = $column . ' IS NOT NULL';
+                    $selectedColumns[] = $column.' IS NOT NULL';
 
                     continue;
                 }
 
-                $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
+                $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder);
 
                 continue;
             }
@@ -1734,7 +1734,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1743,7 +1743,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1756,10 +1756,10 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
                 }
             } else {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     throw InvalidFindByCall::fromInverseSideUsage(
                         $this->class->getClassName(),
                         $field
@@ -1774,7 +1774,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1882,7 +1882,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . '.' . $quotedColumnName] = $value;
+            $criteria[$tableAlias.'.'.$quotedColumnName] = $value;
             $parameters[]                                    = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1967,7 +1967,7 @@ 
             case $property instanceof AssociationMetadata:
                 $class = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     $property = $class->getProperty($property->getMappedBy());
                     $class    = $this->em->getClassMetadata($property->getTargetEntity());
                 }
@@ -1989,7 +1989,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(static function ($type) {
+            return array_map(static function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2046,7 +2046,7 @@ 
      */
     private function getIndividualValue($value)
     {
-        if (! is_object($value) || ! $this->em->getMetadataFactory()->hasMetadataFor(StaticClassNameConverter::getClass($value))) {
+        if ( ! is_object($value) || ! $this->em->getMetadataFactory()->hasMetadataFor(StaticClassNameConverter::getClass($value))) {
             return $value;
         }
 
@@ -2060,7 +2060,7 @@ 
     {
         $criteria = $this->getIdentifier($entity);
 
-        if (! $criteria) {
+        if ( ! $criteria) {
             return false;
         }
 
@@ -2068,12 +2068,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         [$params, $types] = $this->expandParameters($criteria);
 
         if ($extraConditions !== null) {
-            $sql                             .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                             .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             [$criteriaParams, $criteriaTypes] = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -2083,7 +2083,7 @@ 
         $filterSql = $this->generateFilterConditionSQL($this->class, $alias);
 
         if ($filterSql) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2096,13 +2096,13 @@ 
      */
     protected function getJoinSQLForAssociation(AssociationMetadata $association)
     {
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return 'LEFT JOIN';
         }
 
         // if one of the join columns is nullable, return left join
         foreach ($association->getJoinColumns() as $joinColumn) {
-            if (! $joinColumn->isNullable()) {
+            if ( ! $joinColumn->isNullable()) {
                 continue;
             }
 
@@ -2119,7 +2119,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2138,13 +2138,13 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? '(' . $sql . ')' : ''; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? '('.$sql.')' : ''; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

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

Spacing +18 added lines, -18 removed lines

@@ -85,10 +85,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;
                 }
 
@@ -97,9 +97,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)];
                 } elseif (isset($this->resultPointers[$parent])) {
-                    $baseElement =& $this->resultPointers[$parent];
+                    $baseElement = & $this->resultPointers[$parent];
                 } else {
                     unset($this->resultPointers[$dqlAlias]); // Ticket #1228
 
@@ -111,10 +111,10 @@ 
                 $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])) {
+                    if ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = [];
                     }
 
@@ -123,7 +123,7 @@ 
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parent]][$id[$dqlAlias]] : false;
                         $indexIsValid = $index !== false ? isset($baseElement[$relationAlias][$index]) : false;
 
-                        if (! $indexExists || ! $indexIsValid) {
+                        if ( ! $indexExists || ! $indexIsValid) {
                             $element = $data;
 
                             if (isset($this->rsm->indexByMap[$dqlAlias])) {
@@ -140,16 +140,16 @@ 
                 } else {
                     $oneToOne = true;
 
-                    if (! isset($nonemptyComponents[$dqlAlias]) &&
+                    if ( ! isset($nonemptyComponents[$dqlAlias]) &&
                         ( ! isset($baseElement[$relationAlias]))
                     ) {
                         $baseElement[$relationAlias] = null;
-                    } elseif (! isset($baseElement[$relationAlias])) {
+                    } elseif ( ! isset($baseElement[$relationAlias])) {
                         $baseElement[$relationAlias] = $data;
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -161,7 +161,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;
@@ -198,13 +198,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)) {
                 // this only ever happens when no object is fetched (scalar result only)
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
                     ? $row[$this->rsm->indexByMap['scalars']]
@@ -218,7 +218,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
@@ -259,22 +259,22 @@ 
         }
 
         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;
         }
 
-        if (! $coll) {
+        if ( ! $coll) {
             return;
         }
 
         end($coll);
-        $this->resultPointers[$dqlAlias] =& $coll[key($coll)];
+        $this->resultPointers[$dqlAlias] = & $coll[key($coll)];
     }
 }

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Spacing +20 added lines, -20 removed lines

@@ -346,7 +346,7 @@ 
         $conn = static::$sharedConn;
 
         // In case test is skipped, tearDown is called, but no setup may have run
-        if (! $conn) {
+        if ( ! $conn) {
             return;
         }
 
@@ -420,7 +420,7 @@ 
         }
 
         if (isset($this->usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('file'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('file'));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -513,12 +513,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -630,7 +630,7 @@ 
         $classes = [];
 
         foreach ($classNames as $className) {
-            if (! isset(static::$entityTablesCreated[$className])) {
+            if ( ! isset(static::$entityTablesCreated[$className])) {
                 static::$entityTablesCreated[$className] = true;
                 $classes[]                               = $this->em->getClassMetadata($className);
             }
@@ -649,25 +649,25 @@ 
     {
         $this->setUpDBALTypes();
 
-        if (! isset(static::$sharedConn)) {
+        if ( ! isset(static::$sharedConn)) {
             static::$sharedConn = TestUtil::getConnection();
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ['mysql', 'postgresql'], true)) {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/');
             } elseif (static::$sharedConn->getDatabasePlatform()->getName() === 'oracle') {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . static::class . '*/ FROM dual');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.static::class.'*/ FROM dual');
             }
         }
 
-        if (! $this->em) {
+        if ( ! $this->em) {
             $this->em         = $this->getEntityManager();
             $this->schemaTool = new SchemaTool($this->em);
         }
 
         foreach ($this->usedModelSets as $setName => $bool) {
-            if (! isset(static::$tablesCreated[$setName])) {
+            if ( ! isset(static::$tablesCreated[$setName])) {
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
 
                 static::$tablesCreated[$setName] = true;
@@ -742,8 +742,8 @@ 
 
         $config->setMetadataDriverImpl(
             $mappingDriver ?? $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames'),
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames'),
             ])
         );
 
@@ -791,13 +791,13 @@ 
 
             foreach ($last25queries as $i => $query) {
                 $params = array_map(
-                    static function ($p) {
+                    static function($p) {
                         return is_object($p) ? get_class($p) : var_export($p, true);
                     },
                     $query['params'] ?: []
                 );
 
-                $queries .= $i . ". SQL: '" . $query['sql'] . "' Params: " . implode(', ', $params) . PHP_EOL;
+                $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(', ', $params).PHP_EOL;
             }
 
             $trace    = $e->getTrace();
@@ -810,11 +810,11 @@ 
                         break;
                     }
 
-                    $traceMsg .= $part['file'] . ':' . $part['line'] . PHP_EOL;
+                    $traceMsg .= $part['file'].':'.$part['line'].PHP_EOL;
                 }
             }
 
-            $message = '[' . get_class($e) . '] ' . $e->getMessage() . PHP_EOL . PHP_EOL . 'With queries:' . PHP_EOL . $queries . PHP_EOL . 'Trace:' . PHP_EOL . $traceMsg;
+            $message = '['.get_class($e).'] '.$e->getMessage().PHP_EOL.PHP_EOL.'With queries:'.PHP_EOL.$queries.PHP_EOL.'Trace:'.PHP_EOL.$traceMsg;
 
             throw new Exception($message, (int) $e->getCode(), $e);
         }

lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
     protected function configure()
     {
         $this->setName('orm:run-dql')
-             ->setDescription('Executes arbitrary DQL directly from the command line')
-             ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
-             ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
-             ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
-             ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
-             ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
-             ->setHelp('Executes arbitrary DQL directly from the command line.');
+                ->setDescription('Executes arbitrary DQL directly from the command line')
+                ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
+                ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
+                ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
+                ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
+                ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
+                ->setHelp('Executes arbitrary DQL directly from the command line.');
     }
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -58,9 +58,9 @@ 
         }
 
         $hydrationModeName = $input->getOption('hydrate');
-        $hydrationMode     = 'Doctrine\ORM\Query::HYDRATE_' . strtoupper(str_replace('-', '_', $hydrationModeName));
+        $hydrationMode     = 'Doctrine\ORM\Query::HYDRATE_'.strtoupper(str_replace('-', '_', $hydrationModeName));
 
-        if (! defined($hydrationMode)) {
+        if ( ! defined($hydrationMode)) {
             throw new RuntimeException(sprintf(
                 "Hydration mode '%s' does not exist. It should be either: object. array, scalar or single-scalar.",
                 $hydrationModeName
@@ -71,7 +71,7 @@ 
         $firstResult = $input->getOption('first-result');
 
         if ($firstResult !== null) {
-            if (! is_numeric($firstResult)) {
+            if ( ! is_numeric($firstResult)) {
                 throw new LogicException("Option 'first-result' must contain an integer value");
             }
 
@@ -81,7 +81,7 @@ 
         $maxResult = $input->getOption('max-result');
 
         if ($maxResult !== null) {
-            if (! is_numeric($maxResult)) {
+            if ( ! is_numeric($maxResult)) {
                 throw new LogicException("Option 'max-result' must contain an integer value");
             }
 
@@ -95,7 +95,7 @@ 
 
         $resultSet = $query->execute([], constant($hydrationMode));
 
-        $dumper = new CliDumper(static function (string $payload) use ($output) : void {
+        $dumper = new CliDumper(static function(string $payload) use ($output) : void {
             $output->write($payload);
         });
         $dumper->dump((new VarCloner())->cloneVar($resultSet));

lib/Doctrine/ORM/Tools/Setup.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     {
         $cache = self::createCacheInstance($isDevMode, $cache);
 
-        if (! $cache instanceof CacheProvider) {
+        if ( ! $cache instanceof CacheProvider) {
             return $cache;
         }
 
@@ -96,7 +96,7 @@ 
             $namespace .= ':';
         }
 
-        $cache->setNamespace($namespace . 'dc2_' . md5($proxyDir) . '_'); // to avoid collisions
+        $cache->setNamespace($namespace.'dc2_'.md5($proxyDir).'_'); // to avoid collisions
 
         return $cache;
     }