doctrine / orm

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

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
         $parentClass = $this->class;
 
         while (($parentClass = $parentClass->getParent()) !== null) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 $parentTableName = $parentClass->getTableName();
 
                 if ($parentClass !== $rootClass) {
@@ -110,7 +110,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);
@@ -134,7 +134,7 @@ 
     {
         $updateData = $this->prepareUpdateData($entity);
 
-        if (! $updateData) {
+        if ( ! $updateData) {
             return;
         }
 
@@ -152,7 +152,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);
@@ -189,7 +189,7 @@ 
         $parentClass  = $this->class;
 
         while (($parentClass = $parentClass->getParent()) !== null) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 $parentTable = $parentClass->table->getQuotedQualifiedName($this->platform);
 
                 $this->conn->delete($parentTable, $id);
@@ -235,7 +235,7 @@ 
 
         if ($filterSql) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -243,26 +243,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 ?? 0) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset ?? 0).$lockSql;
     }
 
     /**
@@ -284,14 +284,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,23 +307,23 @@ 
         $parentClass = $this->class;
 
         while (($parentClass = $parentClass->getParent()) !== null) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 $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;
     }
 
     /**
@@ -347,7 +347,7 @@ 
             if ($property instanceof FieldMetadata) {
                 $tableClass = $parentClass = $this->class;
                 while ($parentClass !== $property->getDeclaringClass() && ($parentClass = $parentClass->getParent()) !== null) {
-                    if (! $parentClass->isMappedSuperclass) {
+                    if ( ! $parentClass->isMappedSuperclass) {
                         $tableClass = $parentClass;
                     }
                 }
@@ -356,7 +356,7 @@ 
                 continue;
             }
 
-            if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
+            if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -366,7 +366,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -385,7 +385,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) {
@@ -409,7 +409,7 @@ 
                             /** @var JoinColumnMetadata $joinColumn */
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -459,7 +459,7 @@ 
                         $columnName           = $joinColumn->getColumnName();
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -512,16 +512,16 @@ 
         $parentClass = $this->class;
 
         while (($parentClass = $parentClass->getParent()) !== null) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 $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);
@@ -534,12 +534,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/Mapping/ClassMetadata.php

Spacing +22 added lines, -22 removed lines

@@ -220,11 +220,11 @@ 
             $this->setCache(clone $parent->cache);
         }
 
-        if (! empty($parent->lifecycleCallbacks)) {
+        if ( ! empty($parent->lifecycleCallbacks)) {
             $this->lifecycleCallbacks = $parent->lifecycleCallbacks;
         }
 
-        if (! empty($parent->entityListeners)) {
+        if ( ! empty($parent->entityListeners)) {
             $this->entityListeners = $parent->entityListeners;
         }
     }
@@ -265,7 +265,7 @@ 
     {
         $rootClass = $parentClass = $this;
         while (($parentClass = $parentClass->getParent()) !== null) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 $rootClass = $parentClass;
             }
         }
@@ -296,7 +296,7 @@ 
      */
     public function __toString()
     {
-        return self::class . '@' . spl_object_id($this);
+        return self::class.'@'.spl_object_id($this);
     }
 
     /**
@@ -392,11 +392,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];
         }
 
@@ -420,11 +420,11 @@ 
         }
 
         // Verify & complete identifier mapping
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             throw MappingException::identifierRequired($this->className);
         }
 
-        $explicitlyGeneratedProperties = array_filter($this->properties, static function (Property $property) : bool {
+        $explicitlyGeneratedProperties = array_filter($this->properties, static function(Property $property) : bool {
             return $property instanceof FieldMetadata
                 && $property->isPrimaryKey()
                 && $property->hasValueGenerator();
@@ -445,7 +445,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);
                 }
             }
@@ -474,7 +474,7 @@ 
             throw MappingException::singleIdNotAllowedOnCompositePrimaryKey($this->className);
         }
 
-        if (! isset($this->identifier[0])) {
+        if ( ! isset($this->identifier[0])) {
             throw MappingException::noIdDefined($this->className);
         }
 
@@ -533,7 +533,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());
             }
@@ -547,7 +547,7 @@ 
                 $columnName           = $joinColumn->getColumnName();
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $em));
                 }
 
@@ -581,10 +581,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';
     }
 
     /**
@@ -618,7 +618,7 @@ 
      */
     public function setInheritanceType($type) : void
     {
-        if (! $this->isInheritanceType($type)) {
+        if ( ! $this->isInheritanceType($type)) {
             throw MappingException::invalidInheritanceType($this->className, $type);
         }
 
@@ -636,7 +636,7 @@ 
     {
         $fieldName = $property->getName();
 
-        if (! isset($this->properties[$fieldName])) {
+        if ( ! isset($this->properties[$fieldName])) {
             throw MappingException::invalidOverrideFieldName($this->className, $fieldName);
         }
 
@@ -722,13 +722,13 @@ 
         $declaringClass = $this->properties[$fieldName]->getDeclaringClass();
         if ($declaringClass->className === $this->className) {
             return false;
-        } else if (! $declaringClass->isMappedSuperclass) {
+        } else if ( ! $declaringClass->isMappedSuperclass) {
             return true;
         }
 
         $parentClass = $this;
         while (($parentClass = $parentClass->getParent()) !== $declaringClass) {
-            if (! $parentClass->isMappedSuperclass) {
+            if ( ! $parentClass->isMappedSuperclass) {
                 return true;
             }
         }
@@ -850,7 +850,7 @@ 
         $inheritedProperty = $declaringClass->isMappedSuperclass ? clone $property : $property;
 
         if ($inheritedProperty instanceof FieldMetadata) {
-            if (! $declaringClass->isMappedSuperclass) {
+            if ( ! $declaringClass->isMappedSuperclass) {
                 $inheritedProperty->setTableName($property->getTableName());
             }
 
@@ -943,11 +943,11 @@ 
             'method' => $methodName,
         ];
 
-        if (! class_exists($class)) {
+        if ( ! class_exists($class)) {
             throw MappingException::entityListenerClassNotFound($class, $this->className);
         }
 
-        if (! method_exists($class, $methodName)) {
+        if ( ! method_exists($class, $methodName)) {
             throw MappingException::entityListenerMethodNotFound($class, $methodName, $this->className);
         }
 
@@ -1015,7 +1015,7 @@ 
             return;
         }
 
-        if (! (class_exists($className) || interface_exists($className))) {
+        if ( ! (class_exists($className) || interface_exists($className))) {
             throw MappingException::invalidClassInDiscriminatorMap($className, $this->className);
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         self::assertNotNull($child);
 
         // Test lock and update
-        $this->em->transactional(static function ($em) use ($child) {
+        $this->em->transactional(static function($em) use ($child) {
             $em->lock($child, LockMode::NONE);
             $child->firstName = 'Bob';
             $child->status    = 0;