doctrine / orm

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

Spacing +9 added lines, -9 removed lines

@@ -149,7 +149,7 @@ 
             $cacheAnnot = $classAnnotations[Mapping\Cache::class];
             $cacheMap   = [
                 'region' => $cacheAnnot->region,
-                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
             ];
 
             $metadata->enableCache($cacheMap);
@@ -237,7 +237,7 @@ 
             $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class];
 
             $metadata->setInheritanceType(
-                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value)
+                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value)
             );
 
             if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -269,7 +269,7 @@ 
         // Evaluate DoctrineChangeTrackingPolicy annotation
         if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) {
             $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class];
-            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
+            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value));
         }
 
         // Evaluate annotations on properties/fields
@@ -293,7 +293,7 @@ 
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults(
                     $mapping['fieldName'],
                     [
-                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
                         'region' => $cacheAnnot->region,
                     ]
                 );
@@ -323,7 +323,7 @@ 
                 }
 
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) {
-                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy));
+                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy));
                 }
 
                 if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) {
@@ -472,7 +472,7 @@ 
 
                 // Check for `fetch`
                 if ($associationOverride->fetch) {
-                    $override['fetch'] = constant(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch);
+                    $override['fetch'] = constant(Mapping\ClassMetadata::class.'::FETCH_'.$associationOverride->fetch);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -516,7 +516,7 @@ 
                 }
 
                 // Evaluate the listener using naming convention.
-                if ( ! $hasMapping ) {
+                if ( ! $hasMapping) {
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
                 }
             }
@@ -545,11 +545,11 @@ 
      */
     private function getFetchMode($className, $fetchMode)
     {
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
             throw MappingException::invalidFetchMode($className, $fetchMode);
         }
 
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
     }
 
     /**

tests/Doctrine/Tests/ORM/Query/QueryTest.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Internal\Hydration\IterableResult;
 use Doctrine\ORM\Query\Parameter;

Indentation +14 added lines, -14 removed lines

@@ -85,18 +85,18 @@ 
     {
         $q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a");
         $q2 = $q->expireQueryCache(true)
-          ->setQueryCacheLifetime(3600)
-          ->setQueryCacheDriver(null)
-          ->expireResultCache(true)
-          ->setHint('foo', 'bar')
-          ->setHint('bar', 'baz')
-          ->setParameter(1, 'bar')
-          ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
-          ->setResultCacheDriver(null)
-          ->setResultCacheId('foo')
-          ->setDQL('foo')
-          ->setFirstResult(10)
-          ->setMaxResults(10);
+            ->setQueryCacheLifetime(3600)
+            ->setQueryCacheDriver(null)
+            ->expireResultCache(true)
+            ->setHint('foo', 'bar')
+            ->setHint('bar', 'baz')
+            ->setParameter(1, 'bar')
+            ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
+            ->setResultCacheDriver(null)
+            ->setResultCacheId('foo')
+            ->setDQL('foo')
+            ->setFirstResult(10)
+            ->setMaxResults(10);
 
         $this->assertSame($q2, $q);
     }
@@ -254,11 +254,11 @@ 
         $this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache());
 
         $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u")
-                           ->useResultCache(true);
+                            ->useResultCache(true);
 
         /** @var DriverConnectionMock $driverConnectionMock */
         $driverConnectionMock = $this->_em->getConnection()
-                                          ->getWrappedConnection();
+                                            ->getWrappedConnection();
 
         $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]]));
 

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
             9 => "St Julien"
         ];
 
-        $query  = $this->_em
+        $query = $this->_em
                 ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)")
                 ->setParameter('cities', $cities);
 
@@ -179,7 +179,7 @@ 
      */
     public function testProcessParameterValueClassMetadata()
     {
-        $query  = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
+        $query = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
         $this->assertEquals(
             CmsAddress::class,
             $query->processParameterValue($this->_em->getClassMetadata(CmsAddress::class))

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +57 added lines, -57 removed lines

@@ -89,66 +89,66 @@ 
         $cmf = $this->em->getMetadataFactory();
 
         foreach ($class->fieldMappings as $fieldName => $mapping) {
-            if (!Type::hasType($mapping['type'])) {
-                $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'.";
+            if ( ! Type::hasType($mapping['type'])) {
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existent type '".$mapping['type']."'.";
             }
         }
 
         foreach ($class->associationMappings as $fieldName => $assoc) {
-            if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
-                $ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.';
+            if ( ! class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
+                $ce[] = "The target entity '".$assoc['targetEntity']."' specified on ".$class->name.'#'.$fieldName.' is unknown or not an entity.';
 
                 return $ce;
             }
 
             if ($assoc['mappedBy'] && $assoc['inversedBy']) {
-                $ce[] = "The association " . $class . "#" . $fieldName . " cannot be defined as both inverse and owning.";
+                $ce[] = "The association ".$class."#".$fieldName." cannot be defined as both inverse and owning.";
             }
 
             $targetMetadata = $cmf->getMetadataFor($assoc['targetEntity']);
 
             if (isset($assoc['id']) && $targetMetadata->containsForeignIdentifier) {
-                $ce[] = "Cannot map association '" . $class->name. "#". $fieldName ." as identifier, because " .
-                        "the target entity '". $targetMetadata->name . "' also maps an association as identifier.";
+                $ce[] = "Cannot map association '".$class->name."#".$fieldName." as identifier, because ".
+                        "the target entity '".$targetMetadata->name."' also maps an association as identifier.";
             }
 
             if ($assoc['mappedBy']) {
                 if ($targetMetadata->hasField($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which is not defined as association, but as field.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which is not defined as association, but as field.";
                 }
-                if (!$targetMetadata->hasAssociation($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['mappedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the inverse side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
-                            "'inversedBy=\"" . $fieldName . "\"' attribute.";
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
+                            "'inversedBy=\"".$fieldName."\"' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." are ".
                             "inconsistent with each other.";
                 }
             }
 
             if ($assoc['inversedBy']) {
                 if ($targetMetadata->hasField($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which is not defined as association.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which is not defined as association.";
                 }
 
-                if (!$targetMetadata->hasAssociation($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['inversedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the owning side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
                             "'inversedBy' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['inversedBy']." are ".
                             "inconsistent with each other.";
                 }
 
@@ -156,14 +156,14 @@ 
                 if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) {
                     $targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']];
                     if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is one-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-one as well.";
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-many.";
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-many, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be many-to-many as well.";
                     }
                 }
             }
@@ -172,8 +172,8 @@ 
                 if ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY) {
                     $identifierColumns = $class->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$class->name."'.";
                             break;
                         }
@@ -181,32 +181,32 @@ 
 
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) {
-                        if (!in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                             break;
                         }
                     }
 
                     if (count($targetMetadata->getIdentifierColumnNames()) != count($assoc['joinTable']['inverseJoinColumns'])) {
-                        $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))) .
+                        $ce[] = "The inverse join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))).
                                 "' are missing.";
                     }
 
                     if (count($class->getIdentifierColumnNames()) != count($assoc['joinTable']['joinColumns'])) {
-                        $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the source entity '". $class->name . "', " .
-                                "however '" . implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) .
+                        $ce[] = "The join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the source entity '".$class->name."', ".
+                                "however '".implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))).
                                 "' are missing.";
                     }
 
                 } elseif ($assoc['type'] & ClassMetadataInfo::TO_ONE) {
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                     "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                         }
                     }
@@ -218,9 +218,9 @@ 
                             $ids[] = $joinColumn['name'];
                         }
 
-                        $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " .
-                                "have to match to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)) .
+                        $ce[] = "The join columns of the association '".$assoc['fieldName']."' ".
+                                "have to match to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)).
                                 "' are missing.";
                     }
                 }
@@ -228,19 +228,19 @@ 
 
             if (isset($assoc['orderBy']) && $assoc['orderBy'] !== null) {
                 foreach ($assoc['orderBy'] as $orderField => $orientation) {
-                    if (!$targetMetadata->hasField($orderField) && !$targetMetadata->hasAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a foreign field " .
-                                $orderField . " that is not a field on the target entity " . $targetMetadata->name . ".";
+                    if ( ! $targetMetadata->hasField($orderField) && ! $targetMetadata->hasAssociation($orderField)) {
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a foreign field ".
+                                $orderField." that is not a field on the target entity ".$targetMetadata->name.".";
                         continue;
                     }
                     if ($targetMetadata->isCollectionValuedAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is a collection-valued association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is a collection-valued association.";
                         continue;
                     }
                     if ($targetMetadata->isAssociationInverseSide($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is the inverse side of an association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is the inverse side of an association.";
                         continue;
                     }
                 }
@@ -248,9 +248,9 @@ 
         }
 
         foreach ($class->subClasses as $subClass) {
-            if (!in_array($class->name, class_parents($subClass))) {
-                $ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ".
-                        "of '" . $class->name . "' but these entities are not related through inheritance.";
+            if ( ! in_array($class->name, class_parents($subClass))) {
+                $ce[] = "According to the discriminator map class '".$subClass."' has to be a child ".
+                        "of '".$class->name."' but these entities are not related through inheritance.";
             }
         }
 

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Spacing +13 added lines, -13 removed lines

@@ -199,7 +199,7 @@ 
             $class->reflFields[$fieldName]->setValue($entity, $value);
             $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else if (
             isset($this->_hints[Query::HINT_REFRESH]) ||
             isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) &&
@@ -210,10 +210,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -287,7 +287,7 @@ 
             $idHash = '';
 
             foreach ($class->identifier as $fieldName) {
-                $idHash .= ' ' . (isset($class->associationMappings[$fieldName])
+                $idHash .= ' '.(isset($class->associationMappings[$fieldName])
                     ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
                     : $data[$fieldName]);
             }
@@ -343,7 +343,7 @@ 
                 $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
                 if ( ! isset($nonemptyComponents[$parentAlias])) {
@@ -383,7 +383,7 @@ 
                     $reflFieldValue = $reflField->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
                         } else if ( ! isset($this->existingCollections[$collKey])) {
@@ -431,7 +431,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $reflField->getValue($parentObject);
 
-                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) {
+                    if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
                         if (isset($nonemptyComponents[$dqlAlias])) {
@@ -476,7 +476,7 @@ 
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->_rsm->isMixed) {
                         $result[] = [$entityKey => null];
                     } else {
@@ -532,13 +532,13 @@ 
             }
         }
 
-        if ( ! isset($resultKey) ) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = (isset($this->_rsm->indexByMap['scalars']))
                     ? $row[$this->_rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -551,19 +551,19 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if ( ! isset($resultKey) ) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
                 $args   = $newObject['args'];
                 $obj    = $class->newInstanceArgs($args);
 
-                if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) {
+                if ($scalarCount == 0 && count($rowData['newObjects']) == 1) {
                     $result[$resultKey] = $obj;
 
                     continue;

lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php

Spacing +14 added lines, -14 removed lines

@@ -109,7 +109,7 @@ 
         // Evaluate named native queries
         if (isset($element['namedNativeQueries'])) {
             foreach ($element['namedNativeQueries'] as $name => $mappingElement) {
-                if (!isset($mappingElement['name'])) {
+                if ( ! isset($mappingElement['name'])) {
                     $mappingElement['name'] = $name;
                 }
                 $metadata->addNamedNativeQuery(
@@ -126,7 +126,7 @@ 
         // Evaluate sql result set mappings
         if (isset($element['sqlResultSetMappings'])) {
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
-                if (!isset($resultSetMapping['name'])) {
+                if ( ! isset($resultSetMapping['name'])) {
                     $resultSetMapping['name'] = $name;
                 }
 
@@ -173,7 +173,7 @@ 
         }
 
         if (isset($element['inheritanceType'])) {
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
 
             if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate discriminatorColumn
@@ -362,7 +362,7 @@ 
                 }
 
                 if (isset($oneToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
                 }
 
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -416,7 +416,7 @@ 
                 ];
 
                 if (isset($oneToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
                 }
 
                 if (isset($oneToManyElement['cascade'])) {
@@ -458,7 +458,7 @@ 
                 }
 
                 if (isset($manyToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
                 }
 
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -503,7 +503,7 @@ 
                 ];
 
                 if (isset($manyToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
                 }
 
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -573,7 +573,7 @@ 
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
 
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
-                $override   = [];
+                $override = [];
 
                 // Check for joinColumn
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -591,7 +591,7 @@ 
                 if (isset($associationOverrideElement['joinTable'])) {
 
                     $joinTableElement   = $associationOverrideElement['joinTable'];
-                    $joinTable          =  [
+                    $joinTable          = [
                         'name' => $joinTableElement['name']
                     ];
 
@@ -625,7 +625,7 @@ 
 
                 // Check for `fetch`
                 if (isset($associationOverrideElement['fetch'])) {
-                    $override['fetch'] = constant(Metadata::class . '::FETCH_' . $associationOverrideElement['fetch']);
+                    $override['fetch'] = constant(Metadata::class.'::FETCH_'.$associationOverrideElement['fetch']);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -645,7 +645,7 @@ 
         if (isset($element['lifecycleCallbacks'])) {
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
                 foreach ($methods as $method) {
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
                 }
             }
         }
@@ -787,12 +787,12 @@ 
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
 
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
         }
 
         if ($usage) {
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
         }
 
         return [
@@ -806,7 +806,7 @@ 
      */
     protected function loadMappingFile($file)
     {
-        if (defined(Yaml::class . '::PARSE_KEYS_AS_STRINGS')) {
+        if (defined(Yaml::class.'::PARSE_KEYS_AS_STRINGS')) {
             return Yaml::parse(file_get_contents($file), Yaml::PARSE_KEYS_AS_STRINGS);
         }
 

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Doc Comments +2 added lines, -1 removed lines

@@ -117,6 +117,7 @@ 
     }
 
     /**
+     * @param string|false $columnPrefix
      * @return ClassMetadataInfo
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
@@ -1167,7 +1168,7 @@ 
 
     /**
      * @param string $type
-     * @param \ReflectionProperty $method
+     * @param \ReflectionMethod $method
      */
     private function assertPhpDocParamType($type, \ReflectionMethod $method)
     {

Indentation +6 added lines, -6 removed lines

@@ -539,7 +539,7 @@ 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
         $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
-                  . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+                    . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
 
         $this->assertFileExists($filename);
         require_once $filename;
@@ -600,9 +600,9 @@ 
 
     }
 
-     /**
-     * @group DDC-2172
-     */
+        /**
+         * @group DDC-2172
+         */
     public function testGetInheritanceTypeString()
     {
         $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadataInfo');
@@ -630,8 +630,8 @@ 
     }
 
     /**
-    * @group DDC-2172
-    */
+     * @group DDC-2172
+     */
     public function testGetChangeTrackingPolicyString()
     {
         $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadata');

Spacing +59 added lines, -59 removed lines

@@ -27,7 +27,7 @@ 
     {
         $this->_namespace = uniqid("doctrine_");
         $this->_tmpDir = \sys_get_temp_dir();
-        \mkdir($this->_tmpDir . \DIRECTORY_SEPARATOR . $this->_namespace);
+        \mkdir($this->_tmpDir.\DIRECTORY_SEPARATOR.$this->_namespace);
         $this->_generator = new EntityGenerator();
         $this->_generator->setAnnotationPrefix("");
         $this->_generator->setGenerateAnnotations(true);
@@ -39,14 +39,14 @@ 
 
     public function tearDown()
     {
-        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir . '/' . $this->_namespace));
+        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir.'/'.$this->_namespace));
         foreach ($ri AS $file) {
             /* @var $file \SplFileInfo */
             if ($file->isFile()) {
                 \unlink($file->getPathname());
             }
         }
-        rmdir($this->_tmpDir . '/' . $this->_namespace);
+        rmdir($this->_tmpDir.'/'.$this->_namespace);
     }
 
     /**
@@ -56,9 +56,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook');
         $metadata->namespace = $this->_namespace;
-        $metadata->customRepositoryClassName = $this->_namespace  . '\EntityGeneratorBookRepository';
+        $metadata->customRepositoryClassName = $this->_namespace.'\EntityGeneratorBookRepository';
 
         $metadata->table['name'] = 'book';
         $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']];
@@ -100,7 +100,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityType');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityType');
         $metadata->namespace = $this->_namespace;
 
         $metadata->table['name'] = 'entity_type';
@@ -121,7 +121,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorIsbn');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
         $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']);
@@ -144,7 +144,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable');
+        $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorTestEmbeddable');
         $metadata->namespace = $this->_namespace;
         $metadata->isEmbeddedClass = true;
         $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']);
@@ -187,11 +187,11 @@ 
         foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) {
             $classMetadata->mapEmbedded(
                 [
-                'fieldName' => $fieldName . '.' . $property,
+                'fieldName' => $fieldName.'.'.$property,
                 'class' => $embeddableClass['class'],
                 'columnPrefix' => $embeddableClass['columnPrefix'],
                 'declaredField' => $embeddableClass['declaredField']
-                        ? $fieldName . '.' . $embeddableClass['declaredField']
+                        ? $fieldName.'.'.$embeddableClass['declaredField']
                         : $fieldName,
                 'originalField' => $embeddableClass['originalField'] ?: $property,
                 ]
@@ -205,7 +205,7 @@ 
     private function loadEntityClass(ClassMetadataInfo $metadata)
     {
         $className = basename(str_replace('\\', '/', $metadata->name));
-        $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php';
+        $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php';
 
         $this->assertFileExists($path);
 
@@ -265,19 +265,19 @@ 
 
         $book = $this->newInstance($metadata);
         $this->assertTrue(class_exists($metadata->name), "Class does not exist.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing.");
-        $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing.");
+        $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing.");
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -330,7 +330,7 @@ 
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~");
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~");
 
         $book = $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->name);
@@ -375,7 +375,7 @@ 
         // Should not throw a PHP fatal error
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~");
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~");
 
         $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->name);
@@ -410,7 +410,7 @@ 
         $this->assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor'));
         $this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor'));
 
-        $expectedClassName = '\\' . $embeddedMetadata->name;
+        $expectedClassName = '\\'.$embeddedMetadata->name;
         $this->assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn'));
         $this->assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn'));
         $this->assertPhpDocParamType($expectedClassName, new \ReflectionMethod($book, 'setIsbn'));
@@ -520,7 +520,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata                     = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
+        $metadata                     = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook');
         $metadata->namespace          = $this->_namespace;
         $metadata->isMappedSuperclass = true;
 
@@ -558,7 +558,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity');
+        $metadata               = new ClassMetadataInfo($this->_namespace.'\DDC1784Entity');
         $metadata->namespace    = $this->_namespace;
         $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
@@ -571,8 +571,8 @@ 
         );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
-                  . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+        $filename = $this->_tmpDir.DIRECTORY_SEPARATOR
+                  . $this->_namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php';
 
         $this->assertFileExists($filename);
         require_once $filename;
@@ -592,7 +592,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata               = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity');
+        $metadata               = new ClassMetadataInfo($this->_namespace.'\DDC2079Entity');
         $metadata->namespace    = $this->_namespace;
         $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
@@ -603,20 +603,20 @@ 
             'joinTable'     => [
                 'name'                  => 'unidade_centro_custo',
                 'joinColumns'           => [
-                    ['name' => 'idorcamento',      'referencedColumnName' => 'idorcamento'],
-                    ['name' => 'idunidade',        'referencedColumnName' => 'idunidade']
+                    ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'],
+                    ['name' => 'idunidade', 'referencedColumnName' => 'idunidade']
                 ],
                 'inverseJoinColumns'    => [
-                    ['name' => 'idcentrocusto',    'referencedColumnName' => 'idcentrocusto'],
-                    ['name' => 'idpais',           'referencedColumnName' => 'idpais'],
+                    ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'],
+                    ['name' => 'idpais', 'referencedColumnName' => 'idpais'],
                 ],
             ],
             ]
         );
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $filename = $this->_tmpDir . DIRECTORY_SEPARATOR
-            . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php';
+        $filename = $this->_tmpDir.DIRECTORY_SEPARATOR
+            . $this->_namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php';
 
         $this->assertFileExists($filename);
         require_once $filename;
@@ -646,7 +646,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -675,7 +675,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -704,7 +704,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -728,7 +728,7 @@ 
     public function testEntityTypeAlias(array $field)
     {
         $metadata   = $this->generateEntityTypeFixture($field);
-        $path       = $this->_tmpDir . '/'. $this->_namespace . '/EntityType.php';
+        $path       = $this->_tmpDir.'/'.$this->_namespace.'/EntityType.php';
 
         $this->assertFileExists($path);
         require_once $path;
@@ -739,8 +739,8 @@ 
         $type   = $field['phpType'];
         $name   = $field['fieldName'];
         $value  = $field['value'];
-        $getter = "get" . ucfirst($name);
-        $setter = "set" . ucfirst($name);
+        $getter = "get".ucfirst($name);
+        $setter = "set".ucfirst($name);
 
         $this->assertPhpDocVarType($type, $reflClass->getProperty($name));
         $this->assertPhpDocParamType($type, $reflClass->getMethod($setter));
@@ -761,13 +761,13 @@ 
 
         $user = new DDC2372User();
         $metadata = $cmf->getMetadataFor(get_class($user));
-        $metadata->name = $this->_namespace . "\DDC2372User";
+        $metadata->name = $this->_namespace."\DDC2372User";
         $metadata->namespace = $this->_namespace;
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php");
-        require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php";
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372User.php");
+        require $this->_tmpDir."/".$this->_namespace."/DDC2372User.php";
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -787,13 +787,13 @@ 
 
         $user = new DDC2372Admin();
         $metadata = $cmf->getMetadataFor(get_class($user));
-        $metadata->name = $this->_namespace . "\DDC2372Admin";
+        $metadata->name = $this->_namespace."\DDC2372Admin";
         $metadata->namespace = $this->_namespace;
 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
-        $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php");
-        require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php";
+        $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php");
+        require $this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php";
 
         $reflClass = new \ReflectionClass($metadata->name);
 
@@ -813,20 +813,20 @@ 
         $cmf->setEntityManager($em);
 
         $ns     = $this->_namespace;
-        $nsdir  = $this->_tmpDir . '/' . $ns;
+        $nsdir  = $this->_tmpDir.'/'.$ns;
 
         $content = str_replace(
             'namespace Doctrine\Tests\Models\DDC1590',
-            'namespace ' . $ns,
-            file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php')
+            'namespace '.$ns,
+            file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php')
         );
 
-        $fname = $nsdir . "/DDC1590User.php";
+        $fname = $nsdir."/DDC1590User.php";
         file_put_contents($fname, $content);
         require $fname;
 
 
-        $metadata = $cmf->getMetadataFor($ns . '\DDC1590User');
+        $metadata = $cmf->getMetadataFor($ns.'\DDC1590User');
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
 
         // class DDC1590User extends DDC1590Entity { ... }
@@ -834,13 +834,13 @@ 
 
         // class _DDC1590User extends DDC1590Entity { ... }
         $source2    = str_replace('class DDC1590User', 'class _DDC1590User', $source);
-        $fname2     = $nsdir . "/_DDC1590User.php";
+        $fname2     = $nsdir."/_DDC1590User.php";
         file_put_contents($fname2, $source2);
         require $fname2;
 
         // class __DDC1590User { ... }
         $source3    = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source);
-        $fname3     = $nsdir . "/__DDC1590User.php";
+        $fname3     = $nsdir."/__DDC1590User.php";
         file_put_contents($fname3, $source3);
         require $fname3;
 
@@ -994,7 +994,7 @@ 
         $this->loadEntityClass($metadata);
 
         $className = basename(str_replace('\\', '/', $metadata->name));
-        $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php';
+        $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php';
         $classTest = file_get_contents($path);
 
         $this->_generator->setRegenerateEntityIfExists(true);
@@ -1003,7 +1003,7 @@ 
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
         $classNew = file_get_contents($path);
 
-        $this->assertSame($classTest,$classNew);
+        $this->assertSame($classTest, $classNew);
     }
 
     /**

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\DBAL\Driver\Connection;
-use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver;
 use Doctrine\DBAL\Logging\DebugStack;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Cache\CacheConfiguration;

Spacing +18 added lines, -18 removed lines

@@ -399,7 +399,7 @@ 
             $conn->executeUpdate('DELETE FROM RoutingLocation');
         }
 
-        if(isset($this->_usedModelSets['navigation'])) {
+        if (isset($this->_usedModelSets['navigation'])) {
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
             $conn->executeUpdate('DELETE FROM navigation_photos');
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -407,7 +407,7 @@ 
             $conn->executeUpdate('DELETE FROM navigation_countries');
         }
         if (isset($this->_usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file"));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -497,12 +497,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->_usedModelSets['vct_onetoone'])) {
@@ -641,9 +641,9 @@ 
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
             } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") {
-                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+                static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
             }
         }
 
@@ -702,7 +702,7 @@ 
         $config = new Configuration();
         $config->setMetadataCacheImpl(self::$_metadataCacheImpl);
         $config->setQueryCacheImpl(self::$_queryCacheImpl);
-        $config->setProxyDir(__DIR__ . '/Proxies');
+        $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
         if (null !== $this->resultCacheImpl) {
@@ -734,8 +734,8 @@ 
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver(
                 [
-                    realpath(__DIR__ . '/Models/Cache'),
-                    realpath(__DIR__ . '/Models/GeoNames')
+                    realpath(__DIR__.'/Models/Cache'),
+                    realpath(__DIR__.'/Models/GeoNames')
                 ],
                 true
             )
@@ -783,7 +783,7 @@ 
             throw $e;
         }
 
-        if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
+        if (isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
             $queries = "";
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
             foreach ($last25queries as $i => $query) {
@@ -794,9 +794,9 @@ 
 
             $trace = $e->getTrace();
             $traceMsg = "";
-            foreach($trace AS $part) {
-                if(isset($part['file'])) {
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
+            foreach ($trace AS $part) {
+                if (isset($part['file'])) {
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
                         // Beginning with PHPUnit files we don't print the trace anymore.
                         break;
                     }
@@ -807,7 +807,7 @@ 
 
             $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg;
 
-            throw new \Exception($message, (int)$e->getCode(), $e);
+            throw new \Exception($message, (int) $e->getCode(), $e);
         }
         throw $e;
     }

Braces +6 added lines, -1 removed lines

@@ -787,7 +787,12 @@
             $queries = "";
             $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true);
             foreach ($last25queries as $i => $query) {
-                $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: []
+                $params = array_map(function($p) { if (is_object($p)) {
+                    return get_class($p);
+                } else {
+                    return var_export($p, true);
+                }
+                }, $query['params'] ?: []
                 );
                 $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL;
             }

bin/doctrine-pear.php

Spacing +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
 $classLoader = new \Doctrine\Common\ClassLoader('Symfony');
 $classLoader->register();
 
-$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
+$configFile = getcwd().DIRECTORY_SEPARATOR.'cli-config.php';
 
 $helperSet = null;
 if (file_exists($configFile)) {
     if ( ! is_readable($configFile)) {
         trigger_error(
-            'Configuration file [' . $configFile . '] does not have read permission.', E_USER_ERROR
+            'Configuration file ['.$configFile.'] does not have read permission.', E_USER_ERROR
         );
     }
 

bin/doctrine.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 
 $autoloadFiles = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
+    __DIR__.'/../vendor/autoload.php',
+    __DIR__.'/../../../autoload.php'
 ];
 
 foreach ($autoloadFiles as $autoloadFile) {
@@ -32,11 +32,11 @@ 
     }
 }
 
-$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
+$directories = [getcwd(), getcwd().DIRECTORY_SEPARATOR.'config'];
 
 $configFile = null;
 foreach ($directories as $directory) {
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
 
     if (file_exists($configFile)) {
         break;
@@ -49,7 +49,7 @@ 
 }
 
 if ( ! is_readable($configFile)) {
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
     exit(1);
 }