doctrine / orm

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +6 added lines, -6 removed lines

@@ -225,7 +225,7 @@ 
                             $targetEntity = current(
                                 array_filter(
                                     $classes,
-                                    function (ClassMetadata $class) use ($idMapping) : bool {
+                                    function(ClassMetadata $class) use ($idMapping) : bool {
                                         return $class->name === $idMapping['targetEntity'];
                                     }
                                 )
@@ -645,8 +645,8 @@ 
 
             if ( ! $definingClass) {
                 throw new \Doctrine\ORM\ORMException(
-                    'Column name `' . $joinColumn['referencedColumnName'] . '` referenced for relation from '
-                    . $mapping['sourceEntity'] . ' towards ' . $mapping['targetEntity'] . ' does not exist.'
+                    'Column name `'.$joinColumn['referencedColumnName'].'` referenced for relation from '
+                    . $mapping['sourceEntity'].' towards '.$mapping['targetEntity'].' does not exist.'
                 );
             }
 
@@ -710,7 +710,7 @@ 
 
         $compositeName = $theJoinTable->getName().'.'.implode('', $localColumns);
 
-        if (! $this->platform->supportsForeignKeyConstraints()) {
+        if ( ! $this->platform->supportsForeignKeyConstraints()) {
             return;
         }
 
@@ -746,7 +746,7 @@ 
      */
     private function gatherColumnOptions(array $mapping) : array
     {
-        if (! isset($mapping['options'])) {
+        if ( ! isset($mapping['options'])) {
             return [];
         }
 
@@ -852,7 +852,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -120,7 +120,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName, self::PATTERN_FOR_PROPERTIES) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName, self::PATTERN_FOR_PROPERTIES).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }
 

tests/Doctrine/Tests/Models/CMSCustomId/CmsAddress.php

Indentation +7 added lines, -7 removed lines

@@ -126,7 +126,7 @@ 
     {
         $metadata->setPrimaryTable(
             [
-           'name' => 'company_person',
+            'name' => 'company_person',
             ]
         );
 
@@ -191,18 +191,18 @@ 
             'entities'  => [
                 [
                 'fields' => [
-                  [
+                    [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'city',
                     'column'    => 'city',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'country',
                     'column'    => 'country',
-                  ],
+                    ],
                 ],
                 'entityClass' => CmsAddress::class,
                 ],

tests/Doctrine/Tests/Models/CMSCustomId/CmsUser.php

Indentation +33 added lines, -33 removed lines

@@ -274,7 +274,7 @@ 
     {
         $metadata->setPrimaryTable(
             [
-           'name' => 'cms_users_customid',
+            'name' => 'cms_users_customid',
             ]
         );
 
@@ -333,34 +333,34 @@ 
             'entities'  => [
                 [
                 'fields'=> [
-                  [
+                    [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'status',
                     'column'    => 'status',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'address.zip',
                     'column'    => 'zip',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'address.city',
                     'column'    => 'city',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'address.country',
                     'column'    => 'country',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'address.id',
                     'column'    => 'a_id',
-                  ],
+                    ],
                 ],
                 'entityClass'           => CmsUser::class,
                 'discriminatorColumn'   => null
@@ -376,22 +376,22 @@ 
             'entities'  => [
                 [
                 'fields'=> [
-                  [
+                    [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'status',
                     'column'    => 'status',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'phonenumbers.phonenumber',
                     'column'    => 'number',
-                  ],
+                    ],
                 ],
                 'entityClass'   => CmsUser::class,
                 'discriminatorColumn'   => null
@@ -405,29 +405,29 @@ 
             'name'      => 'mappingUserPhonenumberCount',
             'columns'   => [],
             'entities'  => [
-              [
+                [
                 'fields' => [
-                  [
+                    [
                     'name'      => 'id',
                     'column'    => 'id',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'name',
                     'column'    => 'name',
-                  ],
-                  [
+                    ],
+                    [
                     'name'      => 'status',
                     'column'    => 'status',
-                  ]
+                    ]
                 ],
                 'entityClass'   => CmsUser::class,
                 'discriminatorColumn'   => null
-              ]
+                ]
             ],
             'columns' => [
-                  [
+                    [
                     'name' => 'numphones',
-                  ]
+                    ]
             ]
             ]
         );

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

Spacing +18 added lines, -18 removed lines

@@ -130,7 +130,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(9, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "0", $result[0]->$checkField);
+        $this->assertEquals($checkField."0", $result[0]->$checkField);
     }
 
     private function iterateWithOrderAscWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -146,7 +146,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "0", $result[0]->$checkField);
+        $this->assertEquals($checkField."0", $result[0]->$checkField);
     }
 
     private function iterateWithOrderAscWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -162,7 +162,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "3", $result[0]->$checkField);
+        $this->assertEquals($checkField."3", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDesc($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -175,7 +175,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(9, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "8", $result[0]->$checkField);
+        $this->assertEquals($checkField."8", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDescWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -190,7 +190,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "8", $result[0]->$checkField);
+        $this->assertEquals($checkField."8", $result[0]->$checkField);
     }
 
     private function iterateWithOrderDescWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -205,7 +205,7 @@ 
         $iter = $paginator->getIterator();
         $this->assertCount(3, $iter);
         $result = iterator_to_array($iter);
-        $this->assertEquals($checkField . "5", $result[0]->$checkField);
+        $this->assertEquals($checkField."5", $result[0]->$checkField);
     }
 
     /**
@@ -478,8 +478,8 @@ 
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBoth($useOutputWalkers)
     {
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAsc($useOutputWalkers, true, $dqlAsc, "name");
         $this->iterateWithOrderDesc($useOutputWalkers, true, $dqlDesc, "name");
     }
@@ -487,8 +487,8 @@ 
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBothWithLimitWithOutputWalker()
     {
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAscWithLimit(true, true, $dqlAsc, "name");
         $this->iterateWithOrderDescWithLimit(true, true, $dqlDesc, "name");
     }
@@ -499,8 +499,8 @@ 
         $this->expectExceptionMessage('Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers.');
 
         $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
-        $dqlAsc = $dql . " ASC, d.name";
-        $dqlDesc = $dql . " DESC, d.name";
+        $dqlAsc = $dql." ASC, d.name";
+        $dqlDesc = $dql." DESC, d.name";
         $this->iterateWithOrderAscWithLimit(false, true, $dqlAsc, "name");
         $this->iterateWithOrderDescWithLimit(false, true, $dqlDesc, "name");
     }
@@ -584,7 +584,7 @@ 
         $users = iterator_to_array($paginator->getIterator());
         $this->assertCount(9, $users);
         foreach ($users as $i => $user) {
-            $this->assertEquals("username" . (8 - $i), $user->username);
+            $this->assertEquals("username".(8 - $i), $user->username);
         }
     }
 
@@ -699,7 +699,7 @@ 
         $groups = [];
         for ($j = 0; $j < 3; $j++) {;
             $group = new CmsGroup();
-            $group->id = new CustomIdObject('group' . $j);
+            $group->id = new CustomIdObject('group'.$j);
             $group->name = "group$j";
             $groups[] = $group;
             $this->_em->persist($group);
@@ -707,10 +707,10 @@ 
 
         for ($i = 0; $i < 9; $i++) {
             $email = new CmsEmail();
-            $email->id = new CustomIdObject('email' . $i);
+            $email->id = new CustomIdObject('email'.$i);
 
             $user = new CmsUser();
-            $user->id = new CustomIdObject('user' . $i);
+            $user->id = new CustomIdObject('user'.$i);
             $user->name = "Name$i";
             $user->username = "username$i";
             $user->status = "active";
@@ -723,7 +723,7 @@ 
             $this->_em->persist($user);
             for ($j = 0; $j < $i + 1; $j++) {
                 $article = new CmsArticle();
-                $article->id = new CustomIdObject('article' . $j . "_user" . $i);
+                $article->id = new CustomIdObject('article'.$j."_user".$i);
                 $article->topic = "topic$i$j";
                 $article->text = "text$i$j";
                 $article->setAuthor($user);
@@ -740,7 +740,7 @@ 
             $company->logo->image_width = 100 + $i;
             $company->logo->image_height = 100 + $i;
             $company->logo->company = $company;
-            for($j=0;$j<3;$j++) {
+            for ($j = 0; $j < 3; $j++) {
                 $department = new Department();
                 $department->name = "name$i$j";
                 $department->company = $company;