doctrine / orm

lib/Doctrine/ORM/PersistentObject.php

Doc Comments +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
      * @param string $field
      * @param array  $args
      *
-     * @return object
+     * @return PersistentObject
      *
      * @throws \BadMethodCallException   When no persistent field exists by that name.
      * @throws \InvalidArgumentException When the wrong target object type is passed to an association.
@@ -207,7 +207,7 @@ 
      * @param string $field
      * @param array  $args
      *
-     * @return object
+     * @return PersistentObject
      *
      * @throws \BadMethodCallException
      * @throws \InvalidArgumentException

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -89,7 +89,7 @@ 
     {
         if ($entityManager !== self::$entityManager) {
             throw new \RuntimeException(
-                "Trying to use PersistentObject with different EntityManager instances. " .
+                "Trying to use PersistentObject with different EntityManager instances. ".
                 "Was PersistentObject::setEntityManager() called?"
             );
         }
@@ -114,7 +114,7 @@ 
 
         $property = $this->cm->getProperty($field);
 
-        if (! $property) {
+        if ( ! $property) {
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
         }
 
@@ -153,7 +153,7 @@ 
 
         $property = $this->cm->getProperty($field);
 
-        if (! $property) {
+        if ( ! $property) {
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
         }
 
@@ -179,7 +179,7 @@ 
         $mappedByField    = $property->getMappedBy();
         $targetMetadata   = self::$entityManager->getClassMetadata($property->getTargetEntity());
         $targetProperty   = $targetMetadata->getProperty($mappedByField);
-        $setterMethodName = ($targetProperty instanceof ToManyAssociationMetadata ? 'add' : 'set') . $mappedByField;
+        $setterMethodName = ($targetProperty instanceof ToManyAssociationMetadata ? 'add' : 'set').$mappedByField;
 
         $targetObject->$setterMethodName($this);
     }
@@ -201,21 +201,21 @@ 
 
         $property = $this->cm->getProperty($field);
 
-        if (! $property) {
+        if ( ! $property) {
             throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getClassName()."'");
         }
 
-        if (! ($property instanceof ToManyAssociationMetadata)) {
+        if ( ! ($property instanceof ToManyAssociationMetadata)) {
             throw new \BadMethodCallException("There is no method add".$field."() on ".$this->cm->getClassName());
         }
 
         $targetClassName = $property->getTargetEntity();
 
-        if (! ($args[0] instanceof $targetClassName)) {
+        if ( ! ($args[0] instanceof $targetClassName)) {
             throw new \InvalidArgumentException("Expected persistent object of type '".$targetClassName."'");
         }
 
-        if (! ($this->$field instanceof Collection)) {
+        if ( ! ($this->$field instanceof Collection)) {
             $this->$field = new ArrayCollection($this->$field ?: []);
         }
 
@@ -239,7 +239,7 @@ 
             return;
         }
 
-        if (!self::$entityManager) {
+        if ( ! self::$entityManager) {
             throw new \RuntimeException("No runtime entity manager set. Call PersistentObject#setEntityManager().");
         }
 

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

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\ORM\Mapping\AssociationMetadata;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;

Spacing +44 added lines, -44 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Collection;
 
@@ -31,7 +31,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -56,7 +56,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -87,7 +87,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.");
         }
 
@@ -97,7 +97,7 @@ 
             : $association->getMappedBy()
         ;
 
-        $criteria  = [
+        $criteria = [
             $mappedKey                   => $collection->getOwner(),
             $association->getIndexedBy() => $index,
         ];
@@ -133,11 +133,11 @@ 
             $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedName   = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedName, $sourceClass, $this->em));
             }
 
-            $conditions[]   = 't.' . $quotedColumnName . ' = ?';
+            $conditions[]   = 't.'.$quotedColumnName.' = ?';
             $params[]       = $id[$sourceClass->fieldNames[$referencedName]];
             $types[]        = $joinColumn->getType();
         }
@@ -166,9 +166,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);
     }
@@ -190,13 +190,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.");
         }
 
         list($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);
     }
@@ -212,7 +212,7 @@ 
 
         list($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);
     }
@@ -228,7 +228,7 @@ 
 
         list($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);
     }
@@ -246,7 +246,7 @@ 
         $onConditions  = $this->getOnConditionSQL($association);
         $whereClauses  = $params = $types = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $association = $targetClass->getProperty($association->getMappedBy());
             $joinColumns = $association->getJoinTable()->getInverseJoinColumns();
         } else {
@@ -257,7 +257,7 @@ 
             $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedName   = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(
                     PersisterHelper::getTypeOfColumn($referencedName, $ownerMetadata, $this->em)
                 );
@@ -287,11 +287,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);
@@ -328,8 +328,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];
     }
@@ -348,18 +348,18 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ($filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
-        if (! $filterClauses) {
+        if ( ! $filterClauses) {
             return '';
         }
 
         $filterSql = implode(' AND ', $filterClauses);
 
         return count($filterClauses) > 1
-            ? '(' . $filterSql . ')'
+            ? '('.$filterSql.')'
             : $filterSql
         ;
     }
@@ -390,7 +390,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;
@@ -412,7 +412,7 @@ 
             $columns[] = $this->platform->quoteIdentifier($joinColumn->getColumnName());
         }
 
-        return 'DELETE FROM ' . $joinTableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        return 'DELETE FROM '.$joinTableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
     }
 
     /**
@@ -603,7 +603,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();
@@ -615,7 +615,7 @@ 
         }
 
         $joinTableName   = $joinTable->getQuotedQualifiedName($this->platform);
-        $quotedJoinTable = $joinTableName . ' t';
+        $quotedJoinTable = $joinTableName.' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -628,39 +628,39 @@ 
                 $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);
             $columnName       = $targetClass->getProperty($indexBy)->getColumnName();
 
-            $whereClauses[] = 'tr.' . $this->platform->quoteIdentifier($columnName) . ' = ?';
+            $whereClauses[] = 'tr.'.$this->platform->quoteIdentifier($columnName).' = ?';
             $params[]       = $key;
             $types[]        = PersisterHelper::getTypeOfColumn($columnName, $targetClass, $this->em);
         }
 
         foreach ($inverseJoinColumns as $joinColumn) {
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(
                     PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $sourceClass, $this->em)
                 );
             }
 
-            $whereClauses[] = 't.' . $this->platform->quoteIdentifier($joinColumn->getColumnName()) . ' = ?';
+            $whereClauses[] = 't.'.$this->platform->quoteIdentifier($joinColumn->getColumnName()).' = ?';
             $params[]       = $id[$sourceClass->fieldNames[$joinColumn->getReferencedColumnName()]];
             $types[]        = $joinColumn->getType();
         }
 
         if ( ! $joinNeeded) {
             foreach ($joinColumns as $joinColumn) {
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(
                         PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                     );
                 }
 
-                $whereClauses[] = 't.' . $this->platform->quoteIdentifier($joinColumn->getColumnName()) . ' = ?';
+                $whereClauses[] = 't.'.$this->platform->quoteIdentifier($joinColumn->getColumnName()).' = ?';
                 $params[]       = $key;
                 $types[]        = $joinColumn->getType();
             }
@@ -670,7 +670,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -694,7 +694,7 @@ 
         $association       = $collection->getMapping();
         $owningAssociation = $association;
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $sourceClass = $this->em->getClassMetadata($association->getTargetEntity());
             $targetClass = $this->em->getClassMetadata($association->getSourceEntity());
             $sourceId = $this->uow->getEntityIdentifier($element);
@@ -719,13 +719,13 @@ 
             $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[]       = $sourceId[$sourceClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -734,13 +734,13 @@ 
             $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[]       = $targetId[$targetClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -751,7 +751,7 @@ 
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }
@@ -800,10 +800,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/Collection/OneToManyPersister.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\ORM\Mapping\ColumnMetadata;
 use Doctrine\ORM\Mapping\InheritanceType;
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\PersistentCollection;

Indentation +4 added lines, -4 removed lines

@@ -145,9 +145,9 @@ 
         return (bool) $persister->count($criteria);
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function contains(PersistentCollection $collection, $element)
     {
         if ( ! $this->isValidEntityState($element)) {
@@ -265,7 +265,7 @@ 
 
         // 2) Build insert table records into temporary table
         $dql   = ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
-               . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
+                . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
         $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner());
 
         $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL();

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Collection;
 
@@ -30,7 +30,7 @@ 
         // the entire collection with a new would trigger this operation.
         $association = $collection->getMapping();
 
-        if (! $association->isOrphanRemoval()) {
+        if ( ! $association->isOrphanRemoval()) {
             // Handling non-orphan removal should never happen, as @OneToMany
             // can only be inverse side. For owning side one to many, it is
             // required to have a join table, which would classify as a ManyToManyPersister.
@@ -62,7 +62,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.");
         }
 
@@ -111,7 +111,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.");
         }
 
@@ -120,7 +120,7 @@ 
         // only works with single id identifier entities. Will throw an
         // exception in Entity Persisters if that is not the case for the
         // 'mappedBy' field.
-        $criteria  = [
+        $criteria = [
             $association->getMappedBy()  => $collection->getOwner(),
             $association->getIndexedBy() => $key,
         ];
@@ -157,12 +157,12 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOrphanRemoval()) {
+        if ( ! $association->isOrphanRemoval()) {
             // no-op: this is not the owning side, therefore no operations should be applied
             return false;
         }
 
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
@@ -202,7 +202,7 @@ 
         }
 
         $tableName = $targetClass->table->getQuotedQualifiedName($this->platform);
-        $statement = 'DELETE FROM ' . $tableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        $statement = 'DELETE FROM '.$tableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
 
         return $this->conn->executeUpdate($statement, $parameters);
     }
@@ -241,17 +241,17 @@ 
             ];
         }
 
-        $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable
-            . ' (' . $this->platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $statement = $this->platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable
+            . ' ('.$this->platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->conn->executeUpdate($statement);
 
         // 2) Build insert table records into temporary table
-        $dql   = ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
-               . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
+        $dql   = ' SELECT t0.'.implode(', t0.', $rootClass->getIdentifierFieldNames())
+               . ' FROM '.$targetClass->getClassName().' t0 WHERE t0.'.$association->getMappedBy().' = :owner';
         $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner());
 
-        $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL();
+        $statement  = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.') '.$query->getSQL();
         $parameters = array_values($sourcePersister->getIdentifier($collection->getOwner()));
         $numDeleted = $this->conn->executeUpdate($statement, $parameters);
 
@@ -265,8 +265,8 @@ 
         foreach (array_reverse($classNames) as $className) {
             $parentClass = $this->em->getClassMetadata($className);
             $tableName   = $parentClass->table->getQuotedQualifiedName($this->platform);
-            $statement   = 'DELETE FROM ' . $tableName . ' WHERE (' . $idColumnNameList . ')'
-                . ' IN (SELECT ' . $idColumnNameList . ' FROM ' . $tempTable . ')';
+            $statement   = 'DELETE FROM '.$tableName.' WHERE ('.$idColumnNameList.')'
+                . ' IN (SELECT '.$idColumnNameList.' FROM '.$tempTable.')';
 
             $this->conn->executeUpdate($statement);
         }

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

Doc Comments -1 removed lines

@@ -1409,7 +1409,6 @@
      * Gets the SQL join fragment used when selecting entities from a
      * many-to-many association.
      *
-     * @param ManyToManyAssociationMetadata $manyToMany
      *
      * @return string
      */

Indentation +12 added lines, -12 removed lines

@@ -323,8 +323,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();
@@ -457,8 +457,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);
 
@@ -1626,9 +1626,9 @@ 
         $lock  = $this->getLockTablesSql($lockMode);
         $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
         $sql = 'SELECT 1 '
-             . $lock
-             . $where
-             . $lockSql;
+                . $lock
+                . $where
+                . $lockSql;
 
         list($params, $types) = $this->expandParameters($criteria);
 
@@ -2107,8 +2107,8 @@ 
         $alias = $this->getSQLTableAlias($this->class->getTableName());
 
         $sql = 'SELECT 1 '
-             . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+                . $this->getLockTablesSql(null)
+                . ' WHERE ' . $this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
@@ -2142,9 +2142,9 @@ 
 
         // if one of the join columns is nullable, return left join
         foreach ($association->getJoinColumns() as $joinColumn) {
-             if (! $joinColumn->isNullable()) {
-                 continue;
-             }
+                if (! $joinColumn->isNullable()) {
+                    continue;
+                }
 
             return 'LEFT JOIN';
         }

Spacing +77 added lines, -77 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -300,14 +300,14 @@ 
         $tableName      = $versionedClass->table->getQuotedQualifiedName($this->platform);
         $columnName     = $this->platform->quoteIdentifier($versionProperty->getColumnName());
         $identifier     = array_map(
-            function ($columnName) { return $this->platform->quoteIdentifier($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();
@@ -393,7 +393,7 @@ 
 
             if (($value = $identifier[$field]) !== 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];
                 }
 
@@ -406,7 +406,7 @@ 
                 $quotedJoinColumnName = $this->platform->quoteIdentifier($joinColumnName);
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(
                         PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)
                     );
@@ -448,7 +448,7 @@ 
             $type             = $column->getType();
             $placeholder      = $type->convertToDatabaseValueSQL('?', $this->platform);
 
-            $set[]    = $quotedColumnName . ' = ' . $placeholder;
+            $set[]    = $quotedColumnName.' = '.$placeholder;
             $params[] = $value;
             $types[]  = $type;
         }
@@ -475,7 +475,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                     $joinColumn->setType(
@@ -504,18 +504,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);
 
@@ -534,7 +534,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getProperties() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -547,7 +547,7 @@ 
             $keys              = [];
 
             if ( ! $owningAssociation->isOwningSide()) {
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
 
@@ -659,7 +659,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;
             }
 
@@ -679,7 +679,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
@@ -710,7 +710,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -728,7 +728,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
@@ -847,7 +847,7 @@ 
             // unset the old value and set the new sql aliased value here. By definition
             // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method.
             // @todo guilhermeblanco In master we have: $identifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
-            $identifier[$targetTableAlias . "." . $targetKeyColumn] = $value;
+            $identifier[$targetTableAlias.".".$targetKeyColumn] = $value;
 
             unset($identifier[$targetKeyColumn]);
         }
@@ -1067,7 +1067,7 @@ 
         $criteria       = [];
         $parameters     = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1095,7 +1095,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1146,11 +1146,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;
         }
 
@@ -1161,14 +1161,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
@@ -1176,7 +1176,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1195,13 +1195,13 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $tableAlias
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . 'FROM '.$tableName.' '.$tableAlias
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -1218,7 +1218,7 @@ 
      */
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1227,7 +1227,7 @@ 
         foreach ($orderBy as $fieldName => $orientation) {
             $orientation = strtoupper(trim($orientation));
 
-            if (! in_array($orientation, ['ASC', 'DESC'])) {
+            if ( ! in_array($orientation, ['ASC', 'DESC'])) {
                 throw ORMException::invalidOrientation($this->class->getClassName(), $fieldName);
             }
 
@@ -1237,11 +1237,11 @@ 
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             } else if ($property instanceof AssociationMetadata) {
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $fieldName);
                 }
 
@@ -1254,7 +1254,7 @@ 
                     /* @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1263,7 +1263,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1285,7 +1285,7 @@ 
 
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
-        $this->currentPersisterContext->selectJoinSql    = '';
+        $this->currentPersisterContext->selectJoinSql = '';
 
         $eagerAliasCounter = 0;
         $columnList        = [];
@@ -1321,7 +1321,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);
 
@@ -1345,14 +1345,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());
@@ -1374,7 +1374,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1398,7 +1398,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1411,7 +1411,7 @@ 
             $quotedColumnName = $this->platform->quoteIdentifier($columnName);
             $resultColumnName = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(
                     PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                 );
@@ -1445,7 +1445,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());
         }
@@ -1467,7 +1467,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1561,7 +1561,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(
                                     PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)
                                 );
@@ -1602,7 +1602,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;
     }
 
     /**
@@ -1616,14 +1616,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;
 
@@ -1650,7 +1650,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1673,7 +1673,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
         );
     }
@@ -1726,19 +1726,19 @@ 
 
             if (null !== $comparison) {
                 // special case null value handling
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null ===$value) {
-                    $selectedColumns[] = $column . ' IS NULL';
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null === $value) {
+                    $selectedColumns[] = $column.' IS NULL';
 
                     continue;
                 }
 
                 if ($comparison === Comparison::NEQ && null === $value) {
-                    $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;
             }
@@ -1787,7 +1787,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1796,7 +1796,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1810,15 +1810,15 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
                 }
 
             } else {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $field);
                 }
 
-                $class      = $this->class->isInheritedProperty($field)
+                $class = $this->class->isInheritedProperty($field)
                     ? $owningAssociation->getDeclaringClass()
                     : $this->class
                 ;
@@ -1827,7 +1827,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1940,7 +1940,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2027,7 +2027,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());
                 }
@@ -2038,7 +2038,7 @@ 
                 ;
 
                 foreach ($joinColumns as $joinColumn) {
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(
                             PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $class, $this->em)
                         );
@@ -2055,7 +2055,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2134,12 +2134,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
         if (null !== $extraConditions) {
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -2147,7 +2147,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2162,13 +2162,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;
              }
 
@@ -2185,7 +2185,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2202,13 +2202,13 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

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

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
 use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ColumnMetadata;
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\GeneratorType;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -111,7 +111,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);
@@ -235,7 +235,7 @@ 
 
         if ($filterSql = $this->generateFilterConditionSQL($rootClass, $tableAlias)) {
             $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) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -284,14 +284,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -311,18 +311,18 @@ 
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $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;
     }
 
     /**
@@ -349,14 +349,14 @@ 
                 continue;
             }
 
-            if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
+            if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
                 continue;
             }
 
             $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
             foreach ($property->getJoinColumns() as $joinColumn) {
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(
                         PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                     );
@@ -376,7 +376,7 @@ 
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
         $columnList[] = $discrColumnType->convertToDatabaseValueSQL(
-            $this->getSQLTableAlias($discrColumn->getTableName()) . '.' . $discrColumnName,
+            $this->getSQLTableAlias($discrColumn->getTableName()).'.'.$discrColumnName,
             $this->platform
         );
 
@@ -403,7 +403,7 @@ 
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                 foreach ($property->getJoinColumns() as $joinColumn) {
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(
                             PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                         );
@@ -451,7 +451,7 @@ 
                         $columnName           = $joinColumn->getColumnName();
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(
                                 PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)
                             );
@@ -509,12 +509,12 @@ 
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $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);
@@ -526,12 +526,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/Entity/SingleTablePersister.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\FieldMetadata;
-use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Utility\PersisterHelper;
 

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $rootClass  = $this->em->getClassMetadata($this->class->getRootClassName());
         $tableAlias = $this->getSQLTableAlias($rootClass->getTableName());
 
-         // Append discriminator column
+            // Append discriminator column
         $discrColumn      = $this->class->discriminatorColumn;
         $discrColumnName  = $discrColumn->getColumnName();
         $discrColumnType  = $discrColumn->getType();

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -49,7 +49,7 @@ 
         $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName);
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
-        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($tableAlias . '.' . $quotedColumnName, $this->platform);
+        $columnList[] = $discrColumnType->convertToDatabaseValueSQL($tableAlias.'.'.$quotedColumnName, $this->platform);
 
         // Append subclass columns
         foreach ($this->class->getSubClasses() as $subClassName) {
@@ -70,7 +70,7 @@ 
                         $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                         foreach ($property->getJoinColumns() as $joinColumn) {
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(
                                     PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                                 );
@@ -126,7 +126,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -140,7 +140,7 @@ 
             $conditionSql .= ' AND ';
         }
 
-        return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL();
+        return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL();
     }
 
     /**
@@ -167,7 +167,7 @@ 
 
         return sprintf(
             '%s IN (%s)',
-            $discrColumnType->convertToDatabaseValueSQL($tableAlias . '.' . $quotedColumnName, $this->platform),
+            $discrColumnType->convertToDatabaseValueSQL($tableAlias.'.'.$quotedColumnName, $this->platform),
             implode(', ', $values)
         );
     }

lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php

Unused Use Statements -2 removed lines

@@ -22,9 +22,7 @@
 namespace Doctrine\ORM\Query\Exec;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\Mapping\ColumnMetadata;
 use Doctrine\ORM\Query\AST;
-use Doctrine\ORM\Utility\PersisterHelper;
 
 /**
  * Executes the SQL statements for bulk DQL DELETE statements on classes in

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query\Exec;
 
@@ -61,8 +61,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $primaryDqlAlias);
 
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
 
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $primaryDqlAlias);
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -74,7 +74,7 @@ 
         }
 
         // 2. Create ID subselect statement used in DELETE ... WHERE ... IN (subselect)
-        $idSubselect = 'SELECT ' . $idColumnNameList . ' FROM ' . $tempTable;
+        $idSubselect = 'SELECT '.$idColumnNameList.' FROM '.$tempTable;
 
         // 3. Create and store DELETE statements
         $classNames = array_merge(
@@ -87,8 +87,8 @@ 
             $parentClass = $em->getClassMetadata($className);
             $tableName   = $parentClass->table->getQuotedQualifiedName($platform);
 
-            $this->sqlStatements[] = 'DELETE FROM ' . $tableName
-                . ' WHERE (' . $idColumnNameList . ') IN (' . $idSubselect . ')';
+            $this->sqlStatements[] = 'DELETE FROM '.$tableName
+                . ' WHERE ('.$idColumnNameList.') IN ('.$idSubselect.')';
         }
 
         // 4. Store DDL for temporary identifier table.
@@ -101,8 +101,8 @@ 
             ];
         }
 
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }

lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php

Unused Use Statements -2 removed lines

@@ -22,10 +22,8 @@
 namespace Doctrine\ORM\Query\Exec;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\Mapping\ColumnMetadata;
 use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\ParameterTypeInferer;
-use Doctrine\ORM\Utility\PersisterHelper;
 
 /**
  * Executes the SQL statements for bulk DQL UPDATE statements on classes in

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query\Exec;
 
@@ -72,8 +72,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $updateClause->aliasIdentificationVariable);
 
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
 
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $updateClause->aliasIdentificationVariable);
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -81,7 +81,7 @@ 
         $this->insertSql .= $sqlWalker->walkFromClause($fromClause);
 
         // 2. Create ID subselect statement used in UPDATE ... WHERE ... IN (subselect)
-        $idSubselect = 'SELECT ' . $idColumnNameList . ' FROM ' . $tempTable;
+        $idSubselect = 'SELECT '.$idColumnNameList.' FROM '.$tempTable;
 
         // 3. Create and store UPDATE statements
         $classNames = array_merge(
@@ -96,7 +96,7 @@ 
             $affected  = false;
             $class     = $em->getClassMetadata($className);
             $tableName = $class->table->getQuotedQualifiedName($platform);
-            $updateSql = 'UPDATE ' . $tableName . ' SET ';
+            $updateSql = 'UPDATE '.$tableName.' SET ';
 
             foreach ($updateItems as $updateItem) {
                 $field    = $updateItem->pathExpression->field;
@@ -123,7 +123,7 @@ 
             }
 
             if ($affected) {
-                $this->sqlStatements[$i] = $updateSql . ' WHERE (' . $idColumnNameList . ') IN (' . $idSubselect . ')';
+                $this->sqlStatements[$i] = $updateSql.' WHERE ('.$idColumnNameList.') IN ('.$idSubselect.')';
             }
         }
 
@@ -142,8 +142,8 @@ 
             ];
         }
 
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }

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

Doc Comments +3 added lines, -3 removed lines

@@ -165,7 +165,7 @@ 
      * @param string                 $entityName    Full or partial entity name
      * @param EntityManagerInterface $entityManager
      *
-     * @return \Doctrine\ORM\Mapping\ClassMetadata
+     * @return \Doctrine\Common\Persistence\Mapping\ClassMetadata
      */
     private function getClassMetadata($entityName, EntityManagerInterface $entityManager)
     {
@@ -248,7 +248,7 @@ 
      * @param string $label Label for the value
      * @param mixed  $value A Value to show
      *
-     * @return array
+     * @return string[]
      */
     private function formatField($label, $value)
     {
@@ -347,7 +347,7 @@ 
      *
      * @param array $entityListeners
      *
-     * @return array
+     * @return string[]
      */
     private function formatEntityListeners(array $entityListeners)
     {

Braces +1 added lines, -1 removed lines

@@ -298,7 +298,7 @@
 
             if ($property instanceof FieldMetadata) {
                 $output = array_merge($output, $this->formatColumn($property));
-            }  else if ($property instanceof AssociationMetadata) {
+            } else if ($property instanceof AssociationMetadata) {
                 // @todo guilhermeblanco Fix me! We are trying to iterate through an AssociationMetadata instance
                 foreach ($property as $field => $value) {
                     $output[] = $this->formatField(sprintf('    %s', $field), $this->formatValue($value));

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 
@@ -159,8 +159,8 @@ 
 
         $matches = array_filter(
             $this->getMappedEntities($entityManager),
-            function ($mappedEntity) use ($entityName) {
-                return preg_match('{' . preg_quote($entityName) . '}', $mappedEntity);
+            function($mappedEntity) use ($entityName) {
+                return preg_match('{'.preg_quote($entityName).'}', $mappedEntity);
             }
         );
 
@@ -199,7 +199,7 @@ 
         }
 
         if (is_bool($value)) {
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
         }
 
         if (empty($value)) {
@@ -281,7 +281,7 @@ 
 
             if ($property instanceof FieldMetadata) {
                 $output = array_merge($output, $this->formatColumn($property));
-            }  else if ($property instanceof AssociationMetadata) {
+            } else if ($property instanceof AssociationMetadata) {
                 // @todo guilhermeblanco Fix me! We are trying to iterate through an AssociationMetadata instance
                 foreach ($property as $field => $value) {
                     $output[] = $this->formatField(sprintf('    %s', $field), $this->formatValue($value));
@@ -337,7 +337,7 @@ 
         return $this->formatField(
             'Entity listeners',
             array_map(
-                function ($entityListener) {
+                function($entityListener) {
                     return get_class($entityListener);
                 },
                 $entityListeners