doctrine / orm

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

Unused Use Statements -2 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -128,7 +128,7 @@ 
             }
 
             foreach ($data as $columnName => $value) {
-                if (!is_array($id) || !isset($id[$columnName])) {
+                if ( ! is_array($id) || ! isset($id[$columnName])) {
                     $type = $this->columns[$columnName]->getType();
 
                     $stmt->bindValue($paramIndex++, $value, $type);
@@ -252,7 +252,7 @@ 
 
         if ($filterSql = $this->generateFilterConditionSQL($rootClass, $tableAlias)) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -260,26 +260,26 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
                 break;
         }
 
         $tableName  = $this->class->table->getQuotedQualifiedName($this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql !== '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql !== '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT '  . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -301,14 +301,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -328,18 +328,18 @@ 
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableName    = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias   = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql     .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -366,14 +366,14 @@ 
                 continue;
             }
 
-            if (! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
+            if ( ! ($property instanceof ToOneAssociationMetadata) || ! $property->isOwningSide()) {
                 continue;
             }
 
             $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
             foreach ($property->getJoinColumns() as $joinColumn) {
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(
                         PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                     );
@@ -393,7 +393,7 @@ 
         $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType);
 
         $columnList[] = $discrColumnType->convertToDatabaseValueSQL(
-            $this->getSQLTableAlias($discrColumn->getTableName()) . '.' . $discrColumnName,
+            $this->getSQLTableAlias($discrColumn->getTableName()).'.'.$discrColumnName,
             $this->platform
         );
 
@@ -420,7 +420,7 @@ 
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
                 foreach ($property->getJoinColumns() as $joinColumn) {
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(
                             PersisterHelper::getTypeOfColumn($joinColumn->getReferencedColumnName(), $targetClass, $this->em)
                         );
@@ -468,7 +468,7 @@ 
                         $columnName           = $joinColumn->getColumnName();
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(
                                 PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)
                             );
@@ -526,12 +526,12 @@ 
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableName    = $parentClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias   = $this->getSQLTableAlias($parentClass->getTableName());
-            $joinSql     .= ' INNER JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -543,12 +543,12 @@ 
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableName   = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias  = $this->getSQLTableAlias($subClass->getTableName());
-            $joinSql    .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
                 $quotedColumnName = $this->platform->quoteIdentifier($idColumn->getColumnName());
 
-                $conditions[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $conditions[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $joinSql .= implode(' AND ', $conditions);

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

Unused Use Statements -1 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

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

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

Unused Use Statements -2 removed lines

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

Spacing +8 added lines, -8 removed lines

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

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

Unused Use Statements -2 removed lines

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

Spacing +8 added lines, -8 removed lines

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

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

Doc Comments +3 added lines, -3 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Console\Command;
 
@@ -176,8 +176,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);
             }
         );
 
@@ -216,7 +216,7 @@ 
         }
 
         if (is_bool($value)) {
-            return '<comment>' . ($value ? 'True' : 'False') . '</comment>';
+            return '<comment>'.($value ? 'True' : 'False').'</comment>';
         }
 
         if (empty($value)) {
@@ -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));
@@ -354,7 +354,7 @@ 
         return $this->formatField(
             'Entity listeners',
             array_map(
-                function ($entityListener) {
+                function($entityListener) {
                     return get_class($entityListener);
                 },
                 $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));

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\UnitOfWork;

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -93,20 +93,20 @@ 
         fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n");
 
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, "Class: ". $className . "\n");
+            fwrite($fh, "Class: ".$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n");
+                fwrite($fh, " Entity: ".$this->getIdString($entity, $uow)." ".spl_object_hash($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->getProperties() as $field => $association) {
-                    if (! ($association instanceof AssociationMetadata)) {
+                    if ( ! ($association instanceof AssociationMetadata)) {
                         continue;
                     }
 
-                    fwrite($fh, "   " . $field . " ");
+                    fwrite($fh, "   ".$field." ");
 
                     $value = $association->getValue($entity);
 
@@ -117,25 +117,25 @@ 
                     }
 
                     if ($association instanceof ToOneAssociationMetadata) {
-                        if ($value instanceof Proxy && !$value->__isInitialized()) {
+                        if ($value instanceof Proxy && ! $value->__isInitialized()) {
                             fwrite($fh, "[PROXY] ");
                         }
 
-                        fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n");
+                        fwrite($fh, $this->getIdString($value, $uow)." ".spl_object_hash($value)."\n");
                     } else {
-                        $initialized = !($value instanceof PersistentCollection) || $value->isInitialized();
+                        $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
 
                         if ($initialized) {
-                            fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n");
+                            fwrite($fh, "[INITIALIZED] ".$this->getType($value)." ".count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, "[PROXY] ".$this->getType($value)." unknown element size\n");
 
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         }
                     }

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 +131 added lines, -131 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -345,7 +345,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)) {
@@ -361,8 +361,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.");
             }
         }
@@ -423,7 +423,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";
     }
 
     /**
@@ -487,7 +487,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;
@@ -585,7 +585,7 @@ 
     protected function generateEntityNamespace(ClassMetadata $metadata)
     {
         if ($this->hasNamespace($metadata)) {
-            return 'namespace ' . $this->getNamespace($metadata) .';';
+            return 'namespace '.$this->getNamespace($metadata).';';
         }
     }
 
@@ -605,8 +605,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);
     }
 
     /**
@@ -691,7 +691,7 @@ 
         $optionalFields = [];
 
         foreach ($metadata->getProperties() as $property) {
-            if (! $property->isNullable()) {
+            if ( ! $property->isNullable()) {
                 $requiredFields[] = $property;
 
                 continue;
@@ -720,13 +720,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()) {
@@ -735,13 +735,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
@@ -749,8 +749,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);
         }
@@ -758,7 +758,7 @@ 
         $replacements = [
             '<paramTags>' => implode("\n * ", $paramTags),
             '<params>'    => $params,
-            '<fields>'    => implode("\n" . $this->spaces, $fields),
+            '<fields>'    => implode("\n".$this->spaces, $fields),
         ];
 
         $constructor = str_replace(
@@ -803,7 +803,7 @@ 
 
             if ($inClass) {
                 $inClass = false;
-                $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1];
+                $lastSeenClass = $lastSeenNamespace.($lastSeenNamespace ? '\\' : '').$token[1];
                 $this->staticReflection[$lastSeenClass]['properties'] = [];
                 $this->staticReflection[$lastSeenClass]['methods'] = [];
             }
@@ -811,16 +811,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);
             }
         }
     }
@@ -833,7 +833,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());
 
@@ -863,7 +863,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());
 
@@ -892,7 +892,7 @@ 
      */
     protected function getTraits(ClassMetadata $metadata)
     {
-        if (! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
+        if ( ! ($metadata->getReflectionClass() !== null || class_exists($metadata->getClassName()))) {
             return [];
         }
 
@@ -941,7 +941,7 @@ 
     {
         $refl = new \ReflectionClass($this->getClassToExtend());
 
-        return '\\' . $refl->getName();
+        return '\\'.$refl->getName();
     }
 
     /**
@@ -974,7 +974,7 @@ 
     {
         $lines = [];
         $lines[] = '/**';
-        $lines[] = ' * ' . $this->getClassName($metadata);
+        $lines[] = ' * '.$this->getClassName($metadata);
 
         if ($this->generateAnnotations) {
             $lines[] = ' *';
@@ -989,12 +989,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';
             }
         }
 
@@ -1010,17 +1010,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;
     }
 
     /**
@@ -1037,28 +1037,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).')';
     }
 
     /**
@@ -1075,10 +1075,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);
@@ -1092,7 +1092,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).'")';
         }
     }
 
@@ -1113,7 +1113,7 @@ 
                 $discrColumn->getLength()
             );
 
-            return '@' . $this->annotationsPrefix . 'DiscriminatorColumn(' . $columnDefinition . ')';
+            return '@'.$this->annotationsPrefix.'DiscriminatorColumn('.$columnDefinition.')';
         }
     }
 
@@ -1128,10 +1128,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).'})';
         }
     }
 
@@ -1162,7 +1162,7 @@ 
 
         foreach ($metadata->getProperties() 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;
@@ -1218,7 +1218,7 @@ 
         ;
 
         foreach ($joinColumns as $joinColumn) {
-            if (! $joinColumn->isNullable()) {
+            if ( ! $joinColumn->isNullable()) {
                 return false;
             }
         }
@@ -1270,7 +1270,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 {
@@ -1279,7 +1279,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);
@@ -1317,7 +1317,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"])) {
@@ -1338,18 +1338,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)
         ];
 
@@ -1377,7 +1377,7 @@ 
         $this->staticReflection[$metadata->getClassName()]['methods'][] = $methodName;
 
         $replacements = [
-            '<name>'        => $this->annotationsPrefix . ucfirst($name),
+            '<name>'        => $this->annotationsPrefix.ucfirst($name),
             '<methodName>'  => $methodName,
         ];
 
@@ -1397,25 +1397,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).')';
             }
         }
 
@@ -1431,34 +1431,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);
     }
@@ -1472,23 +1472,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 = [];
@@ -1503,7 +1503,7 @@ 
             $joinColumnAnnot[] = 'options={'.implode(',', $options).'}';
         }
 
-        return '@' . $this->annotationsPrefix . 'JoinColumn(' . implode(', ', $joinColumnAnnot) . ')';
+        return '@'.$this->annotationsPrefix.'JoinColumn('.implode(', ', $joinColumnAnnot).')';
     }
 
     /**
@@ -1515,16 +1515,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);
@@ -1544,18 +1544,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()) {
@@ -1575,28 +1575,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) {
@@ -1605,20 +1605,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);
     }
@@ -1635,43 +1635,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 = [];
@@ -1686,18 +1686,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);
     }
@@ -1710,27 +1710,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);
     }
@@ -1747,7 +1747,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];
             }
         }
 
@@ -1815,8 +1815,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 -2 removed lines

@@ -24,14 +24,12 @@
 use Doctrine\ORM\Mapping\AssociationMetadata;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\FieldMetadata;
-use Doctrine\ORM\Mapping\GeneratorType;
 use Doctrine\ORM\Mapping\JoinColumnMetadata;
 use Doctrine\ORM\Mapping\JoinTableMetadata;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 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 +72 added lines, -72 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Export\Driver;
 
@@ -65,11 +65,11 @@ 
         }
 
         if ($metadata->inheritanceType) {
-            $lines[] = '$metadata->setInheritanceType(Mapping\InheritanceType::' . $metadata->inheritanceType . ');';
+            $lines[] = '$metadata->setInheritanceType(Mapping\InheritanceType::'.$metadata->inheritanceType.');';
         }
 
         if ($metadata->getCustomRepositoryClassName()) {
-            $lines[] = '$metadata->setCustomRepositoryClassName("' . $metadata->getCustomRepositoryClassName() . '");';
+            $lines[] = '$metadata->setCustomRepositoryClassName("'.$metadata->getCustomRepositoryClassName().'");';
         }
 
         if ($metadata->table) {
@@ -78,19 +78,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;
@@ -102,45 +102,45 @@ 
 
             $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.'");';
                 }
             }
         }
@@ -165,30 +165,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()).');';
 
         if ($property->hasValueGenerator()) {
             $lines[] = sprintf(
@@ -219,25 +219,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()) {
@@ -245,26 +245,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);';
     }
@@ -274,13 +274,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');
 
@@ -300,24 +300,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;';
         }
     }
 
@@ -329,7 +329,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/Export/Driver/XmlExporter.php

Doc Comments +2 added lines, -2 removed lines

@@ -386,7 +386,7 @@ 
 
     /**
      * @param \SimpleXMLElement $associationXml
-     * @param array             $joinColumns
+     * @param JoinColumnMetadata[]             $joinColumns
      * @param string            $joinColumnsName
      */
     private function exportJoinColumns(
@@ -438,7 +438,7 @@ 
 
     /**
      * @param \SimpleXMLElement $associationXml
-     * @param array             $associationCascades
+     * @param string[]             $associationCascades
      */
     private function exportCascade(\SimpleXMLElement $associationXml, array $associationCascades)
     {

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Export\Driver;
 
@@ -55,7 +55,7 @@ 
     public function exportClassMetadata(ClassMetadata $metadata)
     {
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
 
@@ -240,7 +240,7 @@ 
             }
         }
 
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
 
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -404,15 +404,15 @@ 
             $joinColumnXml->addAttribute('name', $joinColumn->getColumnName());
             $joinColumnXml->addAttribute('referenced-column-name', $joinColumn->getReferencedColumnName());
 
-            if (! empty($joinColumn->getAliasedName())) {
+            if ( ! empty($joinColumn->getAliasedName())) {
                 $joinColumnXml->addAttribute('field-name', $joinColumn->getAliasedName());
             }
 
-            if (! empty($joinColumn->getOnDelete())) {
+            if ( ! empty($joinColumn->getOnDelete())) {
                 $joinColumnXml->addAttribute('on-delete', $joinColumn->getOnDelete());
             }
 
-            if (! empty($joinColumn->getColumnDefinition())) {
+            if ( ! empty($joinColumn->getColumnDefinition())) {
                 $joinColumnXml->addAttribute('column-definition', $joinColumn->getColumnDefinition());
             }
 
@@ -446,7 +446,7 @@ 
 
         foreach (['remove', 'persist', 'refresh', 'merge', 'detach'] as $type) {
             if (in_array($type, $associationCascades)) {
-                $cascades[] = 'cascade-' . $type;
+                $cascades[] = 'cascade-'.$type;
             }
         }
 
@@ -497,7 +497,7 @@ 
     {
         $sequenceDefinition = $metadata->getValueGenerator()->getDefinition();
 
-        if (! ($metadata->getValueGenerator()->getType() === GeneratorType::SEQUENCE && $sequenceDefinition)) {
+        if ( ! ($metadata->getValueGenerator()->getType() === GeneratorType::SEQUENCE && $sequenceDefinition)) {
             return;
         }