doctrine / orm

tests/Doctrine/Tests/ORM/Functional/Ticket/GH6699Test.php

Indentation +12 added lines, -12 removed lines

@@ -20,11 +20,11 @@ 
     public function testMixedParametersWithZeroNumber() : void
     {
         $query = $this->_em->createQueryBuilder()
-                           ->select('u')
-                           ->from(CmsUser::class, 'u')
-                           ->andWhere('u.username = :username')
-                           ->andWhere('u.id = ?0')
-                           ->getQuery();
+                            ->select('u')
+                            ->from(CmsUser::class, 'u')
+                            ->andWhere('u.username = :username')
+                            ->andWhere('u.id = ?0')
+                            ->getQuery();
 
         $query->setParameter('username', 'bar');
         $query->setParameter(0, 0);
@@ -39,13 +39,13 @@ 
     public function testMixedParametersWithZeroNumberOnQueryBuilder() : void
     {
         $query = $this->_em->createQueryBuilder()
-                           ->select('u')
-                           ->from(CmsUser::class, 'u')
-                           ->andWhere('u.username = :username')
-                           ->andWhere('u.id = ?0')
-                           ->setParameter('username', 'bar')
-                           ->setParameter(0, 0)
-                           ->getQuery();
+                            ->select('u')
+                            ->from(CmsUser::class, 'u')
+                            ->andWhere('u.username = :username')
+                            ->andWhere('u.id = ?0')
+                            ->setParameter('username', 'bar')
+                            ->setParameter(0, 0)
+                            ->getQuery();
 
         $query->execute();
 

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

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
                 $this->_em->getClassMetadata(DDC3027Dog::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -82,7 +82,7 @@ 
         $this->assertEquals('United States of America', $person->address->country->name);
 
         // 4. check deleting works
-        $personId = $person->id;;
+        $personId = $person->id; ;
         $this->_em->remove($person);
         $this->_em->flush();
 
@@ -106,7 +106,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getResult();
 
         $this->assertCount(3, $persons);
@@ -119,7 +119,7 @@ 
             $this->assertEquals('United States of America', $person->address->country->name);
         }
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getArrayResult();
 
         foreach ($persons as $person) {
@@ -144,7 +144,7 @@ 
         $this->_em->flush();
 
         // SELECT
-        $selectDql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
+        $selectDql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
         $loadedPerson = $this->_em->createQuery($selectDql)
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'Germany')
@@ -159,7 +159,7 @@ 
         );
 
         // UPDATE
-        $updateDql = "UPDATE " . __NAMESPACE__ . "\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
+        $updateDql = "UPDATE ".__NAMESPACE__."\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
         $this->_em->createQuery($updateDql)
             ->setParameter('street', 'Boo')
             ->setParameter('country', 'DE')
@@ -171,7 +171,7 @@ 
         $this->assertEquals('DE', $person->address->country->name);
 
         // DELETE
-        $this->_em->createQuery("DELETE " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
+        $this->_em->createQuery("DELETE ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'DE')
             ->execute();
@@ -188,7 +188,7 @@ 
         $this->_em->clear();
 
         // Prove that the entity was persisted correctly.
-        $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -202,7 +202,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{id,address.city} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -218,7 +218,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{address.city, id} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -237,7 +237,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('no field or association named address.asdfasdf');
 
-        $this->_em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
+        $this->_em->createQuery("SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
             ->execute();
     }
 
@@ -246,7 +246,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage("no mapped field named 'address.asdfasdf'");
 
-        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM " . __NAMESPACE__ . "\\DDC93Person p")
+        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM ".__NAMESPACE__."\\DDC93Person p")
             ->execute();
     }
 
@@ -308,15 +308,15 @@ 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
             sprintf(
-                'Infinite nesting detected for embedded property %s::nested. ' .
+                'Infinite nesting detected for embedded property %s::nested. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
-                __NAMESPACE__ . '\\' . $declaredEmbeddableClassName
+                __NAMESPACE__.'\\'.$declaredEmbeddableClassName
             )
         );
 
         $this->_schemaTool->createSchema(
             [
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName),
+            $this->_em->getClassMetadata(__NAMESPACE__.'\\'.$embeddableClassName),
             ]
         );
     }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $this->_em->persist($user);
         $this->_em->flush();
 
-        $repository = $this->_em->getRepository(__NAMESPACE__ . "\DDC2984User");
+        $repository = $this->_em->getRepository(__NAMESPACE__."\DDC2984User");
 
         $sameUser = $repository->find(new DDC2984DomainUserId('unique_id_within_a_vo'));
 

lib/Doctrine/ORM/Query/Expr.php

Spacing +8 added lines, -8 removed lines

@@ -268,7 +268,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -450,7 +450,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -471,7 +471,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -495,7 +495,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -613,13 +613,13 @@ 
      */
     private function _quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         }
 
-        return "'" . str_replace("'", "''", $literal) . "'";
+        return "'".str_replace("'", "''", $literal)."'";
     }
 
     /**
@@ -633,7 +633,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**

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

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         foreach ($AST->orderByClause->orderByItems as $item) {
             if ($item->expression instanceof PathExpression) {
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
-                    $this->createSelectExpressionItem($item->expression), '_dctrn_ord' . $this->_aliasCounter++
+                    $this->createSelectExpressionItem($item->expression), '_dctrn_ord'.$this->_aliasCounter++
                 );
 
                 continue;

lib/Doctrine/ORM/Tools/Setup.php

Spacing +4 added lines, -4 removed lines

@@ -44,14 +44,14 @@ 
      */
     public static function registerAutoloadDirectory($directory)
     {
-        if (!class_exists('Doctrine\Common\ClassLoader', false)) {
-            require_once $directory . "/Doctrine/Common/ClassLoader.php";
+        if ( ! class_exists('Doctrine\Common\ClassLoader', false)) {
+            require_once $directory."/Doctrine/Common/ClassLoader.php";
         }
 
         $loader = new ClassLoader("Doctrine", $directory);
         $loader->register();
 
-        $loader = new ClassLoader("Symfony\Component", $directory . "/Doctrine");
+        $loader = new ClassLoader("Symfony\Component", $directory."/Doctrine");
         $loader->register();
     }
 
@@ -150,7 +150,7 @@ 
             $namespace .= ':';
         }
 
-        $cache->setNamespace($namespace . 'dc2_' . md5($proxyDir) . '_'); // to avoid collisions
+        $cache->setNamespace($namespace.'dc2_'.md5($proxyDir).'_'); // to avoid collisions
 
         return $cache;
     }

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +58 added lines, -58 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 '" . $inverseJoinColumn['referencedColumnName'] . "' " .
-                                "has to be a primary key column on the target entity class '" .$targetMetadata->name . "'.";
+                        if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$inverseJoinColumn['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.";
             }
         }
 

tests/Doctrine/Tests/ORM/Functional/Ticket/GH6937Test.php

Indentation +10 added lines, -10 removed lines

@@ -50,11 +50,11 @@ 
         $this->_em->clear();
 
         $persistedManager = $this->_em->getRepository(GH6937Person::class)
-                                      ->createQueryBuilder('e')
-                                      ->where('e.id = :id')
-                                      ->setParameter('id', $manager->id)
-                                      ->getQuery()
-                                      ->getOneOrNullResult(AbstractQuery::HYDRATE_SIMPLEOBJECT);
+                                        ->createQueryBuilder('e')
+                                        ->where('e.id = :id')
+                                        ->setParameter('id', $manager->id)
+                                        ->getQuery()
+                                        ->getOneOrNullResult(AbstractQuery::HYDRATE_SIMPLEOBJECT);
 
         self::assertSame('Kevin', $persistedManager->name);
         self::assertSame('555-5555', $persistedManager->phoneNumber);
@@ -73,11 +73,11 @@ 
         $this->_em->clear();
 
         $persistedManager = $this->_em->getRepository(GH6937Person::class)
-                                      ->createQueryBuilder('e')
-                                      ->where('e.id = :id')
-                                      ->setParameter('id', $manager->id)
-                                      ->getQuery()
-                                      ->getOneOrNullResult();
+                                        ->createQueryBuilder('e')
+                                        ->where('e.id = :id')
+                                        ->setParameter('id', $manager->id)
+                                        ->getQuery()
+                                        ->getOneOrNullResult();
 
         self::assertSame('Kevin', $persistedManager->name);
         self::assertSame('555-5555', $persistedManager->phoneNumber);

lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php

Spacing +6 added lines, -6 removed lines

@@ -49,10 +49,10 @@ 
         $tableName = $class->table['name'];
 
         if ( ! empty($class->table['schema'])) {
-            $tableName = $class->table['schema'] . '.' . $class->table['name'];
+            $tableName = $class->table['schema'].'.'.$class->table['name'];
 
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
-                $tableName = $class->table['schema'] . '__' . $class->table['name'];
+                $tableName = $class->table['schema'].'__'.$class->table['name'];
             }
         }
 
@@ -109,7 +109,7 @@ 
             $tableName = $platform->quoteIdentifier($tableName);
         }
 
-        return $schema . $tableName;
+        return $schema.$tableName;
     }
 
     /**
@@ -129,7 +129,7 @@ 
             // Association defined as Id field
             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];
             $assocQuotedColumnNames = array_map(
-                function ($joinColumn) use ($platform)
+                function($joinColumn) use ($platform)
                 {
                     return isset($joinColumn['quoted'])
                         ? $platform->quoteIdentifier($joinColumn['name'])
@@ -154,10 +154,10 @@ 
         //     If the alias is to long, characters are cut off from the beginning.
         // 3 ) Strip non alphanumeric characters
         // 4 ) Prefix with "_" if the result its numeric
-        $columnName = $columnName . '_' . $counter;
+        $columnName = $columnName.'_'.$counter;
         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());
         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;
+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
 
         return $platform->getSQLResultCasing($columnName);
     }