doctrine / orm

lib/Doctrine/ORM/ORMInvalidArgumentException.php

Doc Comments -1 removed lines

@@ -207,7 +207,6 @@
 
     /**
      * @param ClassMetadata $targetClass
-     * @param array         $assoc
      * @param mixed         $actualValue
      *
      * @return self

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 use Doctrine\ORM\Mapping\AssociationMetadata;
@@ -21,7 +21,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -31,7 +31,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -41,7 +41,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -53,7 +53,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -65,7 +65,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -76,7 +76,7 @@ 
     static public function newEntitiesFoundThroughRelationships($newEntitiesWithAssociations)
     {
         $errorMessages = array_map(
-            function (array $newEntityWithAssociation) : string {
+            function(array $newEntityWithAssociation) : string {
                 [$associationMetadata, $entity] = $newEntityWithAssociation;
 
                 return self::newEntityFoundThroughRelationshipMessage($associationMetadata, $entity);
@@ -148,7 +148,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
             "from the database or registered as new through EntityManager#persist");
     }
 
@@ -160,7 +160,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -171,7 +171,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -182,7 +182,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -194,8 +194,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -203,7 +203,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }
 
@@ -260,15 +260,15 @@ 
     private static function newEntityFoundThroughRelationshipMessage(AssociationMetadata $association, $entity) : string
     {
         return 'A new entity was found through the relationship \''
-            . $association->getSourceEntity() . '#' . $association->getName() . '\' that was not'
-            . ' configured to cascade persist operations for entity: ' . self::objToStr($entity) . '.'
+            . $association->getSourceEntity().'#'.$association->getName().'\' that was not'
+            . ' configured to cascade persist operations for entity: '.self::objToStr($entity).'.'
             . ' To solve this issue: Either explicitly call EntityManager#persist()'
             . ' on this unknown entity or configure cascade persist'
             . ' this association in the mapping for example @ManyToOne(..,cascade={"persist"}).'
             . (method_exists($entity, '__toString')
                 ? ''
                 : ' If you cannot find out which entity causes the problem implement \''
-                . $association->getTargetEntity() . '#__toString()\' to get a clue.'
+                . $association->getTargetEntity().'#__toString()\' to get a clue.'
             );
     }
 }

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;
 
@@ -302,14 +302,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();
@@ -395,7 +395,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];
                 }
 
@@ -408,7 +408,7 @@ 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -476,7 +476,7 @@ 
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -503,18 +503,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);
 
@@ -533,7 +533,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -546,7 +546,7 @@ 
             $keys              = [];
 
             if ( ! $owningAssociation->isOwningSide()) {
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
 
@@ -658,7 +658,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;
             }
 
@@ -678,7 +678,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -707,7 +707,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -726,7 +726,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1063,7 +1063,7 @@ 
         $criteria       = [];
         $parameters     = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1091,7 +1091,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1142,11 +1142,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;
         }
 
@@ -1157,14 +1157,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
@@ -1172,7 +1172,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1191,13 +1191,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;
     }
@@ -1214,7 +1214,7 @@ 
      */
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1223,7 +1223,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);
             }
 
@@ -1233,11 +1233,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 InvalidFindByCall::fromInverseSideUsage(
                         $this->class->getClassName(),
                         $fieldName
@@ -1253,7 +1253,7 @@ 
                     /* @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1262,7 +1262,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1284,7 +1284,7 @@ 
 
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
-        $this->currentPersisterContext->selectJoinSql    = '';
+        $this->currentPersisterContext->selectJoinSql = '';
 
         $eagerAliasCounter = 0;
         $columnList        = [];
@@ -1320,7 +1320,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 '';
         }
 
@@ -1413,7 +1413,7 @@ 
             $referencedColumnName = $joinColumn->getReferencedColumnName();
             $resultColumnName     = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $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);
     }
 
     /**
@@ -1562,7 +1562,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -1601,7 +1601,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;
     }
 
     /**
@@ -1615,14 +1615,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;
 
@@ -1649,7 +1649,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1672,7 +1672,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
         );
     }
@@ -1725,19 +1725,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;
             }
@@ -1786,7 +1786,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1795,7 +1795,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1809,18 +1809,18 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
                 }
 
             } else {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     throw InvalidFindByCall::fromInverseSideUsage(
                         $this->class->getClassName(),
                         $field
                     );
                 }
 
-                $class      = $this->class->isInheritedProperty($field)
+                $class = $this->class->isInheritedProperty($field)
                     ? $owningAssociation->getDeclaringClass()
                     : $this->class
                 ;
@@ -1829,7 +1829,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1942,7 +1942,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2029,7 +2029,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());
                 }
@@ -2043,7 +2043,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
                     }
 
@@ -2058,7 +2058,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2137,12 +2137,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);
@@ -2150,7 +2150,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2165,13 +2165,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;
              }
 
@@ -2188,7 +2188,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2205,13 +2205,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/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/EntityGenerator.php

Doc Comments +3 added lines, -3 removed lines

@@ -1757,7 +1757,7 @@ 
     /**
      * @param integer $type The inheritance type used by the class and its subclasses.
      *
-     * @return string The literal string for the inheritance type.
+     * @return integer The literal string for the inheritance type.
      *
      * @throws \InvalidArgumentException When the inheritance type does not exist.
      */
@@ -1773,7 +1773,7 @@ 
     /**
      * @param integer $type The policy used for change-tracking for the mapped class.
      *
-     * @return string The literal string for the change-tracking type.
+     * @return integer The literal string for the change-tracking type.
      *
      * @throws \InvalidArgumentException When the change-tracking type does not exist.
      */
@@ -1789,7 +1789,7 @@ 
     /**
      * @param integer $type The generator to use for the mapped class.
      *
-     * @return string The literal string for the generator type.
+     * @return integer The literal string for the generator type.
      *
      * @throws \InvalidArgumentException When the generator type does not exist.
      */

Indentation +8 added lines, -8 removed lines

@@ -1343,14 +1343,14 @@
         }
 
         $replacements = [
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
-          '<methodTypeHint>'    => $methodTypeHint,
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
-          '<variableName>'      => $variableName,
-          '<methodName>'        => $methodName,
-          '<fieldName>'         => $fieldName,
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
-          '<entity>'            => $this->getClassName($metadata)
+            '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
+            '<methodTypeHint>'    => $methodTypeHint,
+            '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
+            '<variableName>'      => $variableName,
+            '<methodName>'        => $methodName,
+            '<fieldName>'         => $fieldName,
+            '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
+            '<entity>'            => $this->getClassName($metadata)
         ];
 
         $method = str_replace(

Spacing +134 added lines, -134 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -328,7 +328,7 @@ 
      */
     public function writeEntityClass(ClassMetadata $metadata, $outputDirectory)
     {
-        $path = $outputDirectory . '/' . str_replace('\\', DIRECTORY_SEPARATOR, $metadata->getClassName()) . $this->extension;
+        $path = $outputDirectory.'/'.str_replace('\\', DIRECTORY_SEPARATOR, $metadata->getClassName()).$this->extension;
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {
@@ -344,8 +344,8 @@ 
         }
 
         if ($this->backupExisting && file_exists($path)) {
-            $backupPath = dirname($path) . DIRECTORY_SEPARATOR . basename($path) . "~";
-            if (!copy($path, $backupPath)) {
+            $backupPath = dirname($path).DIRECTORY_SEPARATOR.basename($path)."~";
+            if ( ! copy($path, $backupPath)) {
                 throw new \RuntimeException("Attempt to backup overwritten entity file but copy operation failed.");
             }
         }
@@ -407,7 +407,7 @@ 
         $body = str_replace('<spaces>', $this->spaces, $body);
         $last = strrpos($currentCode, '}');
 
-        return substr($currentCode, 0, $last) . $body . ($body ? "\n" : '') . "}\n";
+        return substr($currentCode, 0, $last).$body.($body ? "\n" : '')."}\n";
     }
 
     /**
@@ -471,7 +471,7 @@ 
     public function setFieldVisibility($visibility)
     {
         if ($visibility !== static::FIELD_VISIBLE_PRIVATE && $visibility !== static::FIELD_VISIBLE_PROTECTED) {
-            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): ' . $visibility);
+            throw new \InvalidArgumentException('Invalid provided visibility (only private and protected are allowed): '.$visibility);
         }
 
         $this->fieldVisibility = $visibility;
@@ -568,11 +568,11 @@ 
      */
     protected function generateEntityNamespace(ClassMetadata $metadata)
     {
-        if (! $this->hasNamespace($metadata)) {
+        if ( ! $this->hasNamespace($metadata)) {
             return '';
         }
 
-        return 'namespace ' . $this->getNamespace($metadata) .';';
+        return 'namespace '.$this->getNamespace($metadata).';';
     }
 
     /**
@@ -594,8 +594,8 @@ 
      */
     protected function generateEntityClassName(ClassMetadata $metadata)
     {
-        return 'class ' . $this->getClassName($metadata) .
-            ($this->extendsClass() ? ' extends ' . $this->getClassToExtendName() : null);
+        return 'class '.$this->getClassName($metadata).
+            ($this->extendsClass() ? ' extends '.$this->getClassToExtendName() : null);
     }
 
     /**
@@ -680,7 +680,7 @@ 
         $optionalFields = [];
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $property) {
-            if (! $property->isNullable()) {
+            if ( ! $property->isNullable()) {
                 $requiredFields[] = $property;
 
                 continue;
@@ -709,13 +709,13 @@ 
             $fieldName  = $property->getName();
             $fieldType  = $property->getTypeName();
             $mappedType = $this->getType($fieldType);
-            $param      = '$' . $fieldName;
+            $param      = '$'.$fieldName;
 
-            $paramTypes[] = $mappedType . ($property->isNullable() ? '|null' : '');
+            $paramTypes[] = $mappedType.($property->isNullable() ? '|null' : '');
             $paramVariables[] = $param;
 
             if ($fieldType === 'datetime') {
-                $param = $mappedType . ' ' . $param;
+                $param = $mappedType.' '.$param;
             }
 
             if ($property->isNullable()) {
@@ -724,13 +724,13 @@ 
 
             $params[] = $param;
 
-            $fields[] = '$this->' . $fieldName . ' = $' . $fieldName . ';';
+            $fields[] = '$this->'.$fieldName.' = $'.$fieldName.';';
         }
 
         $maxParamTypeLength = max(array_map('strlen', $paramTypes));
         $paramTags = array_map(
-            function ($type, $variable) use ($maxParamTypeLength) {
-                return '@param ' . $type . str_repeat(' ', $maxParamTypeLength - strlen($type) + 1) . $variable;
+            function($type, $variable) use ($maxParamTypeLength) {
+                return '@param '.$type.str_repeat(' ', $maxParamTypeLength - strlen($type) + 1).$variable;
             },
             $paramTypes,
             $paramVariables
@@ -738,8 +738,8 @@ 
 
         // Generate multi line constructor if the signature exceeds 120 characters.
         if (array_sum(array_map('strlen', $params)) + count($params) * 2 + 29 > 120) {
-            $delimiter = "\n" . $this->spaces;
-            $params = $delimiter . implode(',' . $delimiter, $params) . "\n";
+            $delimiter = "\n".$this->spaces;
+            $params = $delimiter.implode(','.$delimiter, $params)."\n";
         } else {
             $params = implode(', ', $params);
         }
@@ -747,7 +747,7 @@ 
         $replacements = [
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         ];
 
         $constructor = str_replace(
@@ -792,7 +792,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
             }
@@ -800,16 +800,16 @@ 
             if (T_NAMESPACE === $token[0]) {
                 $lastSeenNamespace = '';
                 $inNamespace = true;
-            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i-1][0]) {
+            } elseif (T_CLASS === $token[0] && T_DOUBLE_COLON !== $tokens[$i - 1][0]) {
                 $inClass = true;
             } elseif (T_FUNCTION === $token[0]) {
-                if (T_STRING === $tokens[$i+2][0]) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]);
-                } elseif ($tokens[$i+2] == '&' && T_STRING === $tokens[$i+3][0]) {
-                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]);
+                if (T_STRING === $tokens[$i + 2][0]) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 2][1]);
+                } elseif ($tokens[$i + 2] == '&' && T_STRING === $tokens[$i + 3][0]) {
+                    $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i + 3][1]);
                 }
-            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i+2][0]) {
-                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1);
+            } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i + 2][0]) {
+                $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i + 2][1], 1);
             }
         }
     }
@@ -822,7 +822,7 @@ 
      */
     protected function hasProperty($property, ClassMetadata $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->getClassName()))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->getClassName()))) {
             // don't generate property if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->getClassName());
 
@@ -852,7 +852,7 @@ 
      */
     protected function hasMethod($method, ClassMetadata $metadata)
     {
-        if ($this->extendsClass() || (!$this->isNew && class_exists($metadata->getClassName()))) {
+        if ($this->extendsClass() || ( ! $this->isNew && class_exists($metadata->getClassName()))) {
             // don't generate method if its already on the base class.
             $reflClass = new \ReflectionClass($this->getClassToExtend() ?: $metadata->getClassName());
 
@@ -883,7 +883,7 @@ 
      */
     protected function getTraits(ClassMetadata $metadata)
     {
-        if (! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
+        if ( ! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
             return [];
         }
 
@@ -932,7 +932,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -965,7 +965,7 @@ 
     {
         $lines = [];
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -981,12 +981,12 @@ 
 
             foreach ($methods as $method) {
                 if ($code = $this->$method($metadata)) {
-                    $lines[] = ' * ' . $code;
+                    $lines[] = ' * '.$code;
                 }
             }
 
             if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
-                $lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks';
+                $lines[] = ' * @'.$this->annotationsPrefix.'HasLifecycleCallbacks';
             }
         }
 
@@ -1002,17 +1002,17 @@ 
      */
     protected function generateEntityAnnotation(ClassMetadata $metadata)
     {
-        $prefix = '@' . $this->annotationsPrefix;
+        $prefix = '@'.$this->annotationsPrefix;
 
         if ($metadata->isEmbeddedClass) {
-            return $prefix . 'Embeddable';
+            return $prefix.'Embeddable';
         }
 
         $customRepository = $metadata->getCustomRepositoryClassName()
-            ? '(repositoryClass="' . $metadata->getCustomRepositoryClassName() . '")'
+            ? '(repositoryClass="'.$metadata->getCustomRepositoryClassName().'")'
             : '';
 
-        return $prefix . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity') . $customRepository;
+        return $prefix.($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity').$customRepository;
     }
 
     /**
@@ -1029,28 +1029,28 @@ 
         $table = [];
 
         if ($metadata->table->getSchema()) {
-            $table[] = 'schema="' . $metadata->table->getSchema() . '"';
+            $table[] = 'schema="'.$metadata->table->getSchema().'"';
         }
 
         if ($metadata->table->getName()) {
-            $table[] = 'name="' . $metadata->table->getName() . '"';
+            $table[] = 'name="'.$metadata->table->getName().'"';
         }
 
         if ($metadata->table->getOptions()) {
-            $table[] = 'options={' . $this->exportTableOptions($metadata->table->getOptions()) . '}';
+            $table[] = 'options={'.$this->exportTableOptions($metadata->table->getOptions()).'}';
         }
 
         if ($metadata->table->getUniqueConstraints()) {
             $constraints = $this->generateTableConstraints('UniqueConstraint', $metadata->table->getUniqueConstraints());
-            $table[] = 'uniqueConstraints={' . $constraints . '}';
+            $table[] = 'uniqueConstraints={'.$constraints.'}';
         }
 
         if ($metadata->table->getIndexes()) {
             $constraints = $this->generateTableConstraints('Index', $metadata->table->getIndexes());
-            $table[] = 'indexes={' . $constraints . '}';
+            $table[] = 'indexes={'.$constraints.'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'Table(' . implode(', ', $table) . ')';
+        return '@'.$this->annotationsPrefix.'Table('.implode(', ', $table).')';
     }
 
     /**
@@ -1067,10 +1067,10 @@ 
             $columns = [];
 
             foreach ($constraint['columns'] as $column) {
-                $columns[] = '"' . $column . '"';
+                $columns[] = '"'.$column.'"';
             }
 
-            $annotations[] = '@' . $this->annotationsPrefix . $constraintName . '(name="' . $name . '", columns={' . implode(', ', $columns) . '})';
+            $annotations[] = '@'.$this->annotationsPrefix.$constraintName.'(name="'.$name.'", columns={'.implode(', ', $columns).'})';
         }
 
         return implode(', ', $annotations);
@@ -1084,7 +1084,7 @@ 
     protected function generateInheritanceAnnotation(ClassMetadata $metadata)
     {
         if ($metadata->inheritanceType !== InheritanceType::NONE) {
-            return '@' . $this->annotationsPrefix . 'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
+            return '@'.$this->annotationsPrefix.'InheritanceType("'.$this->getInheritanceTypeString($metadata->inheritanceType).'")';
         }
     }
 
@@ -1105,7 +1105,7 @@ 
                 $discrColumn->getLength()
             );
 
-            return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
+            return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
         }
     }
 
@@ -1120,10 +1120,10 @@ 
             $inheritanceClassMap = [];
 
             foreach ($metadata->discriminatorMap as $type => $class) {
-                $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"';
+                $inheritanceClassMap[] .= '"'.$type.'" = "'.$class.'"';
             }
 
-            return '@' . $this->annotationsPrefix . 'DiscriminatorMap({' . implode(', ', $inheritanceClassMap) . '})';
+            return '@'.$this->annotationsPrefix.'DiscriminatorMap({'.implode(', ', $inheritanceClassMap).'})';
         }
     }
 
@@ -1154,7 +1154,7 @@ 
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $fieldName => $property) {
             if ($property instanceof FieldMetadata) {
-                $nullable  = $property->isNullable() ? 'null' : null;
+                $nullable = $property->isNullable() ? 'null' : null;
 
                 if ($code = $this->generateEntityStubMethod($metadata, 'get', $fieldName, $property->getTypeName(), $nullable)) {
                     $methods[] = $code;
@@ -1210,7 +1210,7 @@ 
         ;
 
         foreach ($joinColumns as $joinColumn) {
-            if (! $joinColumn->isNullable()) {
+            if ( ! $joinColumn->isNullable()) {
                 return false;
             }
         }
@@ -1259,7 +1259,7 @@ 
 
             if ($property instanceof FieldMetadata) {
                 $options      = $property->getOptions();
-                $defaultValue = isset($options['default']) ? ' = ' . var_export($options['default'], true) : null;
+                $defaultValue = isset($options['default']) ? ' = '.var_export($options['default'], true) : null;
 
                 $lines[] = $this->generateFieldMappingPropertyDocBlock($property, $metadata);
             } else {
@@ -1268,7 +1268,7 @@ 
                 $lines[] = $this->generateAssociationMappingPropertyDocBlock($property, $metadata);
             }
 
-            $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldName . $defaultValue . ";\n";
+            $lines[] = $this->spaces.$this->fieldVisibility.' $'.$fieldName.$defaultValue.";\n";
         }
 
         return implode("\n", $lines);
@@ -1306,7 +1306,7 @@ 
      */
     protected function generateEntityStubMethod(ClassMetadata $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
     {
-        $methodName = $type . Inflector::classify($fieldName);
+        $methodName = $type.Inflector::classify($fieldName);
         $variableName = Inflector::camelize($fieldName);
 
         if (in_array($type, ["add", "remove"])) {
@@ -1327,18 +1327,18 @@ 
         $variableType   = $typeHint ? $this->getType($typeHint) : null;
 
         if ($typeHint && ! isset($types[$typeHint])) {
-            $variableType   =  '\\' . ltrim($variableType, '\\');
-            $methodTypeHint =  '\\' . $typeHint . ' ';
+            $variableType   = '\\'.ltrim($variableType, '\\');
+            $methodTypeHint = '\\'.$typeHint.' ';
         }
 
         $replacements = [
-          '<description>'       => ucfirst($type) . ' ' . $variableName . '.',
+          '<description>'       => ucfirst($type).' '.$variableName.'.',
           '<methodTypeHint>'    => $methodTypeHint,
-          '<variableType>'      => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''),
+          '<variableType>'      => $variableType.(null !== $defaultValue ? ('|'.$defaultValue) : ''),
           '<variableName>'      => $variableName,
           '<methodName>'        => $methodName,
           '<fieldName>'         => $fieldName,
-          '<variableDefault>'   => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '',
+          '<variableDefault>'   => ($defaultValue !== null) ? (' = '.$defaultValue) : '',
           '<entity>'            => $this->getClassName($metadata)
         ];
 
@@ -1367,7 +1367,7 @@ 
         $this->staticReflection[$metadata->getClassName()]['methods'][] = $methodName;
 
         $replacements = [
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         ];
 
@@ -1387,25 +1387,25 @@ 
      */
     protected function generateIdentifierAnnotation(Property $metadata)
     {
-        $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Id';
+        $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Id';
 
         if ($metadata instanceof FieldMetadata) {
             if ($generatorType = $this->getIdGeneratorTypeString($metadata->getValueGenerator()->getType())) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'GeneratedValue(strategy="' . $generatorType . '")';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'GeneratedValue(strategy="'.$generatorType.'")';
             }
 
             if ($metadata->getValueGenerator()->getType()) {
                 $generator = [];
 
                 if (isset($metadata->getValueGenerator()->getDefinition()['sequenceName'])) {
-                    $generator[] = 'sequenceName="' . $metadata->getValueGenerator()->getDefinition()['sequenceName'] . '"';
+                    $generator[] = 'sequenceName="'.$metadata->getValueGenerator()->getDefinition()['sequenceName'].'"';
                 }
 
                 if (isset($metadata->getValueGenerator()->getDefinition()['allocationSize'])) {
-                    $generator[] = 'allocationSize=' . $metadata->getValueGenerator()->getDefinition()['allocationSize'];
+                    $generator[] = 'allocationSize='.$metadata->getValueGenerator()->getDefinition()['allocationSize'];
                 }
 
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'SequenceGenerator(' . implode(', ', $generator) . ')';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'SequenceGenerator('.implode(', ', $generator).')';
             }
         }
 
@@ -1421,34 +1421,34 @@ 
     {
         $lines            = [];
         $joinTableAnnot   = [];
-        $joinTableAnnot[] = 'name="' . $joinTable->getName() . '"';
+        $joinTableAnnot[] = 'name="'.$joinTable->getName().'"';
 
-        if (! empty($joinTable->getSchema())) {
-            $joinTableAnnot[] = 'schema="' . $joinTable->getSchema() . '"';
+        if ( ! empty($joinTable->getSchema())) {
+            $joinTableAnnot[] = 'schema="'.$joinTable->getSchema().'"';
         }
 
-        $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTableAnnot) . ',';
-        $lines[] = $this->spaces . ' *   joinColumns={';
+        $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinTable('.implode(', ', $joinTableAnnot).',';
+        $lines[] = $this->spaces.' *   joinColumns={';
 
         $joinColumnsLines = [];
 
         foreach ($joinTable->getJoinColumns() as $joinColumn) {
-            $joinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
+            $joinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
         }
 
-        $lines[] = implode(",". PHP_EOL, $joinColumnsLines);
-        $lines[] = $this->spaces . ' *   },';
-        $lines[] = $this->spaces . ' *   inverseJoinColumns={';
+        $lines[] = implode(",".PHP_EOL, $joinColumnsLines);
+        $lines[] = $this->spaces.' *   },';
+        $lines[] = $this->spaces.' *   inverseJoinColumns={';
 
         $inverseJoinColumnsLines = [];
 
         foreach ($joinTable->getInverseJoinColumns() as $joinColumn) {
-            $inverseJoinColumnsLines[] = $this->spaces . ' *     ' . $this->generateJoinColumnAnnotation($joinColumn);
+            $inverseJoinColumnsLines[] = $this->spaces.' *     '.$this->generateJoinColumnAnnotation($joinColumn);
         }
 
-        $lines[] = implode(",". PHP_EOL, $inverseJoinColumnsLines);
-        $lines[] = $this->spaces . ' *   }';
-        $lines[] = $this->spaces . ' * )';
+        $lines[] = implode(",".PHP_EOL, $inverseJoinColumnsLines);
+        $lines[] = $this->spaces.' *   }';
+        $lines[] = $this->spaces.' * )';
 
         return implode(PHP_EOL, $lines);
     }
@@ -1462,23 +1462,23 @@ 
     {
         $joinColumnAnnot = [];
 
-        $joinColumnAnnot[] = 'name="' . $joinColumn->getColumnName() . '"';
-        $joinColumnAnnot[] = 'referencedColumnName="' . $joinColumn->getReferencedColumnName() . '"';
+        $joinColumnAnnot[] = 'name="'.$joinColumn->getColumnName().'"';
+        $joinColumnAnnot[] = 'referencedColumnName="'.$joinColumn->getReferencedColumnName().'"';
 
         if ($joinColumn->isUnique()) {
             $joinColumnAnnot[] = 'unique=true';
         }
 
-        if (!$joinColumn->isNullable()) {
+        if ( ! $joinColumn->isNullable()) {
             $joinColumnAnnot[] = 'nullable=false';
         }
 
-        if (!empty($joinColumn->getOnDelete())) {
-            $joinColumnAnnot[] = 'onDelete="' . $joinColumn->getOnDelete() . '"';
+        if ( ! empty($joinColumn->getOnDelete())) {
+            $joinColumnAnnot[] = 'onDelete="'.$joinColumn->getOnDelete().'"';
         }
 
         if ($joinColumn->getColumnDefinition()) {
-            $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn->getColumnDefinition() . '"';
+            $joinColumnAnnot[] = 'columnDefinition="'.$joinColumn->getColumnDefinition().'"';
         }
 
         $options = [];
@@ -1493,7 +1493,7 @@ 
             $joinColumnAnnot[] = 'options={'.implode(',', $options).'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
     }
 
     /**
@@ -1505,16 +1505,16 @@ 
     protected function generateAssociationMappingPropertyDocBlock(AssociationMetadata $association, ClassMetadata $metadata)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
+        $lines[] = $this->spaces.'/**';
 
         if ($association instanceof ToManyAssociationMetadata) {
-            $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
+            $lines[] = $this->spaces.' * @var \Doctrine\Common\Collections\Collection';
         } else {
-            $lines[] = $this->spaces . ' * @var \\' . ltrim($association->getTargetEntity(), '\\');
+            $lines[] = $this->spaces.' * @var \\'.ltrim($association->getTargetEntity(), '\\');
         }
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             if ($association->isPrimaryKey()) {
                 $lines[] = $this->generateIdentifierAnnotation($association);
@@ -1534,18 +1534,18 @@ 
 
             $typeOptions = [];
 
-            $typeOptions[] = 'targetEntity="' . $association->getTargetEntity() . '"';
+            $typeOptions[] = 'targetEntity="'.$association->getTargetEntity().'"';
 
             if ($association->getMappedBy()) {
-                $typeOptions[] = 'mappedBy="' . $association->getMappedBy() . '"';
+                $typeOptions[] = 'mappedBy="'.$association->getMappedBy().'"';
             }
 
             if ($association->getInversedBy()) {
-                $typeOptions[] = 'inversedBy="' . $association->getInversedBy() . '"';
+                $typeOptions[] = 'inversedBy="'.$association->getInversedBy().'"';
             }
 
             if ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy()) {
-                $typeOptions[] = 'indexBy="' . $association->getIndexedBy() . '"';
+                $typeOptions[] = 'indexBy="'.$association->getIndexedBy().'"';
             }
 
             if ($association->isOrphanRemoval()) {
@@ -1565,28 +1565,28 @@ 
                     $cascades = ['"all"'];
                 }
 
-                $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
+                $typeOptions[] = 'cascade={'.implode(',', $cascades).'}';
             }
 
             if ($association->getFetchMode() !== FetchMode::LAZY) {
-                $typeOptions[] = 'fetch="' . $association->getFetchMode() . '"';
+                $typeOptions[] = 'fetch="'.$association->getFetchMode().'"';
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . '' . $type . '(' . implode(', ', $typeOptions) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.''.$type.'('.implode(', ', $typeOptions).')';
 
             if ($association instanceof ToOneAssociationMetadata && $association->getJoinColumns()) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'JoinColumns({';
 
                 $joinColumnsLines = [];
 
                 foreach ($association->getJoinColumns() as $joinColumn) {
                     if ($joinColumnAnnot = $this->generateJoinColumnAnnotation($joinColumn)) {
-                        $joinColumnsLines[] = $this->spaces . ' *   ' . $joinColumnAnnot;
+                        $joinColumnsLines[] = $this->spaces.' *   '.$joinColumnAnnot;
                     }
                 }
 
                 $lines[] = implode(",\n", $joinColumnsLines);
-                $lines[] = $this->spaces . ' * })';
+                $lines[] = $this->spaces.' * })';
             }
 
             if ($association instanceof ToManyAssociationMetadata) {
@@ -1595,20 +1595,20 @@ 
                 }
 
                 if ($association->getOrderBy()) {
-                    $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'OrderBy({';
+                    $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'OrderBy({';
                     $orderBy = [];
 
                     foreach ($association->getOrderBy() as $name => $direction) {
-                        $orderBy[] = $this->spaces . ' *     "' . $name . '"="' . $direction . '"';
+                        $orderBy[] = $this->spaces.' *     "'.$name.'"="'.$direction.'"';
                     }
 
-                    $lines[] = implode(',' . PHP_EOL, $orderBy);
-                    $lines[] = $this->spaces . ' * })';
+                    $lines[] = implode(','.PHP_EOL, $orderBy);
+                    $lines[] = $this->spaces.' * })';
                 }
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1625,43 +1625,43 @@ 
 
         $lines = [];
 
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var '
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var '
             . $this->getType($fieldType)
             . ($propertyMetadata->isNullable() ? '|null' : '');
 
         if ($this->generateAnnotations) {
             $column  = [];
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
             if ($propertyMetadata->getColumnName()) {
-                $column[] = 'name="' . $propertyMetadata->getColumnName() . '"';
+                $column[] = 'name="'.$propertyMetadata->getColumnName().'"';
             }
 
-            $column[] = 'type="' . $fieldType . '"';
+            $column[] = 'type="'.$fieldType.'"';
 
             if (is_int($propertyMetadata->getLength())) {
-                $column[] = 'length=' . $propertyMetadata->getLength();
+                $column[] = 'length='.$propertyMetadata->getLength();
             }
 
             if (is_int($propertyMetadata->getPrecision())) {
-                $column[] = 'precision=' .  $propertyMetadata->getPrecision();
+                $column[] = 'precision='.$propertyMetadata->getPrecision();
             }
 
             if (is_int($propertyMetadata->getScale())) {
-                $column[] = 'scale=' .  $propertyMetadata->getScale();
+                $column[] = 'scale='.$propertyMetadata->getScale();
             }
 
             if ($propertyMetadata->isNullable()) {
-                $column[] = 'nullable=' .  var_export($propertyMetadata->isNullable(), true);
+                $column[] = 'nullable='.var_export($propertyMetadata->isNullable(), true);
             }
 
             if ($propertyMetadata->isUnique()) {
-                $column[] = 'unique=' . var_export($propertyMetadata->isUnique(), true);
+                $column[] = 'unique='.var_export($propertyMetadata->isUnique(), true);
             }
 
             if ($propertyMetadata->getColumnDefinition()) {
-                $column[] = 'columnDefinition="' . $propertyMetadata->getColumnDefinition() . '"';
+                $column[] = 'columnDefinition="'.$propertyMetadata->getColumnDefinition().'"';
             }
 
             $options = [];
@@ -1676,18 +1676,18 @@ 
                 $column[] = 'options={'.implode(',', $options).'}';
             }
 
-            $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Column(' . implode(', ', $column) . ')';
+            $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Column('.implode(', ', $column).')';
 
             if ($propertyMetadata->isPrimaryKey()) {
                 $lines[] = $this->generateIdentifierAnnotation($propertyMetadata);
             }
 
             if ($metadata->isVersioned() && $metadata->versionProperty->getName() === $propertyMetadata->getName()) {
-                $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'Version';
+                $lines[] = $this->spaces.' * @'.$this->annotationsPrefix.'Version';
             }
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1700,27 +1700,27 @@ 
     protected function generateEmbeddedPropertyDocBlock(array $embeddedClass)
     {
         $lines = [];
-        $lines[] = $this->spaces . '/**';
-        $lines[] = $this->spaces . ' * @var \\' . ltrim($embeddedClass['class'], '\\');
+        $lines[] = $this->spaces.'/**';
+        $lines[] = $this->spaces.' * @var \\'.ltrim($embeddedClass['class'], '\\');
 
         if ($this->generateAnnotations) {
-            $lines[] = $this->spaces . ' *';
+            $lines[] = $this->spaces.' *';
 
-            $embedded = ['class="' . $embeddedClass['class'] . '"'];
+            $embedded = ['class="'.$embeddedClass['class'].'"'];
 
             if (isset($embeddedClass['columnPrefix'])) {
                 if (is_string($embeddedClass['columnPrefix'])) {
-                    $embedded[] = 'columnPrefix="' . $embeddedClass['columnPrefix'] . '"';
+                    $embedded[] = 'columnPrefix="'.$embeddedClass['columnPrefix'].'"';
                 } else {
-                    $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true);
+                    $embedded[] = 'columnPrefix='.var_export($embeddedClass['columnPrefix'], true);
                 }
             }
 
-            $lines[] = $this->spaces . ' * @' .
-                $this->annotationsPrefix . 'Embedded(' . implode(', ', $embedded) . ')';
+            $lines[] = $this->spaces.' * @'.
+                $this->annotationsPrefix.'Embedded('.implode(', ', $embedded).')';
         }
 
-        $lines[] = $this->spaces . ' */';
+        $lines[] = $this->spaces.' */';
 
         return implode("\n", $lines);
     }
@@ -1734,13 +1734,13 @@ 
         $processedClasses = [];
         foreach ($metadata->entityListeners as $event => $eventListeners) {
             foreach ($eventListeners as $eventListener) {
-                $processedClasses[] = '"' . $eventListener['class'] . '"';
+                $processedClasses[] = '"'.$eventListener['class'].'"';
             }
         }
 
         return \sprintf(
             '%s%s({%s})',
-            '@' . $this->annotationsPrefix,
+            '@'.$this->annotationsPrefix,
             'EntityListeners',
             \implode(',', \array_unique($processedClasses))
         );
@@ -1758,7 +1758,7 @@ 
 
         foreach ($lines as $key => $value) {
             if ( ! empty($value)) {
-                $lines[$key] = str_repeat($this->spaces, $num) . $lines[$key];
+                $lines[$key] = str_repeat($this->spaces, $num).$lines[$key];
             }
         }
 
@@ -1826,8 +1826,8 @@ 
 
         foreach ($options as $name => $option) {
             $optionValue = is_array($option)
-                ? '{' . $this->exportTableOptions($option) . '}'
-                : '"' . (string) $option . '"'
+                ? '{'.$this->exportTableOptions($option).'}'
+                : '"'.(string) $option.'"'
             ;
 
             $optionsStr[] = sprintf('"%s"=%s', $name, $optionValue);

lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php

Doc Comments +3 added lines

@@ -298,6 +298,9 @@
         $lines[] = '}';
     }
 
+    /**
+     * @param string $variableName
+     */
     private function exportJoinColumns(array $joinColumns, array &$lines, $variableName)
     {
         $lines[] = '$' . $variableName . ' = array();';

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Doctrine\ORM\Mapping\ManyToOneAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToOneAssociationMetadata;
-use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 
 /**
  * ClassMetadata exporter for PHP code.

Spacing +73 added lines, -73 removed lines

@@ -62,11 +62,11 @@ 
         }
 
         if ($metadata->inheritanceType) {
-            $lines[] = '$metadata->setInheritanceType(Mapping\InheritanceType::' . $metadata->inheritanceType . ');';
+            $lines[] = '$metadata->setInheritanceType(Mapping\InheritanceType::'.$metadata->inheritanceType.');';
         }
 
         if ($metadata->customRepositoryClassName) {
-            $lines[] = '$metadata->customRepositoryClassName = "' . $metadata->customRepositoryClassName . '";';
+            $lines[] = '$metadata->customRepositoryClassName = "'.$metadata->customRepositoryClassName.'";';
         }
 
         if ($metadata->table) {
@@ -75,19 +75,19 @@ 
             $lines[] = '$table = new Mapping\TableMetadata();';
             $lines[] = null;
 
-            if (! empty($table->getSchema())) {
-                $lines[] = '$table->setSchema("' . $table->getSchema() . '");';
+            if ( ! empty($table->getSchema())) {
+                $lines[] = '$table->setSchema("'.$table->getSchema().'");';
             }
 
-            $lines[] = '$table->setName("' . $table->getName() . '");';
-            $lines[] = '$table->setOptions(' . $this->varExport($table->getOptions()) . ');';
+            $lines[] = '$table->setName("'.$table->getName().'");';
+            $lines[] = '$table->setOptions('.$this->varExport($table->getOptions()).');';
 
             foreach ($table->getIndexes() as $index) {
-                $lines[] = '$table->addIndex(' . $this->varExport($index) . ');';
+                $lines[] = '$table->addIndex('.$this->varExport($index).');';
             }
 
             foreach ($table->getUniqueConstraints() as $constraint) {
-                $lines[] = '$table->addUniqueConstraint(' . $this->varExport($constraint) . ');';
+                $lines[] = '$table->addUniqueConstraint('.$this->varExport($constraint).');';
             }
 
             $lines[] = null;
@@ -99,51 +99,51 @@ 
 
             $lines[] = '$discrColumn = new Mapping\DiscriminatorColumnMetadata();';
             $lines[] = null;
-            $lines[] = '$discrColumn->setColumnName("' . $discrColumn->getColumnName() . '");';
-            $lines[] = '$discrColumn->setType(Type::getType("' . $discrColumn->getTypeName() . '"));';
-            $lines[] = '$discrColumn->setTableName("' . $discrColumn->getTableName() . '");';
+            $lines[] = '$discrColumn->setColumnName("'.$discrColumn->getColumnName().'");';
+            $lines[] = '$discrColumn->setType(Type::getType("'.$discrColumn->getTypeName().'"));';
+            $lines[] = '$discrColumn->setTableName("'.$discrColumn->getTableName().'");';
 
-            if (! empty($discrColumn->getColumnDefinition())) {
-                $lines[] = '$property->setColumnDefinition("' . $discrColumn->getColumnDefinition() . '");';
+            if ( ! empty($discrColumn->getColumnDefinition())) {
+                $lines[] = '$property->setColumnDefinition("'.$discrColumn->getColumnDefinition().'");';
             }
 
-            if (! empty($discrColumn->getLength())) {
-                $lines[] = '$property->setLength(' . $discrColumn->getLength() . ');';
+            if ( ! empty($discrColumn->getLength())) {
+                $lines[] = '$property->setLength('.$discrColumn->getLength().');';
             }
 
-            if (! empty($discrColumn->getScale())) {
-                $lines[] = '$property->setScale(' . $discrColumn->getScale() . ');';
+            if ( ! empty($discrColumn->getScale())) {
+                $lines[] = '$property->setScale('.$discrColumn->getScale().');';
             }
 
-            if (! empty($discrColumn->getPrecision())) {
-                $lines[] = '$property->setPrecision(' . $discrColumn->getPrecision() . ');';
+            if ( ! empty($discrColumn->getPrecision())) {
+                $lines[] = '$property->setPrecision('.$discrColumn->getPrecision().');';
             }
 
-            $lines[] = '$discrColumn->setOptions(' . $this->varExport($discrColumn->getOptions()) . ');';
-            $lines[] = '$discrColumn->setNullable(' . $this->varExport($discrColumn->isNullable()) . ');';
-            $lines[] = '$discrColumn->setUnique(' . $this->varExport($discrColumn->isUnique()) . ');';
+            $lines[] = '$discrColumn->setOptions('.$this->varExport($discrColumn->getOptions()).');';
+            $lines[] = '$discrColumn->setNullable('.$this->varExport($discrColumn->isNullable()).');';
+            $lines[] = '$discrColumn->setUnique('.$this->varExport($discrColumn->isUnique()).');';
             $lines[] = null;
             $lines[] = '$metadata->setDiscriminatorColumn($discrColumn);';
         }
 
         if ($metadata->discriminatorMap) {
-            $lines[] = '$metadata->setDiscriminatorMap(' . $this->varExport($metadata->discriminatorMap) . ');';
+            $lines[] = '$metadata->setDiscriminatorMap('.$this->varExport($metadata->discriminatorMap).');';
         }
 
         if ($metadata->changeTrackingPolicy) {
-            $lines[] = '$metadata->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::' . $metadata->changeTrackingPolicy . ');';
+            $lines[] = '$metadata->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::'.$metadata->changeTrackingPolicy.');';
         }
 
         if ($metadata->lifecycleCallbacks) {
             foreach ($metadata->lifecycleCallbacks as $event => $callbacks) {
                 foreach ($callbacks as $callback) {
-                    $lines[] = '$metadata->addLifecycleCallback("' . $callback . '", "' . $event . '");';
+                    $lines[] = '$metadata->addLifecycleCallback("'.$callback.'", "'.$event.'");';
                 }
             }
         }
 
-        if (! $metadata->isIdentifierComposite()) {
-            $lines[] = '$metadata->setIdGeneratorType(Mapping\GeneratorType::' . $metadata->generatorType . ');';
+        if ( ! $metadata->isIdentifierComposite()) {
+            $lines[] = '$metadata->setIdGeneratorType(Mapping\GeneratorType::'.$metadata->generatorType.');';
         }
 
         foreach ($metadata->getProperties() as $property) {
@@ -166,30 +166,30 @@ 
         );
 
         $lines[] = null;
-        $lines[] = '$property->setColumnName("' . $property->getColumnName() . '");';
-        $lines[] = '$property->setType(Type::getType("' . $property->getTypeName() . '"));';
-        $lines[] = '$property->setTableName("' . $property->getTableName() . '");';
+        $lines[] = '$property->setColumnName("'.$property->getColumnName().'");';
+        $lines[] = '$property->setType(Type::getType("'.$property->getTypeName().'"));';
+        $lines[] = '$property->setTableName("'.$property->getTableName().'");';
 
-        if (! empty($property->getColumnDefinition())) {
-            $lines[] = '$property->setColumnDefinition("' . $property->getColumnDefinition() . '");';
+        if ( ! empty($property->getColumnDefinition())) {
+            $lines[] = '$property->setColumnDefinition("'.$property->getColumnDefinition().'");';
         }
 
-        if (! empty($property->getLength())) {
-            $lines[] = '$property->setLength(' . $property->getLength() . ');';
+        if ( ! empty($property->getLength())) {
+            $lines[] = '$property->setLength('.$property->getLength().');';
         }
 
-        if (! empty($property->getScale())) {
-            $lines[] = '$property->setScale(' . $property->getScale() . ');';
+        if ( ! empty($property->getScale())) {
+            $lines[] = '$property->setScale('.$property->getScale().');';
         }
 
-        if (! empty($property->getPrecision())) {
-            $lines[] = '$property->setPrecision(' . $property->getPrecision() . ');';
+        if ( ! empty($property->getPrecision())) {
+            $lines[] = '$property->setPrecision('.$property->getPrecision().');';
         }
 
-        $lines[] = '$property->setOptions(' . $this->varExport($property->getOptions()) . ');';
-        $lines[] = '$property->setPrimaryKey(' . $this->varExport($property->isPrimaryKey()) . ');';
-        $lines[] = '$property->setNullable(' . $this->varExport($property->isNullable()) . ');';
-        $lines[] = '$property->setUnique(' . $this->varExport($property->isUnique()) . ');';
+        $lines[] = '$property->setOptions('.$this->varExport($property->getOptions()).');';
+        $lines[] = '$property->setPrimaryKey('.$this->varExport($property->isPrimaryKey()).');';
+        $lines[] = '$property->setNullable('.$this->varExport($property->isNullable()).');';
+        $lines[] = '$property->setUnique('.$this->varExport($property->isUnique()).');';
         $lines[] = null;
         $lines[] = '$metadata->addProperty($property);';
     }
@@ -211,25 +211,25 @@ 
         if ($association instanceof OneToOneAssociationMetadata) {
             $this->exportJoinColumns($association->getJoinColumns(), $lines, 'joinColumns');
 
-            $lines[] = '$association = new Mapping\OneToOneAssociationMetadata("' . $association->getName() . '");';
+            $lines[] = '$association = new Mapping\OneToOneAssociationMetadata("'.$association->getName().'");';
             $lines[] = null;
             $lines[] = '$association->setJoinColumns($joinColumns);';
         } else if ($association instanceof ManyToOneAssociationMetadata) {
             $this->exportJoinColumns($association->getJoinColumns(), $lines, 'joinColumns');
 
-            $lines[] = '$association = new Mapping\ManyToOneAssociationMetadata("' . $association->getName() . '");';
+            $lines[] = '$association = new Mapping\ManyToOneAssociationMetadata("'.$association->getName().'");';
             $lines[] = null;
             $lines[] = '$association->setJoinColumns($joinColumns);';
         } else if ($association instanceof OneToManyAssociationMetadata) {
-            $lines[] = '$association = new Mapping\OneToManyAssociationMetadata("' . $association->getName() . '");';
+            $lines[] = '$association = new Mapping\OneToManyAssociationMetadata("'.$association->getName().'");';
             $lines[] = null;
-            $lines[] = '$association->setOrderBy(' . $this->varExport($association->getOrderBy()) . ');';
+            $lines[] = '$association->setOrderBy('.$this->varExport($association->getOrderBy()).');';
         } else if ($association instanceof ManyToManyAssociationMetadata) {
             if ($association->getJoinTable()) {
                 $this->exportJoinTable($association->getJoinTable(), $lines);
             }
 
-            $lines[] = '$association = new Mapping\ManyToManyAssociationMetadata("' . $association->getName() . '");';
+            $lines[] = '$association = new Mapping\ManyToManyAssociationMetadata("'.$association->getName().'");';
             $lines[] = null;
 
             if ($association->getJoinTable()) {
@@ -237,26 +237,26 @@ 
             }
 
             if ($association->getIndexedBy()) {
-                $lines[] = '$association->setIndexedBy("' . $association->getIndexedBy() . '");';
+                $lines[] = '$association->setIndexedBy("'.$association->getIndexedBy().'");';
             }
 
-            $lines[] = '$association->setOrderBy(' . $this->varExport($association->getOrderBy()) . ');';
+            $lines[] = '$association->setOrderBy('.$this->varExport($association->getOrderBy()).');';
         }
 
-        $lines[] = '$association->setTargetEntity("' . $association->getTargetEntity() . '");';
-        $lines[] = '$association->setFetchMode("' . $association->getFetchMode() . '");';
+        $lines[] = '$association->setTargetEntity("'.$association->getTargetEntity().'");';
+        $lines[] = '$association->setFetchMode("'.$association->getFetchMode().'");';
 
         if ($association->getMappedBy()) {
-            $lines[] = '$association->setMappedBy("' . $association->getMappedBy() . '");';
+            $lines[] = '$association->setMappedBy("'.$association->getMappedBy().'");';
         }
 
         if ($association->getInversedBy()) {
-            $lines[] = '$association->setInversedBy("' . $association->getInversedBy() . '");';
+            $lines[] = '$association->setInversedBy("'.$association->getInversedBy().'");';
         }
 
-        $lines[] = '$association->setCascade(' . $this->varExport($cascade) . ');';
-        $lines[] = '$association->setOrphanRemoval(' . $this->varExport($association->isOrphanRemoval()) . ');';
-        $lines[] = '$association->setPrimaryKey(' . $this->varExport($association->isPrimaryKey()) . ');';
+        $lines[] = '$association->setCascade('.$this->varExport($cascade).');';
+        $lines[] = '$association->setOrphanRemoval('.$this->varExport($association->isOrphanRemoval()).');';
+        $lines[] = '$association->setPrimaryKey('.$this->varExport($association->isPrimaryKey()).');';
         $lines[] = null;
         $lines[] = '$metadata->addProperty($association);';
     }
@@ -266,13 +266,13 @@ 
         $lines[] = null;
         $lines[] = '$joinTable = new Mapping\JoinTableMetadata();';
         $lines[] = null;
-        $lines[] = '$joinTable->setName("' . $joinTable->getName() . '");';
+        $lines[] = '$joinTable->setName("'.$joinTable->getName().'");';
 
-        if (! empty($joinTable->getSchema())) {
-            $lines[] = '$joinTable->setSchema("' . $joinTable->getSchema() . '");';
+        if ( ! empty($joinTable->getSchema())) {
+            $lines[] = '$joinTable->setSchema("'.$joinTable->getSchema().'");';
         }
 
-        $lines[] = '$joinTable->setOptions(' . $this->varExport($joinTable->getOptions()) . ');';
+        $lines[] = '$joinTable->setOptions('.$this->varExport($joinTable->getOptions()).');';
 
         $this->exportJoinColumns($joinTable->getJoinColumns(), $lines, 'joinColumns');
 
@@ -292,24 +292,24 @@ 
 
     private function exportJoinColumns(array $joinColumns, array &$lines, $variableName)
     {
-        $lines[] = '$' . $variableName . ' = array();';
+        $lines[] = '$'.$variableName.' = array();';
 
         foreach ($joinColumns as $joinColumn) {
             /** @var JoinColumnMetadata $joinColumn */
             $lines[] = '$joinColumn = new Mapping\JoinColumnMetadata();';
             $lines[] = null;
-            $lines[] = '$joinColumn->setTableName("' . $joinColumn->getTableName() . '");';
-            $lines[] = '$joinColumn->setColumnName("' . $joinColumn->getColumnName() . '");';
-            $lines[] = '$joinColumn->setReferencedColumnName("' . $joinColumn->getReferencedColumnName() . '");';
-            $lines[] = '$joinColumn->setAliasedName("' . $joinColumn->getAliasedName() . '");';
-            $lines[] = '$joinColumn->setColumnDefinition("' . $joinColumn->getColumnDefinition() . '");';
-            $lines[] = '$joinColumn->setOnDelete("' . $joinColumn->getOnDelete() . '");';
-            $lines[] = '$joinColumn->setOptions(' . $this->varExport($joinColumn->getOptions()) . ');';
-            $lines[] = '$joinColumn->setNullable("' . $joinColumn->isNullable() . '");';
-            $lines[] = '$joinColumn->setUnique("' . $joinColumn->isUnique() . '");';
-            $lines[] = '$joinColumn->setPrimaryKey("' . $joinColumn->isPrimaryKey() . '");';
+            $lines[] = '$joinColumn->setTableName("'.$joinColumn->getTableName().'");';
+            $lines[] = '$joinColumn->setColumnName("'.$joinColumn->getColumnName().'");';
+            $lines[] = '$joinColumn->setReferencedColumnName("'.$joinColumn->getReferencedColumnName().'");';
+            $lines[] = '$joinColumn->setAliasedName("'.$joinColumn->getAliasedName().'");';
+            $lines[] = '$joinColumn->setColumnDefinition("'.$joinColumn->getColumnDefinition().'");';
+            $lines[] = '$joinColumn->setOnDelete("'.$joinColumn->getOnDelete().'");';
+            $lines[] = '$joinColumn->setOptions('.$this->varExport($joinColumn->getOptions()).');';
+            $lines[] = '$joinColumn->setNullable("'.$joinColumn->isNullable().'");';
+            $lines[] = '$joinColumn->setUnique("'.$joinColumn->isUnique().'");';
+            $lines[] = '$joinColumn->setPrimaryKey("'.$joinColumn->isPrimaryKey().'");';
             $lines[] = null;
-            $lines[] = '$' . $variableName . '[] = $joinColumn;';
+            $lines[] = '$'.$variableName.'[] = $joinColumn;';
         }
     }
 
@@ -321,7 +321,7 @@ 
     protected function varExport($var)
     {
         $export = var_export($var, true);
-        $export = str_replace("\n", PHP_EOL . str_repeat(' ', 8), $export);
+        $export = str_replace("\n", PHP_EOL.str_repeat(' ', 8), $export);
         $export = str_replace('  ', ' ', $export);
         $export = str_replace('array (', 'array(', $export);
         $export = str_replace('array( ', 'array(', $export);

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