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/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 +14 added lines, -14 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);
 
@@ -266,7 +266,7 @@ 
         // 4) Delete records on each table in the hierarchy
         $hierarchyClasses = array_merge(
             array_map(
-                function ($className) { return $this->em->getClassMetadata($className); },
+                function($className) { return $this->em->getClassMetadata($className); },
                 array_reverse($targetClass->getSubClasses())
             ),
             [$targetClass],

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 +75 added lines, -75 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 @@ 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -474,7 +474,7 @@ 
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -501,18 +501,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);
 
@@ -531,7 +531,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -544,7 +544,7 @@ 
             $keys              = [];
 
             if ( ! $owningAssociation->isOwningSide()) {
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
 
@@ -656,7 +656,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;
             }
 
@@ -676,7 +676,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -705,7 +705,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -724,7 +724,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1061,7 +1061,7 @@ 
         $criteria       = [];
         $parameters     = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1089,7 +1089,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1140,11 +1140,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;
         }
 
@@ -1155,14 +1155,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
@@ -1170,7 +1170,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1189,13 +1189,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;
     }
@@ -1212,7 +1212,7 @@ 
      */
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1221,7 +1221,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);
             }
 
@@ -1231,11 +1231,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);
                 }
 
@@ -1248,7 +1248,7 @@ 
                     /* @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1257,7 +1257,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1279,7 +1279,7 @@ 
 
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
-        $this->currentPersisterContext->selectJoinSql    = '';
+        $this->currentPersisterContext->selectJoinSql = '';
 
         $eagerAliasCounter = 0;
         $columnList        = [];
@@ -1315,7 +1315,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);
 
@@ -1340,14 +1340,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());
@@ -1369,7 +1369,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1393,7 +1393,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1408,7 +1408,7 @@ 
             $referencedColumnName = $joinColumn->getReferencedColumnName();
             $resultColumnName     = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1440,7 +1440,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());
         }
@@ -1462,7 +1462,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1557,7 +1557,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -1596,7 +1596,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;
     }
 
     /**
@@ -1610,14 +1610,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;
 
@@ -1644,7 +1644,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1667,7 +1667,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
         );
     }
@@ -1720,19 +1720,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;
             }
@@ -1781,7 +1781,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1790,7 +1790,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1804,15 +1804,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
                 ;
@@ -1821,7 +1821,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1934,7 +1934,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2021,7 +2021,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());
                 }
@@ -2035,7 +2035,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
                     }
 
@@ -2050,7 +2050,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2129,12 +2129,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
         if ($extraConditions !== null) {
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -2142,7 +2142,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2157,13 +2157,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;
              }
 
@@ -2180,7 +2180,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2198,13 +2198,13 @@ 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

lib/Doctrine/ORM/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 +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 
@@ -165,8 +165,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);
             }
         );
 
@@ -223,7 +223,7 @@ 
 
             $output[] = $this->formatField(
                 sprintf('  %s', $parentClass->getParent()),
-                ($parentClass->isRootEntity() ? '(Root) ' : '') . $this->formatValue($attributes)
+                ($parentClass->isRootEntity() ? '(Root) ' : '').$this->formatValue($attributes)
             );
         }
 
@@ -248,7 +248,7 @@ 
         }
 
         if (is_bool($value)) {
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
         }
 
         if (empty($value)) {
@@ -330,7 +330,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));
@@ -386,7 +386,7 @@ 
         return $this->formatField(
             'Entity listeners',
             array_map(
-                function ($entityListener) {
+                function($entityListener) {
                     return get_class($entityListener);
                 },
                 $entityListeners

lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php

Unused Use Statements -2 removed lines

@@ -21,9 +21,7 @@
 
 namespace Doctrine\ORM\Tools\Pagination;
 
-use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ToManyAssociationMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\TreeWalkerAdapter;

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Pagination;
 
@@ -72,7 +72,7 @@ 
 
         if ($property instanceof AssociationMetadata) {
             throw new \RuntimeException(
-                "Paginating an entity with foreign key as identifier only works when using the Output Walkers. " .
+                "Paginating an entity with foreign key as identifier only works when using the Output Walkers. ".
                 "Call Paginator#setUseOutputWalkers(true) before iterating the paginator."
             );
         }
@@ -99,7 +99,7 @@ 
 
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
                     $this->createSelectExpressionItem($item->expression),
-                    '_dctrn_ord' . $this->aliasCounter++
+                    '_dctrn_ord'.$this->aliasCounter++
                 );
             }
         }

lib/Doctrine/ORM/Utility/PersisterHelper.php

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
-use Doctrine\ORM\Query\QueryException;
 
 /**
  * The PersisterHelper contains logic to infer binding types which is used in

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Utility;
 
@@ -62,14 +62,14 @@ 
 
         // iterate over association mappings
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
             // resolve join columns over to-one or to-many
             $targetClass = $em->getClassMetadata($association->getTargetEntity());
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 $association = $targetClass->getProperty($association->getMappedBy());
                 $targetClass = $em->getClassMetadata($association->getTargetEntity());
             }

tests/Doctrine/Tests/Mocks/EntityPersisterMock.php

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 namespace Doctrine\Tests\Mocks;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\GeneratorType;
 use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Mocks;
 

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

Doc Comments +3 added lines, -3 removed lines

@@ -234,7 +234,7 @@ 
 
     /**
      *
-     * @return kateglo\application\helpers\collections\ArrayCollection
+     * @return ArrayCollection
      */
     public function getTypes()
     {
@@ -337,7 +337,7 @@ 
 
     /**
      *
-     * @param kateglo\application\models\Lemma $lemma
+     * @param Lemma $lemma
      * @return void
      */
     public function addLemma(Lemma $lemma)
@@ -350,7 +350,7 @@ 
 
     /**
      *
-     * @param kateglo\application\models\Lemma $lemma
+     * @param Lemma $lemma
      * @return void
      */
     public function removeLEmma(Lemma $lemma)

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -206,7 +206,7 @@ 
      *
      * @return string
      */
-    public function getLemma(){
+    public function getLemma() {
         return $this->lemma;
     }
 
@@ -215,7 +215,7 @@ 
      */
     public function addType(Type $type)
     {
-        if (!$this->types->contains($type)) {
+        if ( ! $this->types->contains($type)) {
             $this->types[] = $type;
             $type->addLemma($this);
         }
@@ -342,7 +342,7 @@ 
      */
     public function addLemma(Lemma $lemma)
     {
-        if (!$this->lemmas->contains($lemma)) {
+        if ( ! $this->lemmas->contains($lemma)) {
             $this->lemmas[] = $lemma;
             $lemma->addType($this);
         }

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

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 namespace Doctrine\Tests\ORM\Functional;
-use Doctrine\Common\Util\Debug;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\Tests\Models\Navigation\NavCountry;

Indentation +6 added lines, -6 removed lines

@@ -112,9 +112,9 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t, p, c '
-             . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
-             . 'INNER JOIN t.pois p '
-             . 'INNER JOIN p.country c'
+                . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
+                . 'INNER JOIN t.pois p '
+                . 'INNER JOIN p.country c'
         ;
 
         $tours = $this->em->createQuery($dql)->getResult();
@@ -134,9 +134,9 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t '
-             . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
-             . ', Doctrine\Tests\Models\Navigation\NavPointOfInterest p '
-             . 'WHERE p MEMBER OF t.pois'
+                . 'FROM Doctrine\Tests\Models\Navigation\NavTour t '
+                . ', Doctrine\Tests\Models\Navigation\NavPointOfInterest p '
+                . 'WHERE p MEMBER OF t.pois'
         ;
 
         $query = $this->em->createQuery($dql);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 use Doctrine\Common\Util\Debug;