doctrine / orm

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

Spacing +7 added lines, -7 removed lines

@@ -416,7 +416,7 @@ 
 
                 if (isset($manyToOneElement['fetch'])) {
                     $association->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string) $manyToOneElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $manyToOneElement['fetch'])
                     );
                 }
 
@@ -569,7 +569,7 @@ 
                 $fieldName = (string) $overrideElement['name'];
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -627,7 +627,7 @@ 
                 // Check for fetch
                 if (isset($overrideElement['fetch'])) {
                     $override->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string) $overrideElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $overrideElement['fetch'])
                     );
                 }
 
@@ -638,7 +638,7 @@ 
         // Evaluate <lifecycle-callbacks...>
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
-                $eventName  = constant(Events::class . '::' . (string) $lifecycleCallback['type']);
+                $eventName  = constant(Events::class.'::'.(string) $lifecycleCallback['type']);
                 $methodName = (string) $lifecycleCallback['method'];
 
                 $metadata->addLifecycleCallback($methodName, $eventName);
@@ -650,7 +650,7 @@ 
             foreach ($xmlRoot->{'entity-listeners'}->{'entity-listener'} as $listenerElement) {
                 $listenerClassName = (string) $listenerElement['class'];
 
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -816,7 +816,7 @@ 
         $fieldName = null
     ) {
         $baseRegion    = strtolower(str_replace('\\', '_', $metadata->getRootClassName()));
-        $defaultRegion = $baseRegion . ($fieldName ? '__' . $fieldName : '');
+        $defaultRegion = $baseRegion.($fieldName ? '__'.$fieldName : '');
 
         $region = (string) ($cacheMapping['region'] ?? $defaultRegion);
         $usage  = isset($cacheMapping['usage'])
@@ -844,7 +844,7 @@ 
             Events::preFlush,
         ];
 
-        return array_filter($events, static function ($eventName) use ($method) {
+        return array_filter($events, static function($eventName) use ($method) {
             return $eventName === $method->getName();
         });
     }

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Spacing +40 added lines, -40 removed lines

@@ -262,7 +262,7 @@ 
      */
     public function __toString()
     {
-        return self::class . '@' . spl_object_id($this);
+        return self::class.'@'.spl_object_id($this);
     }
 
     /**
@@ -349,7 +349,7 @@ 
         // Restore ReflectionClass and properties
         $this->reflectionClass = $reflectionService->getClass($this->className);
 
-        if (! $this->reflectionClass) {
+        if ( ! $this->reflectionClass) {
             return;
         }
 
@@ -373,11 +373,11 @@ 
         }
 
         // Verify & complete identifier mapping
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             throw MappingException::identifierRequired($this->className);
         }
 
-        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, static function (Property $property) : bool {
+        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, static function(Property $property) : bool {
             return $property instanceof FieldMetadata
                 && $property->isPrimaryKey()
                 && $property->hasValueGenerator();
@@ -396,14 +396,14 @@ 
     public function validateAssociations() : void
     {
         array_map(
-            function (Property $property) {
-                if (! ($property instanceof AssociationMetadata)) {
+            function(Property $property) {
+                if ( ! ($property instanceof AssociationMetadata)) {
                     return;
                 }
 
                 $targetEntity = $property->getTargetEntity();
 
-                if (! class_exists($targetEntity)) {
+                if ( ! class_exists($targetEntity)) {
                     throw MappingException::invalidTargetEntityClass($targetEntity, $this->className, $property->getName());
                 }
             },
@@ -421,7 +421,7 @@ 
         foreach ($this->lifecycleCallbacks as $callbacks) {
             /** @var array $callbacks */
             foreach ($callbacks as $callbackFuncName) {
-                if (! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
+                if ( ! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
                     throw MappingException::lifecycleCallbackMethodNotFound($this->className, $callbackFuncName);
                 }
             }
@@ -445,11 +445,11 @@ 
      */
     public function isIdentifier(string $fieldName) : bool
     {
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             return false;
         }
 
-        if (! $this->isIdentifierComposite()) {
+        if ( ! $this->isIdentifierComposite()) {
             return $fieldName === $this->identifier[0];
         }
 
@@ -477,7 +477,7 @@ 
             $property->setColumnName($columnName);
         }
 
-        if (! $this->isMappedSuperclass) {
+        if ( ! $this->isMappedSuperclass) {
             $property->setTableName($this->getTableName());
         }
 
@@ -497,7 +497,7 @@ 
                 throw MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($this->className, $property);
             }
 
-            if (! in_array($fieldName, $this->identifier, true)) {
+            if ( ! in_array($fieldName, $this->identifier, true)) {
                 $this->identifier[] = $fieldName;
             }
         }
@@ -547,7 +547,7 @@ 
         $fieldName    = $property->getName();
         $targetEntity = $property->getTargetEntity();
 
-        if (! $targetEntity) {
+        if ( ! $targetEntity) {
             throw MappingException::missingTargetEntity($fieldName);
         }
 
@@ -560,7 +560,7 @@ 
                 throw MappingException::illegalOrphanRemovalOnIdentifierAssociation($this->className, $fieldName);
             }
 
-            if (! in_array($property->getName(), $this->identifier, true)) {
+            if ( ! in_array($property->getName(), $this->identifier, true)) {
                 if ($property instanceof ToOneAssociationMetadata && count($property->getJoinColumns()) >= 2) {
                     throw MappingException::cannotMapCompositePrimaryKeyEntitiesAsForeignId(
                         $property->getTargetEntity(),
@@ -622,7 +622,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 if ($property instanceof OneToOneAssociationMetadata && $this->inheritanceType !== InheritanceType::SINGLE_TABLE) {
                     if (count($property->getJoinColumns()) === 1) {
-                        if (! $property->isPrimaryKey()) {
+                        if ( ! $property->isPrimaryKey()) {
                             $joinColumn->setUnique(true);
                         }
                     } else {
@@ -630,13 +630,13 @@ 
                     }
                 }
 
-                $joinColumn->setTableName(! $this->isMappedSuperclass ? $this->getTableName() : null);
+                $joinColumn->setTableName( ! $this->isMappedSuperclass ? $this->getTableName() : null);
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $joinColumn->setColumnName($this->namingStrategy->joinColumnName($fieldName, $this->className));
                 }
 
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
@@ -644,7 +644,7 @@ 
             }
 
             if ($uniqueConstraintColumns) {
-                if (! $this->table) {
+                if ( ! $this->table) {
                     throw new RuntimeException(
                         'ClassMetadata::setTable() has to be called before defining a one to one relationship.'
                     );
@@ -664,7 +664,7 @@ 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -727,14 +727,14 @@ 
     protected function validateAndCompleteOneToManyMapping(OneToManyAssociationMetadata $property)
     {
         // OneToMany MUST have mappedBy
-        if (! $property->getMappedBy()) {
+        if ( ! $property->getMappedBy()) {
             throw MappingException::oneToManyRequiresMappedBy($property->getName());
         }
 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -757,7 +757,7 @@ 
 
             $property->setJoinTable($joinTable);
 
-            if (! $joinTable->getName()) {
+            if ( ! $joinTable->getName()) {
                 $joinTableName = $this->namingStrategy->joinTableName(
                     $property->getSourceEntity(),
                     $property->getTargetEntity(),
@@ -769,7 +769,7 @@ 
 
             $selfReferencingEntityWithoutJoinColumns = $property->getSourceEntity() === $property->getTargetEntity() && ! $joinTable->hasColumns();
 
-            if (! $joinTable->getJoinColumns()) {
+            if ( ! $joinTable->getJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $sourceReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'source' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getSourceEntity(), $sourceReferenceName);
@@ -782,7 +782,7 @@ 
                 $joinTable->addJoinColumn($joinColumn);
             }
 
-            if (! $joinTable->getInverseJoinColumns()) {
+            if ( ! $joinTable->getInverseJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $targetReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'target' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getTargetEntity(), $targetReferenceName);
@@ -797,13 +797,13 @@ 
 
             foreach ($joinTable->getJoinColumns() as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getSourceEntity(),
                         $referencedColumnName
@@ -815,13 +815,13 @@ 
 
             foreach ($joinTable->getInverseJoinColumns() as $inverseJoinColumn) {
                 /** @var JoinColumnMetadata $inverseJoinColumn */
-                if (! $inverseJoinColumn->getReferencedColumnName()) {
+                if ( ! $inverseJoinColumn->getReferencedColumnName()) {
                     $inverseJoinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $inverseJoinColumn->getReferencedColumnName();
 
-                if (! $inverseJoinColumn->getColumnName()) {
+                if ( ! $inverseJoinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getTargetEntity(),
                         $referencedColumnName
@@ -855,7 +855,7 @@ 
             throw MappingException::singleIdNotAllowedOnCompositePrimaryKey($this->className);
         }
 
-        if (! isset($this->identifier[0])) {
+        if ( ! isset($this->identifier[0])) {
             throw MappingException::noIdDefined($this->className);
         }
 
@@ -914,7 +914,7 @@ 
             // Association defined as Id field
             $targetClass = $em->getClassMetadata($property->getTargetEntity());
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 $property    = $targetClass->getProperty($property->getMappedBy());
                 $targetClass = $em->getClassMetadata($property->getTargetEntity());
             }
@@ -928,7 +928,7 @@ 
                 $columnName           = $joinColumn->getColumnName();
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $em));
                 }
 
@@ -962,10 +962,10 @@ 
     {
         $schema = $this->getSchemaName() === null
             ? ''
-            : $this->getSchemaName() . '_';
+            : $this->getSchemaName().'_';
 
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return $schema . $this->getTableName() . '_id_tmp';
+        return $schema.$this->getTableName().'_id_tmp';
     }
 
     /**
@@ -999,7 +999,7 @@ 
      */
     public function setInheritanceType($type) : void
     {
-        if (! $this->isInheritanceType($type)) {
+        if ( ! $this->isInheritanceType($type)) {
             throw MappingException::invalidInheritanceType($this->className, $type);
         }
 
@@ -1017,7 +1017,7 @@ 
     {
         $fieldName = $property->getName();
 
-        if (! isset($this->declaredProperties[$fieldName])) {
+        if ( ! isset($this->declaredProperties[$fieldName])) {
             throw MappingException::invalidOverrideFieldName($this->className, $fieldName);
         }
 
@@ -1214,7 +1214,7 @@ 
         $declaringClass    = $property->getDeclaringClass();
 
         if ($inheritedProperty instanceof FieldMetadata) {
-            if (! $declaringClass->isMappedSuperclass) {
+            if ( ! $declaringClass->isMappedSuperclass) {
                 $inheritedProperty->setTableName($property->getTableName());
             }
 
@@ -1325,11 +1325,11 @@ 
             'method' => $method,
         ];
 
-        if (! class_exists($class)) {
+        if ( ! class_exists($class)) {
             throw MappingException::entityListenerClassNotFound($class, $this->className);
         }
 
-        if (! method_exists($class, $method)) {
+        if ( ! method_exists($class, $method)) {
             throw MappingException::entityListenerMethodNotFound($class, $method, $this->className);
         }
 
@@ -1396,7 +1396,7 @@ 
             return;
         }
 
-        if (! (class_exists($className) || interface_exists($className))) {
+        if ( ! (class_exists($className) || interface_exists($className))) {
             throw MappingException::invalidClassInDiscriminatorMap($className, $this->className);
         }
 

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

Spacing +78 added lines, -78 removed lines

@@ -298,16 +298,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();
@@ -346,13 +346,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;
         }
 
@@ -404,7 +404,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];
                 }
 
@@ -417,7 +417,7 @@ 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -483,7 +483,7 @@ 
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -510,18 +510,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);
 
@@ -538,7 +538,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -550,7 +550,7 @@ 
             $otherKeys         = [];
             $keys              = [];
 
-            if (! $owningAssociation->isOwningSide()) {
+            if ( ! $owningAssociation->isOwningSide()) {
                 $class             = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
@@ -660,7 +660,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;
             }
 
@@ -680,7 +680,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -707,7 +707,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -726,7 +726,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -831,7 +831,7 @@ 
             $sourceKeyColumn = $joinColumn->getReferencedColumnName();
             $targetKeyColumn = $joinColumn->getColumnName();
 
-            if (! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
+            if ( ! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
                 throw MappingException::joinColumnMustPointToMappedField(
                     $sourceClass->getClassName(),
                     $sourceKeyColumn
@@ -1058,7 +1058,7 @@ 
         $criteria    = [];
         $parameters  = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1086,7 +1086,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[]                                       = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1136,11 +1136,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;
         }
 
@@ -1151,14 +1151,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
@@ -1166,7 +1166,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1185,13 +1185,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);
     }
 
     /**
@@ -1206,7 +1206,7 @@ 
      */
     final protected function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1215,7 +1215,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);
             }
 
@@ -1225,11 +1225,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
@@ -1245,7 +1245,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1254,7 +1254,7 @@ 
             throw UnrecognizedField::byName($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1296,7 +1296,7 @@ 
                     $isAssocToOneInverseSide = $property instanceof ToOneAssociationMetadata && ! $property->isOwningSide();
                     $isAssocFromOneEager     = ! $property instanceof ManyToManyAssociationMetadata && $property->getFetchMode() === FetchMode::EAGER;
 
-                    if (! ($isAssocFromOneEager || $isAssocToOneInverseSide)) {
+                    if ( ! ($isAssocFromOneEager || $isAssocToOneInverseSide)) {
                         break;
                     }
 
@@ -1311,7 +1311,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);
 
@@ -1339,14 +1339,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());
@@ -1370,7 +1370,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1392,7 +1392,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1407,7 +1407,7 @@ 
             $referencedColumnName = $joinColumn->getReferencedColumnName();
             $resultColumnName     = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1437,7 +1437,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());
         }
@@ -1458,7 +1458,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1552,7 +1552,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -1591,7 +1591,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;
     }
 
     /**
@@ -1605,14 +1605,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;
 
@@ -1638,7 +1638,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql   = 'SELECT 1 '
              . $lock
              . $where
@@ -1661,7 +1661,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
         );
     }
@@ -1711,19 +1711,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;
             }
@@ -1771,7 +1771,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1780,7 +1780,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1793,10 +1793,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
@@ -1811,7 +1811,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1920,7 +1920,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . '.' . $quotedColumnName] = $value;
+            $criteria[$tableAlias.'.'.$quotedColumnName] = $value;
             $parameters[]                                    = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2005,7 +2005,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());
                 }
@@ -2018,7 +2018,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
                     }
 
@@ -2033,7 +2033,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);
         }
@@ -2090,7 +2090,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;
         }
 
@@ -2104,7 +2104,7 @@ 
     {
         $criteria = $this->getIdentifier($entity);
 
-        if (! $criteria) {
+        if ( ! $criteria) {
             return false;
         }
 
@@ -2112,12 +2112,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);
@@ -2127,7 +2127,7 @@ 
         $filterSql = $this->generateFilterConditionSQL($this->class, $alias);
 
         if ($filterSql) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2140,13 +2140,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;
             }
 
@@ -2163,7 +2163,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2182,13 +2182,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"
     }
 
     /**

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);
 

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

Spacing +25 added lines, -25 removed lines

@@ -109,7 +109,7 @@ 
             }
 
             foreach ($data as $columnName => $value) {
-                if (! is_array($id) || ! isset($id[$columnName])) {
+                if ( ! is_array($id) || ! isset($id[$columnName])) {
                     $type = $this->columns[$columnName]->getType();
 
                     $stmt->bindValue($paramIndex++, $value, $type);
@@ -133,7 +133,7 @@ 
     {
         $updateData = $this->prepareUpdateData($entity);
 
-        if (! $updateData) {
+        if ( ! $updateData) {
             return;
         }
 
@@ -151,7 +151,7 @@ 
             $versionedClass = $this->class->versionProperty->getDeclaringClass();
             $versionedTable = $versionedClass->getTableName();
 
-            if (! isset($updateData[$versionedTable])) {
+            if ( ! isset($updateData[$versionedTable])) {
                 $tableName = $versionedClass->table->getQuotedQualifiedName($this->platform);
 
                 $this->updateTable($entity, $tableName, [], true);
@@ -232,7 +232,7 @@ 
 
         if ($filterSql) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -240,26 +240,26 @@ 
 
         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;
         }
 
         $tableName  = $this->class->table->getQuotedQualifiedName($this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql !== '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql !== '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT ' . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -281,14 +281,14 @@ 
 
         if ($filterSql !== '') {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         return 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
     }
 
     /**
@@ -307,18 +307,18 @@ 
             $conditions = [];
             $tableName  = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql   .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -345,7 +345,7 @@ 
                 continue;
             }
 
-            if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
+            if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -355,7 +355,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -374,7 +374,7 @@ 
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
-        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias . '.' . $quotedColumnName, $this->platform);
+        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias.'.'.$quotedColumnName, $this->platform);
 
         // sub tables
         foreach ($this->class->getSubClasses() as $subClassName) {
@@ -398,7 +398,7 @@ 
                             /** @var JoinColumnMetadata $joinColumn */
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -448,7 +448,7 @@ 
                         $columnName           = $joinColumn->getColumnName();
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -504,12 +504,12 @@ 
             $conditions = [];
             $tableName  = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql   .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -521,12 +521,12 @@ 
             $subClass   = $this->em->getClassMetadata($subClassName);
             $tableName  = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName());
-            $joinSql   .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql   .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);

lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php

Spacing +46 added lines, -46 removed lines

@@ -37,7 +37,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -49,7 +49,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -69,7 +69,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -100,7 +100,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
@@ -144,7 +144,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -176,9 +176,9 @@ 
         }*/
 
         $sql = 'SELECT COUNT(*)'
-            . ' FROM ' . $joinTableName . ' t'
+            . ' FROM '.$joinTableName.' t'
             . $joinTargetEntitySQL
-            . ' WHERE ' . implode(' AND ', $conditions);
+            . ' WHERE '.implode(' AND ', $conditions);
 
         return $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -200,13 +200,13 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictionsWithKey($collection, $key, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -216,13 +216,13 @@ 
      */
     public function contains(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictions($collection, $element, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -232,13 +232,13 @@ 
      */
     public function removeElement(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictions($collection, $element, false);
 
-        $sql = 'DELETE FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'DELETE FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->executeUpdate($sql, $params, $types);
     }
@@ -256,7 +256,7 @@ 
         $onConditions  = $this->getOnConditionSQL($association);
         $whereClauses  = $params = $types = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $association = $targetClass->getProperty($association->getMappedBy());
             $joinColumns = $association->getJoinTable()->getInverseJoinColumns();
         } else {
@@ -268,7 +268,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $ownerMetadata, $this->em));
             }
 
@@ -296,11 +296,11 @@ 
 
         $resultSetMapping->addRootEntityFromClassMetadata($targetClass->getClassName(), 'te');
 
-        $sql = 'SELECT ' . $resultSetMapping->generateSelectClause()
-            . ' FROM ' . $tableName . ' te'
-            . ' JOIN ' . $joinTableName . ' t ON'
+        $sql = 'SELECT '.$resultSetMapping->generateSelectClause()
+            . ' FROM '.$tableName.' te'
+            . ' JOIN '.$joinTableName.' t ON'
             . implode(' AND ', $onConditions)
-            . ' WHERE ' . implode(' AND ', $whereClauses);
+            . ' WHERE '.implode(' AND ', $whereClauses);
 
         $sql .= $this->getOrderingSql($criteria, $targetClass);
         $sql .= $this->getLimitSql($criteria);
@@ -335,8 +335,8 @@ 
 
         // A join is needed if there is filtering on the target entity
         $tableName = $rootClass->table->getQuotedQualifiedName($this->platform);
-        $joinSql   = ' JOIN ' . $tableName . ' te'
-            . ' ON' . implode(' AND ', $this->getOnConditionSQL($association));
+        $joinSql   = ' JOIN '.$tableName.' te'
+            . ' ON'.implode(' AND ', $this->getOnConditionSQL($association));
 
         return [$joinSql, $filterSql];
     }
@@ -357,18 +357,18 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
-        if (! $filterClauses) {
+        if ( ! $filterClauses) {
             return '';
         }
 
         $filterSql = implode(' AND ', $filterClauses);
 
         return isset($filterClauses[1])
-            ? '(' . $filterSql . ')'
+            ? '('.$filterSql.')'
             : $filterSql;
     }
 
@@ -395,7 +395,7 @@ 
             $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-            $conditions[] = ' t.' . $quotedColumnName . ' = te.' . $quotedReferencedColumnName;
+            $conditions[] = ' t.'.$quotedColumnName.' = te.'.$quotedReferencedColumnName;
         }
 
         return $conditions;
@@ -417,7 +417,7 @@ 
             $columns[] = $this->platform->quoteIdentifier($joinColumn->getColumnName());
         }
 
-        return 'DELETE FROM ' . $joinTableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        return 'DELETE FROM '.$joinTableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
     }
 
     /**
@@ -472,7 +472,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -485,7 +485,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -536,7 +536,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -549,7 +549,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -633,7 +633,7 @@ 
         $sourceClass       = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
         $targetClass       = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
 
-        if (! $owningAssociation->isOwningSide()) {
+        if ( ! $owningAssociation->isOwningSide()) {
             $owningAssociation  = $targetClass->getProperty($owningAssociation->getMappedBy());
             $joinTable          = $owningAssociation->getJoinTable();
             $joinColumns        = $joinTable->getJoinColumns();
@@ -645,7 +645,7 @@ 
         }
 
         $joinTableName   = $joinTable->getQuotedQualifiedName($this->platform);
-        $quotedJoinTable = $joinTableName . ' t';
+        $quotedJoinTable = $joinTableName.' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -659,11 +659,11 @@ 
                 $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-                $joinConditions[] = ' t.' . $quotedColumnName . ' = tr.' . $quotedReferencedColumnName;
+                $joinConditions[] = ' t.'.$quotedColumnName.' = tr.'.$quotedReferencedColumnName;
             }
 
             $tableName        = $targetClass->table->getQuotedQualifiedName($this->platform);
-            $quotedJoinTable .= ' JOIN ' . $tableName . ' tr ON ' . implode(' AND ', $joinConditions);
+            $quotedJoinTable .= ' JOIN '.$tableName.' tr ON '.implode(' AND ', $joinConditions);
             $indexByProperty  = $targetClass->getProperty($indexBy);
 
             switch (true) {
@@ -686,7 +686,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -695,13 +695,13 @@ 
             $types[]        = $joinColumn->getType();
         }
 
-        if (! $joinNeeded) {
+        if ( ! $joinNeeded) {
             foreach ($joinColumns as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
                 $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -715,7 +715,7 @@ 
             [$joinTargetEntitySQL, $filterSql] = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -738,7 +738,7 @@ 
         $association       = $collection->getMapping();
         $owningAssociation = $association;
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $sourceClass      = $this->em->getClassMetadata($association->getTargetEntity());
             $targetClass      = $this->em->getClassMetadata($association->getSourceEntity());
             $sourceIdentifier = $this->uow->getEntityIdentifier($element);
@@ -764,11 +764,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $sourceIdentifier[$sourceClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -778,11 +778,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $targetIdentifier[$targetClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -793,7 +793,7 @@ 
             [$joinTargetEntitySQL, $filterSql] = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -838,10 +838,10 @@ 
                 $property   = $targetClass->getProperty($name);
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderBy[] = $columnName . ' ' . $direction;
+                $orderBy[] = $columnName.' '.$direction;
             }
 
-            return ' ORDER BY ' . implode(', ', $orderBy);
+            return ' ORDER BY '.implode(', ', $orderBy);
         }
         return '';
     }

lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php

Spacing +3 added lines, -3 removed lines

@@ -74,13 +74,13 @@
 
         switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
-                return '(' . implode(' AND ', $expressionList) . ')';
+                return '('.implode(' AND ', $expressionList).')';
 
             case CompositeExpression::TYPE_OR:
-                return '(' . implode(' OR ', $expressionList) . ')';
+                return '('.implode(' OR ', $expressionList).')';
 
             default:
-                throw new RuntimeException('Unknown composite ' . $expr->getType());
+                throw new RuntimeException('Unknown composite '.$expr->getType());
         }
     }
 

lib/Doctrine/ORM/Query/Lexer.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 
             // Recognize identifiers, aliased or qualified names
             case ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\':
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
 
                 if (defined($name)) {
                     $type = constant($name);

lib/Doctrine/ORM/Query/Expr/Base.php

Spacing +4 added lines, -4 removed lines

@@ -63,12 +63,12 @@ 
      */
     public function add($arg)
     {
-        if ($arg !== null && (! $arg instanceof self || $arg->count() > 0)) {
+        if ($arg !== null && ( ! $arg instanceof self || $arg->count() > 0)) {
             // If we decide to keep Expr\Base instances, we can use this check
-            if (! is_string($arg)) {
+            if ( ! is_string($arg)) {
                 $class = get_class($arg);
 
-                if (! in_array($class, $this->allowedClasses, true)) {
+                if ( ! in_array($class, $this->allowedClasses, true)) {
                     throw new InvalidArgumentException(
                         sprintf("Expression of type '%s' not allowed in this context.", $class)
                     );
@@ -98,6 +98,6 @@ 
             return (string) $this->parts[0];
         }
 
-        return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator;
+        return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator;
     }
 }

lib/Doctrine/ORM/Query/Parser.php

Spacing +31 added lines, -31 removed lines

@@ -397,7 +397,7 @@ 
         }
 
         foreach ($this->queryComponents as $dqlAlias => $qComp) {
-            if (! isset($this->identVariableExpressions[$dqlAlias])) {
+            if ( ! isset($this->identVariableExpressions[$dqlAlias])) {
                 continue;
             }
 
@@ -461,7 +461,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError(
             $message,
@@ -564,7 +564,7 @@ 
             $identVariable = $deferredItem['expression'];
 
             // Check if IdentificationVariable exists in queryComponents
-            if (! isset($this->queryComponents[$identVariable])) {
+            if ( ! isset($this->queryComponents[$identVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $identVariable),
                     $deferredItem['token']
@@ -574,7 +574,7 @@ 
             $qComp = $this->queryComponents[$identVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['metadata'])) {
+            if ( ! isset($qComp['metadata'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a Class.", $identVariable),
                     $deferredItem['token']
@@ -608,7 +608,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn      = $namespace . '\\' . $className;
+                $fqcn      = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className = $fqcn;
@@ -616,13 +616,13 @@ 
                 }
             }
 
-            if (! class_exists($className)) {
+            if ( ! class_exists($className)) {
                 $this->semanticalError(sprintf('Class "%s" is not defined.', $className), $token);
             }
 
             $class = new ReflectionClass($className);
 
-            if (! $class->isInstantiable()) {
+            if ( ! $class->isInstantiable()) {
                 $this->semanticalError(sprintf('Class "%s" can not be instantiated.', $className), $token);
             }
 
@@ -679,7 +679,7 @@ 
             $resultVariable = $deferredItem['expression'];
 
             // Check if ResultVariable exists in queryComponents
-            if (! isset($this->queryComponents[$resultVariable])) {
+            if ( ! isset($this->queryComponents[$resultVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $resultVariable),
                     $deferredItem['token']
@@ -689,7 +689,7 @@ 
             $qComp = $this->queryComponents[$resultVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['resultVariable'])) {
+            if ( ! isset($qComp['resultVariable'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a ResultVariable.", $resultVariable),
                     $deferredItem['token']
@@ -731,9 +731,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -749,7 +749,7 @@ 
             // Validate if PathExpression is one of the expected types
             $expectedType = $pathExpression->expectedType;
 
-            if (! ($expectedType & $fieldType)) {
+            if ( ! ($expectedType & $fieldType)) {
                 // We need to recognize which was expected type(s)
                 $expectedStringTypes = [];
 
@@ -771,8 +771,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= count($expectedStringTypes) === 1
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -784,7 +784,7 @@ 
 
     private function processRootEntityAliasSelected()
     {
-        if (! $this->identVariableExpressions) {
+        if ( ! $this->identVariableExpressions) {
             return;
         }
 
@@ -941,7 +941,7 @@ 
 
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
 
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -1020,9 +1020,9 @@ 
     {
         $identVariable = $this->IdentificationVariable();
 
-        if (! isset($this->queryComponents[$identVariable])) {
+        if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable . ' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1036,8 +1036,8 @@ 
         $class    = $qComp['metadata'];
         $property = $class->getProperty($field);
 
-        if (! ($property !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! ($property !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -1067,7 +1067,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
         }
 
@@ -1449,7 +1449,7 @@ 
         // Still need to decide between IdentificationVariable or ResultVariable
         $lookaheadValue = $this->lexer->lookahead['value'];
 
-        if (! isset($this->queryComponents[$lookaheadValue])) {
+        if ( ! isset($this->queryComponents[$lookaheadValue])) {
             $this->semanticalError('Cannot group by undefined identification or result variable.');
         }
 
@@ -1797,7 +1797,7 @@ 
         while ($this->lexer->isNextToken(Lexer::T_DOT)) {
             $this->match(Lexer::T_DOT);
             $this->match(Lexer::T_IDENTIFIER);
-            $field .= '.' . $this->lexer->token['value'];
+            $field .= '.'.$this->lexer->token['value'];
         }
 
         $partialFieldSet[] = $field;
@@ -1811,7 +1811,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
 
             $partialFieldSet[] = $field;
@@ -2432,7 +2432,7 @@ 
 
         // Phase 1 AST optimization: Prevent AST\ConditionalFactor
         // if only one AST\ConditionalPrimary is defined
-        if (! $not) {
+        if ( ! $not) {
             return $conditionalPrimary;
         }
 
@@ -2451,7 +2451,7 @@ 
     {
         $condPrimary = new AST\ConditionalPrimary();
 
-        if (! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
+        if ( ! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
 
             return $condPrimary;
@@ -2619,7 +2619,7 @@ 
             $this->match(Lexer::T_OF);
         }
 
-        $collMemberExpr      = new AST\CollectionMemberExpression(
+        $collMemberExpr = new AST\CollectionMemberExpression(
             $entityExpr,
             $this->CollectionValuedPathExpression()
         );
@@ -2958,7 +2958,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $isDistinct    = false;
 
-        if (! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
             $this->syntaxError('One of: MAX, MIN, AVG, SUM, COUNT');
         }
 
@@ -2988,7 +2988,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $value         = $this->lexer->lookahead['value'];
 
-        if (! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
             $this->syntaxError('ALL, ANY or SOME');
         }
 
@@ -3226,7 +3226,7 @@ 
                 $lookaheadValue = $this->lexer->lookahead['value'];
 
                 // Validate existing component
-                if (! isset($this->queryComponents[$lookaheadValue])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue])) {
                     $this->semanticalError('Cannot add having condition on undefined result variable.');
                 }
 
@@ -3237,7 +3237,7 @@ 
                 }
 
                 // Validating ResultVariable
-                if (! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
                     $this->semanticalError('Cannot add having condition on a non result variable.');
                 }