doctrine / orm

lib/Doctrine/ORM/Mapping/Exporter/ToOneAssociationMetadataExporter.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
         /** @var ToOneAssociationMetadata $value */
         $joinColumnExporter = new JoinColumnMetadataExporter();
         $indentation        = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference    = $indentation . self::VARIABLE;
+        $objectReference    = $indentation.self::VARIABLE;
         $lines              = [];
 
         $lines[] = parent::export($value, $indentationLevel);
@@ -28,7 +28,7 @@ 
             $lines[] = null;
             $lines[] = $joinColumnExporter->export($joinColumn, $indentationLevel);
             $lines[] = null;
-            $lines[] = $objectReference . '->addJoinColumn(' . $joinColumnExporter::VARIABLE . ');';
+            $lines[] = $objectReference.'->addJoinColumn('.$joinColumnExporter::VARIABLE.');';
         }
 
         return \implode(PHP_EOL, $lines);

lib/Doctrine/ORM/Mapping/Exporter/ClassMetadataExporter.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
         $lines[] = null;
 
         if ($namespace) {
-            $lines[] = 'namespace ' . $namespace . ';';
+            $lines[] = 'namespace '.$namespace.';';
             $lines[] = null;
         }
 
@@ -64,31 +64,31 @@ 
     {
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
         $bodyIndentation = \str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
-        $lines[] = $indentation . 'public function __construct(';
-        $lines[] = $bodyIndentation . 'ClassMetadataBuildingContext $metadataBuildingContext,';
-        $lines[] = $bodyIndentation . '?ClassMetadata $parent = null';
-        $lines[] = $indentation . ')';
-        $lines[] = $indentation . '{';
-        $lines[] = $bodyIndentation . 'parent::__construct("' . $metadata->getClassName() . '", $parent, $metadataBuildingContext);';
+        $lines[] = $indentation.'public function __construct(';
+        $lines[] = $bodyIndentation.'ClassMetadataBuildingContext $metadataBuildingContext,';
+        $lines[] = $bodyIndentation.'?ClassMetadata $parent = null';
+        $lines[] = $indentation.')';
+        $lines[] = $indentation.'{';
+        $lines[] = $bodyIndentation.'parent::__construct("'.$metadata->getClassName().'", $parent, $metadataBuildingContext);';
 
         if ($metadata->getCustomRepositoryClassName()) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setCustomRepositoryClassName("' . $metadata->getCustomRepositoryClassName() . '");';
+            $lines[] = $objectReference.'->setCustomRepositoryClassName("'.$metadata->getCustomRepositoryClassName().'");';
         }
 
         if ($metadata->changeTrackingPolicy) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::' . \strtoupper($metadata->changeTrackingPolicy) . ');';
+            $lines[] = $objectReference.'->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::'.\strtoupper($metadata->changeTrackingPolicy).');';
         }
 
         $lines[] = $this->exportInheritance($metadata, $indentationLevel);
         $lines[] = $this->exportTable($metadata, $indentationLevel);
         $lines[] = $this->exportProperties($metadata, $indentationLevel);
         $lines[] = $this->exportLifecycleCallbacks($metadata, $indentationLevel);
-        $lines[] = $indentation . '}';
+        $lines[] = $indentation.'}';
 
         return \implode(PHP_EOL, $lines);
     }
@@ -96,17 +96,17 @@ 
     private function exportInheritance(Mapping\ClassMetadata $metadata, int $indentationLevel) : string
     {
         $bodyIndentation = \str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
         if ($metadata->inheritanceType) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setInheritanceType(Mapping\InheritanceType::' . \strtoupper($metadata->inheritanceType) . ');';
+            $lines[] = $objectReference.'->setInheritanceType(Mapping\InheritanceType::'.\strtoupper($metadata->inheritanceType).');';
         }
 
         if ($metadata->discriminatorColumn) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Discriminator mapping';
+            $lines[] = $bodyIndentation.'// Discriminator mapping';
             $lines[] = $this->exportDiscriminatorMetadata($metadata, $indentationLevel + 1);
         }
 
@@ -120,7 +120,7 @@ 
 
         if ($metadata->table) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Table';
+            $lines[] = $bodyIndentation.'// Table';
             $lines[] = $this->exportTableMetadata($metadata->table, $indentationLevel + 1);
         }
 
@@ -134,7 +134,7 @@ 
 
         foreach ($metadata->getPropertiesIterator() as $name => $property) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Property: ' . $name;
+            $lines[] = $bodyIndentation.'// Property: '.$name;
             $lines[] = $this->exportProperty($property, $indentationLevel + 1);
         }
 
@@ -144,16 +144,16 @@ 
     private function exportLifecycleCallbacks(Mapping\ClassMetadata $metadata, int $indentationLevel) : string
     {
         $bodyIndentation = \str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
         if ($metadata->lifecycleCallbacks) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Lifecycle callbacks';
+            $lines[] = $bodyIndentation.'// Lifecycle callbacks';
 
             foreach ($metadata->lifecycleCallbacks as $event => $callbacks) {
                 foreach ($callbacks as $callback) {
-                    $lines[] = $objectReference . '->addLifecycleCallback("' . $callback . '", "' . $event . '");';
+                    $lines[] = $objectReference.'->addLifecycleCallback("'.$callback.'", "'.$event.'");';
                 }
             }
         }
@@ -166,17 +166,17 @@ 
         $variableExporter      = new VariableExporter();
         $discriminatorExporter = new DiscriminatorColumnMetadataExporter();
         $indentation           = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference       = $indentation . self::VARIABLE;
+        $objectReference       = $indentation.self::VARIABLE;
         $lines                 = [];
 
         $lines[] = $discriminatorExporter->export($metadata->discriminatorColumn, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->setDiscriminatorColumn(' . $discriminatorExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->setDiscriminatorColumn('.$discriminatorExporter::VARIABLE.');';
 
         if ($metadata->discriminatorMap) {
             $discriminatorMap = $variableExporter->export($metadata->discriminatorMap, $indentationLevel + 1);
 
-            $lines[] = $objectReference . '->setDiscriminatorMap(' . $discriminatorMap . ');';
+            $lines[] = $objectReference.'->setDiscriminatorMap('.$discriminatorMap.');';
         }
 
         return \implode(PHP_EOL, $lines);
@@ -186,12 +186,12 @@ 
     {
         $tableExporter   = new TableMetadataExporter();
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         $lines[] = $tableExporter->export($table, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->setTable(' . $tableExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->setTable('.$tableExporter::VARIABLE.');';
 
         return \implode(PHP_EOL, $lines);
     }
@@ -199,7 +199,7 @@ 
     private function exportProperty(Mapping\Property $property, int $indentationLevel) : string
     {
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         switch (true) {
@@ -230,7 +230,7 @@ 
 
         $lines[] = $propertyExporter->export($property, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->addProperty(' . $propertyExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->addProperty('.$propertyExporter::VARIABLE.');';
 
         return \implode(PHP_EOL, $lines);
     }

lib/Doctrine/ORM/Mapping/Exporter/ManyToManyAssociationMetadataExporter.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     {
         /** @var ManyToManyAssociationMetadata $value */
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         $lines[] = parent::export($value, $indentationLevel);
@@ -32,7 +32,7 @@ 
             $lines[] = null;
             $lines[] = $joinTableExporter->export($value->getJoinTable(), $indentationLevel);
             $lines[] = null;
-            $lines[] = $objectReference . '->setJoinTable(' . $joinTableExporter::VARIABLE . ');';
+            $lines[] = $objectReference.'->setJoinTable('.$joinTableExporter::VARIABLE.');';
         }
 
         return \implode(PHP_EOL, $lines);

lib/Doctrine/ORM/Mapping/Exporter/CacheMetadataExporter.php

Spacing +2 added lines, -2 removed lines

@@ -22,10 +22,10 @@
     {
         /** @var CacheMetadata $value */
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
-        $lines[] = $objectReference . ' = ' . $this->exportInstantiation($value);
+        $lines[] = $objectReference.' = '.$this->exportInstantiation($value);
 
         return \implode(PHP_EOL, $lines);
     }

lib/Doctrine/ORM/Mapping/Exporter/LocalColumnMetadataExporter.php

Spacing +5 added lines, -5 removed lines

@@ -20,18 +20,18 @@
     {
         /** @var LocalColumnMetadata $value */
         $indentation     = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         $lines[] = parent::export($value, $indentationLevel);
 
-        $lines[] = $objectReference . '->setLength(' . $value->getLength() . ');';
-        $lines[] = $objectReference . '->setScale(' . $value->getScale() . ');';
-        $lines[] = $objectReference . '->setPrecision(' . $value->getPrecision() . ');';
+        $lines[] = $objectReference.'->setLength('.$value->getLength().');';
+        $lines[] = $objectReference.'->setScale('.$value->getScale().');';
+        $lines[] = $objectReference.'->setPrecision('.$value->getPrecision().');';
 
         if ($value->hasValueGenerator()) {
             $lines[] = \sprintf(
-                $objectReference . '->setValueGenerator(new ValueGenerator(%s, %s));',
+                $objectReference.'->setValueGenerator(new ValueGenerator(%s, %s));',
                 \var_export($value->getValueGenerator()->getType(), true),
                 \var_export($value->getValueGenerator()->getDefinition(), true)
             );

lib/Doctrine/ORM/Mapping/Exporter/ToManyAssociationMetadataExporter.php

Spacing +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@
         /** @var ToManyAssociationMetadata $value */
         $variableExporter = new VariableExporter();
         $indentation      = \str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference  = $indentation . self::VARIABLE;
+        $objectReference  = $indentation.self::VARIABLE;
         $lines            = [];
 
         $lines[] = parent::export($value, $indentationLevel);
 
-        if (! empty($value->getIndexedBy())) {
-            $lines[] = $objectReference . '->setIndexedBy("' . $value->getIndexedBy() . '"");';
+        if ( ! empty($value->getIndexedBy())) {
+            $lines[] = $objectReference.'->setIndexedBy("'.$value->getIndexedBy().'"");';
         }
 
-        $lines[] = $objectReference . '->setOderBy(' . $variableExporter->export($value->getOrderBy(), $indentationLevel + 1) . ');';
+        $lines[] = $objectReference.'->setOderBy('.$variableExporter->export($value->getOrderBy(), $indentationLevel + 1).');';
 
         return \implode(PHP_EOL, $lines);
     }

lib/Doctrine/ORM/Mapping/MappingException.php

Spacing +38 added lines, -38 removed lines

@@ -23,7 +23,7 @@ 
      */
     public static function pathRequired()
     {
-        return new self('Specifying the paths to your entities is required ' .
+        return new self('Specifying the paths to your entities is required '.
             'in the AnnotationDriver to retrieve all class names.');
     }
 
@@ -213,7 +213,7 @@ 
      */
     public static function missingQueryMapping($entity, $queryName)
     {
-        return new self('Query named "' . $queryName . '" in "' . $entity . ' requires a result class or result set mapping.');
+        return new self('Query named "'.$queryName.'" in "'.$entity.' requires a result class or result set mapping.');
     }
 
     /**
@@ -224,7 +224,7 @@ 
      */
     public static function missingResultSetMappingEntity($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . ' requires a entity class name.');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a entity class name.');
     }
 
     /**
@@ -235,7 +235,7 @@ 
      */
     public static function missingResultSetMappingFieldName($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . ' requires a field name.');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a field name.');
     }
 
     /**
@@ -282,8 +282,8 @@ 
     {
         $message = \sprintf("The mapping of field '%s' is invalid: The option '%s' is required.", $field, $expectedOption);
 
-        if (! empty($hint)) {
-            $message .= ' (Hint: ' . $hint . ')';
+        if ( ! empty($hint)) {
+            $message .= ' (Hint: '.$hint.')';
         }
 
         return new self($message);
@@ -312,7 +312,7 @@ 
      */
     public static function reflectionFailure($entity, ReflectionException $previousException)
     {
-        return new self('An error occurred in ' . $entity, 0, $previousException);
+        return new self('An error occurred in '.$entity, 0, $previousException);
     }
 
     /**
@@ -323,8 +323,8 @@ 
      */
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
     {
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
-            . $className . ' since it is referenced by a join column of another class.');
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
+            . $className.' since it is referenced by a join column of another class.');
     }
 
     /**
@@ -358,7 +358,7 @@ 
      */
     public static function propertyTypeIsRequired($className, $propertyName)
     {
-        return new self("The attribute 'type' is required for the column description of property " . $className . '::$' . $propertyName . '.');
+        return new self("The attribute 'type' is required for the column description of property ".$className.'::$'.$propertyName.'.');
     }
 
     /**
@@ -384,7 +384,7 @@ 
      */
     public static function duplicateQueryMapping($entity, $queryName)
     {
-        return new self('Query named "' . $queryName . '" in "' . $entity . '" was already declared, but it must be declared only once');
+        return new self('Query named "'.$queryName.'" in "'.$entity.'" was already declared, but it must be declared only once');
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     public static function duplicateResultSetMapping($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . '" was already declared, but it must be declared only once');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.'" was already declared, but it must be declared only once');
     }
 
     /**
@@ -405,7 +405,7 @@ 
      */
     public static function singleIdNotAllowedOnCompositePrimaryKey($entity)
     {
-        return new self('Single id is not allowed on composite primary key in entity ' . $entity);
+        return new self('Single id is not allowed on composite primary key in entity '.$entity);
     }
 
     /**
@@ -415,7 +415,7 @@ 
      */
     public static function noIdDefined($entity)
     {
-        return new self('No ID defined for entity ' . $entity);
+        return new self('No ID defined for entity '.$entity);
     }
 
     /**
@@ -423,7 +423,7 @@ 
      */
     public static function unsupportedOptimisticLockingType(Type $unsupportedType)
     {
-        return new self('Locking type "' . $unsupportedType->getName() . '" is not supported by Doctrine.');
+        return new self('Locking type "'.$unsupportedType->getName().'" is not supported by Doctrine.');
     }
 
     /**
@@ -433,13 +433,13 @@ 
      */
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
     {
-        if (! empty($path)) {
-            $path = '[' . $path . ']';
+        if ( ! empty($path)) {
+            $path = '['.$path.']';
         }
 
         return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
+            'File mapping drivers must have a valid directory path, '.
+            'however the given path '.$path.' seems to be incorrect!'
         );
     }
 
@@ -455,7 +455,7 @@ 
     public static function invalidClassInDiscriminatorMap($className, $owningClass)
     {
         return new self(\sprintf(
-            "Entity class '%s' used in the discriminator map of class '%s' " .
+            "Entity class '%s' used in the discriminator map of class '%s' ".
             'does not exist.',
             $className,
             $owningClass
@@ -521,7 +521,7 @@ 
     public static function sqlConversionNotAllowedForPrimaryKeyProperties($className, $fieldName, $type)
     {
         return new self(\sprintf(
-            'It is not possible to set id field "%s" to type "%s" in entity class "%s". ' .
+            'It is not possible to set id field "%s" to type "%s" in entity class "%s". '.
             'The type "%s" requires conversion SQL which is not allowed for identifiers.',
             $fieldName,
             $type,
@@ -557,7 +557,7 @@ 
      */
     public static function duplicateColumnName($className, $columnName)
     {
-        return new self("Duplicate definition of column '" . $columnName . "' on entity '" . $className . "' in a field or discriminator column mapping.");
+        return new self("Duplicate definition of column '".$columnName."' on entity '".$className."' in a field or discriminator column mapping.");
     }
 
     /**
@@ -568,7 +568,7 @@ 
      */
     public static function illegalToManyAssociationOnMappedSuperclass($className, $field)
     {
-        return new self("It is illegal to put an inverse side one-to-many or many-to-many association on mapped superclass '" . $className . '#' . $field . "'.");
+        return new self("It is illegal to put an inverse side one-to-many or many-to-many association on mapped superclass '".$className.'#'.$field."'.");
     }
 
     /**
@@ -580,8 +580,8 @@ 
      */
     public static function cannotMapCompositePrimaryKeyEntitiesAsForeignId($className, $targetEntity, $targetField)
     {
-        return new self("It is not possible to map entity '" . $className . "' with a composite primary key " .
-            "as part of the primary key of another entity '" . $targetEntity . '#' . $targetField . "'.");
+        return new self("It is not possible to map entity '".$className."' with a composite primary key ".
+            "as part of the primary key of another entity '".$targetEntity.'#'.$targetField."'.");
     }
 
     /**
@@ -635,8 +635,8 @@ 
      */
     public static function illegalOrphanRemoval($className, $field)
     {
-        return new self('Orphan removal is only allowed on one-to-one and one-to-many ' .
-            'associations, but ' . $className . '#' . $field . ' is not.');
+        return new self('Orphan removal is only allowed on one-to-one and one-to-many '.
+            'associations, but '.$className.'#'.$field.' is not.');
     }
 
     /**
@@ -668,7 +668,7 @@ 
      */
     public static function noInheritanceOnMappedSuperClass($className)
     {
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
     }
 
     /**
@@ -680,8 +680,8 @@ 
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
     {
         return new self(
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '" . $className . "' an abstract class " .
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
             'to avoid this exception from occurring.'
         );
     }
@@ -694,7 +694,7 @@ 
      */
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
     {
-        return new self("Entity '" . $className . "' has no public method '" . $methodName . "' to be registered as lifecycle callback.");
+        return new self("Entity '".$className."' has no public method '".$methodName."' to be registered as lifecycle callback.");
     }
 
     /**
@@ -728,7 +728,7 @@ 
      */
     public static function invalidFetchMode($className, $annotation)
     {
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
     }
 
     /**
@@ -738,7 +738,7 @@ 
      */
     public static function compositeKeyAssignedIdGeneratorRequired($className)
     {
-        return new self("Entity '" . $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
     }
 
     /**
@@ -750,7 +750,7 @@ 
      */
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
     {
-        return new self("The target-entity '" . $targetEntity . "' cannot be found in '" . $sourceEntity . '#' . $associationName . "'.");
+        return new self("The target-entity '".$targetEntity."' cannot be found in '".$sourceEntity.'#'.$associationName."'.");
     }
 
     /**
@@ -762,8 +762,8 @@ 
      */
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
     {
-        $cascades = \implode(', ', \array_map(static function ($e) {
-            return "'" . $e . "'";
+        $cascades = \implode(', ', \array_map(static function($e) {
+            return "'".$e."'";
         }, $cascades));
 
         return new self(\sprintf(
@@ -796,7 +796,7 @@ 
     {
         return new self(
             \sprintf(
-                'Infinite nesting detected for embedded property %s::%s. ' .
+                'Infinite nesting detected for embedded property %s::%s. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
                 $className,
                 $propertyName
@@ -811,7 +811,7 @@ 
     {
         return new self(
             \sprintf(
-                'Class %s not found in namespaces %s.' .
+                'Class %s not found in namespaces %s.'.
                 $className,
                 \implode(', ', $namespaces)
             )

lib/Doctrine/ORM/Utility/NormalizeIdentifier.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $normalizedAssociatedId = [];
 
         foreach ($targetClass->getPropertiesIterator() as $name => $property) {
-            if (! \array_key_exists($name, $flatIdentifier)) {
+            if ( ! \array_key_exists($name, $flatIdentifier)) {
                 continue;
             }
 

lib/Doctrine/ORM/UnitOfWork.php

Spacing +54 added lines, -54 removed lines

@@ -339,7 +339,7 @@ 
 
         $this->computeChangeSets();
 
-        if (! ($this->entityInsertions ||
+        if ( ! ($this->entityInsertions ||
                 $this->entityDeletions ||
                 $this->entityUpdates ||
                 $this->collectionUpdates ||
@@ -400,7 +400,7 @@ 
             // Entity deletions come last and need to be in reverse commit order
             if ($this->entityDeletions) {
                 foreach (\array_reverse($commitOrder) as $committedEntityName) {
-                    if (! $this->entityDeletions) {
+                    if ( ! $this->entityDeletions) {
                         break; // just a performance optimisation
                     }
 
@@ -484,7 +484,7 @@ 
         $oid  = spl_object_id($entity);
         $data = [];
 
-        if (! isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -564,12 +564,12 @@ 
                     || ! $class->getProperty($name) instanceof FieldMetadata
                     || ! $class->getProperty($name)->hasValueGenerator()
                     || $class->getProperty($name)->getValueGenerator()->getType() !== GeneratorType::IDENTITY
-                ) && (! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
+                ) && ( ! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
                 $actualData[$name] = $value;
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             // Entity is either NEW or MANAGED but not yet fully persisted (only has an id).
             // These result in an INSERT.
             $this->originalEntityData[$oid] = $actualData;
@@ -596,7 +596,7 @@ 
 
             foreach ($actualData as $propName => $actualValue) {
                 // skip field, its a partially omitted one!
-                if (! (isset($originalData[$propName]) || \array_key_exists($propName, $originalData))) {
+                if ( ! (isset($originalData[$propName]) || \array_key_exists($propName, $originalData))) {
                     continue;
                 }
 
@@ -618,7 +618,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $property);
                     } elseif ($owner !== $entity) { // no clone, we have to fix
-                        if (! $actualValue->isInitialized()) {
+                        if ( ! $actualValue->isInitialized()) {
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
                         }
 
@@ -656,7 +656,7 @@ 
                         // Check if original value exists
                         if ($orgValue instanceof PersistentCollection) {
                             // A PersistentCollection was de-referenced, so delete it.
-                            if (! $this->isCollectionScheduledForDeletion($orgValue)) {
+                            if ( ! $this->isCollectionScheduledForDeletion($orgValue)) {
                                 $this->scheduleCollectionDeletion($orgValue);
 
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
@@ -679,7 +679,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getPropertiesIterator() as $property) {
-            if (! $property instanceof AssociationMetadata) {
+            if ( ! $property instanceof AssociationMetadata) {
                 continue;
             }
 
@@ -746,7 +746,7 @@ 
                 // Only MANAGED entities that are NOT SCHEDULED FOR INSERTION OR DELETION are processed here.
                 $oid = spl_object_id($entity);
 
-                if (! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
+                if ( ! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
                     $this->computeChangeSet($class, $entity);
                 }
             }
@@ -783,13 +783,13 @@ 
         $targetClass    = $this->em->getClassMetadata($targetEntity);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $association, $entry);
             }
 
             $state = $this->getEntityState($entry, self::STATE_NEW);
 
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw UnexpectedAssociationValue::create(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -800,7 +800,7 @@ 
 
             switch ($state) {
                 case self::STATE_NEW:
-                    if (! \in_array('persist', $association->getCascade(), true)) {
+                    if ( ! \in_array('persist', $association->getCascade(), true)) {
                         $this->nonCascadedNewDetectedEntities[spl_object_id($entry)] = [$association, $entry];
 
                         break;
@@ -849,12 +849,12 @@ 
         $persister      = $this->getEntityPersister($class->getClassName());
         $generationPlan->executeImmediate($this->em, $entity);
 
-        if (! $generationPlan->containsDeferred()) {
+        if ( ! $generationPlan->containsDeferred()) {
             $id = $this->em->getIdentifierFlattener()->flattenIdentifier($class, $persister->getIdentifier($entity));
 
             // Some identifiers may be foreign keys to new entities.
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
                 $this->entityIdentifiers[$oid] = $id;
             }
         }
@@ -899,7 +899,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
+        if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
 
@@ -922,7 +922,7 @@ 
                         break;
                     }
 
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -936,7 +936,7 @@ 
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             throw new RuntimeException('Cannot call recomputeSingleEntityChangeSet before computeChangeSet on an entity.');
         }
 
@@ -954,7 +954,7 @@ 
         if ($changeSet) {
             if (isset($this->entityChangeSets[$oid])) {
                 $this->entityChangeSets[$oid] = \array_merge($this->entityChangeSets[$oid], $changeSet);
-            } elseif (! isset($this->entityInsertions[$oid])) {
+            } elseif ( ! isset($this->entityInsertions[$oid])) {
                 $this->entityChangeSets[$oid] = $changeSet;
                 $this->entityUpdates[$oid]    = $entity;
             }
@@ -1024,7 +1024,7 @@ 
                 $this->recomputeSingleEntityChangeSet($class, $entity);
             }
 
-            if (! empty($this->entityChangeSets[$oid])) {
+            if ( ! empty($this->entityChangeSets[$oid])) {
                 $persister->update($entity);
             }
 
@@ -1063,7 +1063,7 @@ 
 
             // Entity with this $oid after deletion treated as NEW, even if the $oid
             // is obtained by a new entity because the old one went out of scope.
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1110,13 +1110,13 @@ 
         // Calculate dependencies for new nodes
         while ($class = \array_pop($newNodes)) {
             foreach ($class->getPropertiesIterator() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $calc->hasNode($targetClass->getClassName())) {
+                if ( ! $calc->hasNode($targetClass->getClassName())) {
                     $calc->addNode($targetClass->getClassName(), $targetClass);
 
                     $newNodes[] = $targetClass;
@@ -1124,7 +1124,7 @@ 
 
                 $weight = ! \array_filter(
                     $property->getJoinColumns(),
-                    static function (JoinColumnMetadata $joinColumn) {
+                    static function(JoinColumnMetadata $joinColumn) {
                         return $joinColumn->isNullable();
                     }
                 );
@@ -1132,14 +1132,14 @@ 
                 $calc->addDependency($targetClass->getClassName(), $class->getClassName(), $weight);
 
                 // If the target class has mapped subclasses, these share the same dependency.
-                if (! $targetClass->getSubClasses()) {
+                if ( ! $targetClass->getSubClasses()) {
                     continue;
                 }
 
                 foreach ($targetClass->getSubClasses() as $subClassName) {
                     $targetSubClass = $this->em->getClassMetadata($subClassName);
 
-                    if (! $calc->hasNode($subClassName)) {
+                    if ( ! $calc->hasNode($subClassName)) {
                         $calc->addNode($targetSubClass->getClassName(), $targetSubClass);
 
                         $newNodes[] = $targetSubClass;
@@ -1215,7 +1215,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityIdentifiers[$oid])) {
+        if ( ! isset($this->entityIdentifiers[$oid])) {
             throw ORMInvalidArgumentException::entityHasNoIdentity($entity, 'scheduling for update');
         }
 
@@ -1223,7 +1223,7 @@ 
             throw ORMInvalidArgumentException::entityIsRemoved($entity, 'schedule for update');
         }
 
-        if (! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
+        if ( ! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
             $this->entityUpdates[$oid] = $entity;
         }
     }
@@ -1298,7 +1298,7 @@ 
             return; // entity has not been persisted yet, so nothing more to do.
         }
 
-        if (! $this->isInIdentityMap($entity)) {
+        if ( ! $this->isInIdentityMap($entity)) {
             return;
         }
 
@@ -1306,7 +1306,7 @@ 
 
         unset($this->entityUpdates[$oid]);
 
-        if (! isset($this->entityDeletions[$oid])) {
+        if ( ! isset($this->entityDeletions[$oid])) {
             $this->entityDeletions[$oid] = $entity;
             $this->entityStates[$oid]    = self::STATE_REMOVED;
         }
@@ -1408,7 +1408,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1766,7 +1766,7 @@ 
         $class = $this->em->getClassMetadata(\get_class($entity));
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && \in_array('refresh', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && \in_array('refresh', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1813,7 +1813,7 @@ 
         }
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && \in_array('persist', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && \in_array('persist', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1829,7 +1829,7 @@ 
 
                 case $relatedEntities instanceof Collection:
                 case \is_array($relatedEntities):
-                    if (! ($association instanceof ToManyAssociationMetadata)) {
+                    if ( ! ($association instanceof ToManyAssociationMetadata)) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1844,7 +1844,7 @@ 
                     break;
 
                 case $relatedEntities !== null:
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1873,7 +1873,7 @@ 
         $class             = $this->em->getClassMetadata(\get_class($entity));
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && \in_array('remove', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && \in_array('remove', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1932,7 +1932,7 @@ 
 
         switch (true) {
             case $lockMode === LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
 
@@ -1955,7 +1955,7 @@ 
             case $lockMode === LockMode::NONE:
             case $lockMode === LockMode::PESSIMISTIC_READ:
             case $lockMode === LockMode::PESSIMISTIC_WRITE:
-                if (! $this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2113,7 +2113,7 @@ 
                     $entity->addPropertyChangedListener($this);
                 }
             } else {
-                if (! isset($hints[Query::HINT_REFRESH])
+                if ( ! isset($hints[Query::HINT_REFRESH])
                     || (isset($hints[Query::HINT_REFRESH_ENTITY]) && $hints[Query::HINT_REFRESH_ENTITY] !== $entity)) {
                     return $entity;
                 }
@@ -2161,7 +2161,7 @@ 
         }
 
         foreach ($class->getPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2210,7 +2210,7 @@ 
                 continue;
             }
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 // use the given entity association
                 if (isset($data[$field]) && \is_object($data[$field]) &&
                     isset($this->entityStates[spl_object_id($data[$field])])) {
@@ -2260,7 +2260,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2269,7 +2269,7 @@ 
             }
 
             // @todo guilhermeblanco Can we remove the need of this somehow?
-            if (! isset($hints['fetchMode'][$class->getClassName()][$field])) {
+            if ( ! isset($hints['fetchMode'][$class->getClassName()][$field])) {
                 $hints['fetchMode'][$class->getClassName()][$field] = $association->getFetchMode();
             }
 
@@ -2286,7 +2286,7 @@ 
                     // If this is an uninitialized proxy, we are deferring eager loads,
                     // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                     // then we can append this entity for eager loading!
-                    if (! $targetClass->isIdentifierComposite() &&
+                    if ( ! $targetClass->isIdentifierComposite() &&
                         $newValue instanceof GhostObjectInterface &&
                         isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                         $hints['fetchMode'][$class->getClassName()][$field] === FetchMode::EAGER &&
@@ -2369,7 +2369,7 @@ 
 
     public function triggerEagerLoads()
     {
-        if (! $this->eagerLoadingEntities) {
+        if ( ! $this->eagerLoadingEntities) {
             return;
         }
 
@@ -2378,7 +2378,7 @@ 
         $this->eagerLoadingEntities = [];
 
         foreach ($eagerLoadingEntities as $entityName => $ids) {
-            if (! $ids) {
+            if ( ! $ids) {
                 continue;
             }
 
@@ -2676,7 +2676,7 @@ 
     {
         $class = $this->em->getClassMetadata(\get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2685,7 +2685,7 @@ 
         // Update changeset and mark entity for synchronization
         $this->entityChangeSets[$oid][$propertyName] = [$oldValue, $newValue];
 
-        if (! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
+        if ( ! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
             $this->scheduleForSynchronization($entity);
         }
     }
@@ -2767,7 +2767,7 @@ 
      */
     private static function objToStr($obj)
     {
-        return \method_exists($obj, '__toString') ? (string) $obj : \get_class($obj) . '@' . spl_object_id($obj);
+        return \method_exists($obj, '__toString') ? (string) $obj : \get_class($obj).'@'.spl_object_id($obj);
     }
 
     /**
@@ -2782,7 +2782,7 @@ 
      */
     public function markReadOnly($object)
     {
-        if (! \is_object($object) || ! $this->isInIdentityMap($object)) {
+        if ( ! \is_object($object) || ! $this->isInIdentityMap($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2800,7 +2800,7 @@ 
      */
     public function isReadOnly($object)
     {
-        if (! \is_object($object)) {
+        if ( ! \is_object($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2812,7 +2812,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2822,7 +2822,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -2832,7 +2832,7 @@ 
      */
     private function performCallbackOnCachedPersister(callable $callback)
     {
-        if (! $this->hasCache) {
+        if ( ! $this->hasCache) {
             return;
         }