Completed
Pull Request — master (#7046)
by Gabriel
12:39
created
tests/Doctrine/Tests/ORM/Query/QueryTest.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -88,18 +88,18 @@  discard block
 block discarded – undo
88 88
     {
89 89
         $q  = $this->em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a');
90 90
         $q2 = $q->expireQueryCache(true)
91
-          ->setQueryCacheLifetime(3600)
92
-          ->setQueryCacheDriver(null)
93
-          ->expireResultCache(true)
94
-          ->setHint('foo', 'bar')
95
-          ->setHint('bar', 'baz')
96
-          ->setParameter(1, 'bar')
97
-          ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
98
-          ->setResultCacheDriver(null)
99
-          ->setResultCacheId('foo')
100
-          ->setDQL('foo')
101
-          ->setFirstResult(10)
102
-          ->setMaxResults(10);
91
+            ->setQueryCacheLifetime(3600)
92
+            ->setQueryCacheDriver(null)
93
+            ->expireResultCache(true)
94
+            ->setHint('foo', 'bar')
95
+            ->setHint('bar', 'baz')
96
+            ->setParameter(1, 'bar')
97
+            ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
98
+            ->setResultCacheDriver(null)
99
+            ->setResultCacheId('foo')
100
+            ->setDQL('foo')
101
+            ->setFirstResult(10)
102
+            ->setMaxResults(10);
103 103
 
104 104
         self::assertSame($q2, $q);
105 105
     }
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         $this->em->getConfiguration()->setResultCacheImpl(new ArrayCache());
257 257
 
258 258
         $query = $this->em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u')
259
-                          ->useResultCache(true);
259
+                            ->useResultCache(true);
260 260
 
261 261
         /** @var DriverConnectionMock $driverConnectionMock */
262 262
         $driverConnectionMock = $this->em->getConnection()
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Query;
6 6
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
      */
314 314
     public function testGetParameterTypeJuggling() : void
315 315
     {
316
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id = ?0');
316
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id = ?0');
317 317
 
318 318
         $query->setParameter(0, 0);
319 319
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
      */
328 328
     public function testSetParameterWithNameZeroIsNotOverridden() : void
329 329
     {
330
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
330
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
331 331
 
332 332
         $query->setParameter(0, 0);
333 333
         $query->setParameter('name', 'Doctrine');
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
      */
343 343
     public function testSetParameterWithNameZeroDoesNotOverrideAnotherParameter() : void
344 344
     {
345
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
345
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
346 346
 
347 347
         $query->setParameter('name', 'Doctrine');
348 348
         $query->setParameter(0, 0);
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
      */
358 358
     public function testSetParameterWithTypeJugglingWorks() : void
359 359
     {
360
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
360
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
361 361
 
362 362
         $query->setParameter('0', 1);
363 363
         $query->setParameter('name', 'Doctrine');
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
     {
378 378
         $this->em->getConfiguration()->setResultCacheImpl(new ArrayCache());
379 379
 
380
-        $query = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u');
380
+        $query = $this->em->createQuery('SELECT u FROM '.CmsUser::class.' u');
381 381
         $query->useResultCache(true);
382 382
         $query->setResultCacheProfile();
383 383
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1914,10 +1914,10 @@  discard block
 block discarded – undo
1914 1914
         $rsm->setDiscriminatorColumn('c', 'c_discr');
1915 1915
 
1916 1916
         $resultSet = [
1917
-              [
1918
-                  'c__id'   => '1',
1919
-                  'c_discr' => 'fix',
1920
-              ],
1917
+                [
1918
+                    'c__id'   => '1',
1919
+                    'c_discr' => 'fix',
1920
+                ],
1921 1921
         ];
1922 1922
 
1923 1923
         $stmt     = new HydratorMockStatement($resultSet);
@@ -1946,12 +1946,12 @@  discard block
 block discarded – undo
1946 1946
         $rsm->setDiscriminatorColumn('e', 'e_discr');
1947 1947
 
1948 1948
         $resultSet = [
1949
-              [
1950
-                  'c__id'   => '1',
1951
-                  'c_discr' => 'fix',
1952
-                  'e__id'   => '1',
1953
-                  'e__name' => 'Fabio B. Silva',
1954
-              ],
1949
+                [
1950
+                    'c__id'   => '1',
1951
+                    'c_discr' => 'fix',
1952
+                    'e__id'   => '1',
1953
+                    'e__name' => 'Fabio B. Silva',
1954
+                ],
1955 1955
         ];
1956 1956
 
1957 1957
         $stmt     = new HydratorMockStatement($resultSet);
@@ -1976,11 +1976,11 @@  discard block
 block discarded – undo
1976 1976
         $rsm->setDiscriminatorColumn('p', 'discr');
1977 1977
 
1978 1978
         $resultSet = [
1979
-              [
1980
-                  'p__id'   => '1',
1981
-                  'p__name' => 'Fabio B. Silva',
1982
-                  'discr'   => 'subworker',
1983
-              ],
1979
+                [
1980
+                    'p__id'   => '1',
1981
+                    'p__name' => 'Fabio B. Silva',
1982
+                    'discr'   => 'subworker',
1983
+                ],
1984 1984
         ];
1985 1985
 
1986 1986
         $stmt     = new HydratorMockStatement($resultSet);
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM;
6 6
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
             'empty string, single field'     => [$emptyString, ''],
505 505
             'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id],
506 506
             'empty strings, two fields'      => [$emptyStrings, ' '],
507
-            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1 . ' ' . $nonEmptyStrings->id2],
507
+            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1.' '.$nonEmptyStrings->id2],
508 508
             'boolean true'                   => [$booleanTrue, '1'],
509 509
             'boolean false'                  => [$booleanFalse, ''],
510 510
         ];
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/EntityManagerTest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
     public function testCreateQueryBuilderAliasValid()
109 109
     {
110 110
         $q  = $this->em->createQueryBuilder()
111
-             ->select('u')->from(CmsUser::class, 'u');
111
+                ->select('u')->from(CmsUser::class, 'u');
112 112
         $q2 = clone $q;
113 113
 
114 114
         self::assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $q->getQuery()->getDql());
Please login to merge, or discard this patch.
Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,8 @@
 block discarded – undo
86 86
         $this->em                  = $this->getTestEntityManager();
87 87
         $this->region              = $this->createRegion();
88 88
         $this->collectionPersister = $this->getMockBuilder(CollectionPersister::class)
89
-                                           ->setMethods($this->collectionPersisterMockMethods)
90
-                                           ->getMock();
89
+                                            ->setMethods($this->collectionPersisterMockMethods)
90
+                                            ->getMock();
91 91
     }
92 92
 
93 93
     /**
Please login to merge, or discard this patch.
Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -103,8 +103,8 @@
 block discarded – undo
103 103
         $this->em              = $this->getTestEntityManager();
104 104
         $this->region          = $this->createRegion();
105 105
         $this->entityPersister = $this->getMockBuilder(EntityPersister::class)
106
-                                       ->setMethods($this->entityPersisterMockMethods)
107
-                                       ->getMock();
106
+                                        ->setMethods($this->entityPersisterMockMethods)
107
+                                        ->getMock();
108 108
     }
109 109
 
110 110
     /**
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Functional;
6 6
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $entity = $this->em->find('\Doctrine\Tests\Models\CustomType\CustomTypeUpperCase', $id);
48 48
 
49 49
         self::assertEquals('foo', $entity->lowerCaseString, 'Entity holds lowercase string');
50
-        self::assertEquals('FOO', $this->em->getConnection()->fetchColumn('select lowerCaseString from customtype_uppercases where id=' . $entity->id . ''), 'Database holds uppercase string');
50
+        self::assertEquals('FOO', $this->em->getConnection()->fetchColumn('select lowerCaseString from customtype_uppercases where id='.$entity->id.''), 'Database holds uppercase string');
51 51
     }
52 52
 
53 53
     /**
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
         $entity = $this->em->find('\Doctrine\Tests\Models\CustomType\CustomTypeUpperCase', $id);
70 70
         self::assertEquals('foo', $entity->namedLowerCaseString, 'Entity holds lowercase string');
71
-        self::assertEquals('FOO', $this->em->getConnection()->fetchColumn('select named_lower_case_string from customtype_uppercases where id=' . $entity->id . ''), 'Database holds uppercase string');
71
+        self::assertEquals('FOO', $this->em->getConnection()->fetchColumn('select named_lower_case_string from customtype_uppercases where id='.$entity->id.''), 'Database holds uppercase string');
72 72
 
73 73
         $entity->namedLowerCaseString = 'bar';
74 74
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $entity = $this->em->find('\Doctrine\Tests\Models\CustomType\CustomTypeUpperCase', $id);
83 83
         self::assertEquals('bar', $entity->namedLowerCaseString, 'Entity holds lowercase string');
84
-        self::assertEquals('BAR', $this->em->getConnection()->fetchColumn('select named_lower_case_string from customtype_uppercases where id=' . $entity->id . ''), 'Database holds uppercase string');
84
+        self::assertEquals('BAR', $this->em->getConnection()->fetchColumn('select named_lower_case_string from customtype_uppercases where id='.$entity->id.''), 'Database holds uppercase string');
85 85
     }
86 86
 
87 87
     public function testTypeValueSqlWithAssociations()
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         $entity = $this->em->find(CustomTypeParent::class, $parentId);
109 109
 
110 110
         self::assertTrue($entity->customInteger < 0, 'Fetched customInteger negative');
111
-        self::assertEquals(1, $this->em->getConnection()->fetchColumn('select customInteger from customtype_parents where id=' . $entity->id . ''), 'Database has stored customInteger positive');
111
+        self::assertEquals(1, $this->em->getConnection()->fetchColumn('select customInteger from customtype_parents where id='.$entity->id.''), 'Database has stored customInteger positive');
112 112
 
113 113
         self::assertNotNull($parent->child, 'Child attached');
114 114
         self::assertCount(2, $entity->getMyFriends(), '2 friends attached');
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 
128 128
         $this->em->clear();
129 129
 
130
-        $query = $this->em->createQuery('SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = ' . $parentId);
130
+        $query = $this->em->createQuery('SELECT p, p.customInteger, c from Doctrine\Tests\Models\CustomType\CustomTypeParent p JOIN p.child c where p.id = '.$parentId);
131 131
 
132 132
         $result = $query->getResult();
133 133
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/PaginationTest.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Functional;
6 6
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         $iter = $paginator->getIterator();
132 132
         self::assertCount(9, $iter);
133 133
         $result = iterator_to_array($iter);
134
-        self::assertEquals($checkField . '0', $result[0]->{$checkField});
134
+        self::assertEquals($checkField.'0', $result[0]->{$checkField});
135 135
     }
136 136
 
137 137
     private function iterateWithOrderAscWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         $iter = $paginator->getIterator();
148 148
         self::assertCount(3, $iter);
149 149
         $result = iterator_to_array($iter);
150
-        self::assertEquals($checkField . '0', $result[0]->{$checkField});
150
+        self::assertEquals($checkField.'0', $result[0]->{$checkField});
151 151
     }
152 152
 
153 153
     private function iterateWithOrderAscWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
         $iter = $paginator->getIterator();
164 164
         self::assertCount(3, $iter);
165 165
         $result = iterator_to_array($iter);
166
-        self::assertEquals($checkField . '3', $result[0]->{$checkField});
166
+        self::assertEquals($checkField.'3', $result[0]->{$checkField});
167 167
     }
168 168
 
169 169
     private function iterateWithOrderDesc($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
         $iter = $paginator->getIterator();
177 177
         self::assertCount(9, $iter);
178 178
         $result = iterator_to_array($iter);
179
-        self::assertEquals($checkField . '8', $result[0]->{$checkField});
179
+        self::assertEquals($checkField.'8', $result[0]->{$checkField});
180 180
     }
181 181
 
182 182
     private function iterateWithOrderDescWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         $iter = $paginator->getIterator();
192 192
         self::assertCount(3, $iter);
193 193
         $result = iterator_to_array($iter);
194
-        self::assertEquals($checkField . '8', $result[0]->{$checkField});
194
+        self::assertEquals($checkField.'8', $result[0]->{$checkField});
195 195
     }
196 196
 
197 197
     private function iterateWithOrderDescWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField)
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
         $iter = $paginator->getIterator();
207 207
         self::assertCount(3, $iter);
208 208
         $result = iterator_to_array($iter);
209
-        self::assertEquals($checkField . '5', $result[0]->{$checkField});
209
+        self::assertEquals($checkField.'5', $result[0]->{$checkField});
210 210
     }
211 211
 
212 212
     /**
@@ -479,8 +479,8 @@  discard block
 block discarded – undo
479 479
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBoth($useOutputWalkers)
480 480
     {
481 481
         $dql     = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
482
-        $dqlAsc  = $dql . ' ASC, d.name';
483
-        $dqlDesc = $dql . ' DESC, d.name';
482
+        $dqlAsc  = $dql.' ASC, d.name';
483
+        $dqlDesc = $dql.' DESC, d.name';
484 484
         $this->iterateWithOrderAsc($useOutputWalkers, true, $dqlAsc, 'name');
485 485
         $this->iterateWithOrderDesc($useOutputWalkers, true, $dqlDesc, 'name');
486 486
     }
@@ -488,8 +488,8 @@  discard block
 block discarded – undo
488 488
     public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBothWithLimitWithOutputWalker()
489 489
     {
490 490
         $dql     = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
491
-        $dqlAsc  = $dql . ' ASC, d.name';
492
-        $dqlDesc = $dql . ' DESC, d.name';
491
+        $dqlAsc  = $dql.' ASC, d.name';
492
+        $dqlDesc = $dql.' DESC, d.name';
493 493
         $this->iterateWithOrderAscWithLimit(true, true, $dqlAsc, 'name');
494 494
         $this->iterateWithOrderDescWithLimit(true, true, $dqlDesc, 'name');
495 495
     }
@@ -500,8 +500,8 @@  discard block
 block discarded – undo
500 500
         $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.');
501 501
 
502 502
         $dql     = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name';
503
-        $dqlAsc  = $dql . ' ASC, d.name';
504
-        $dqlDesc = $dql . ' DESC, d.name';
503
+        $dqlAsc  = $dql.' ASC, d.name';
504
+        $dqlDesc = $dql.' DESC, d.name';
505 505
         $this->iterateWithOrderAscWithLimit(false, true, $dqlAsc, 'name');
506 506
         $this->iterateWithOrderDescWithLimit(false, true, $dqlDesc, 'name');
507 507
     }
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
         $users = iterator_to_array($paginator->getIterator());
586 586
         self::assertCount(9, $users);
587 587
         foreach ($users as $i => $user) {
588
-            self::assertEquals('username' . (8 - $i), $user->username);
588
+            self::assertEquals('username'.(8 - $i), $user->username);
589 589
         }
590 590
     }
591 591
 
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
             $company->logo->image_width  = 100 + $i;
736 736
             $company->logo->image_height = 100 + $i;
737 737
             $company->logo->company      = $company;
738
-            for ($j=0;$j<3;$j++) {
738
+            for ($j = 0; $j < 3; $j++) {
739 739
                 $department             = new Department();
740 740
                 $department->name       = "name$i$j";
741 741
                 $department->company    = $company;
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Functional;
6 6
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
     public function addType(Type $type)
210 210
     {
211
-        if (! $this->types->contains($type)) {
211
+        if ( ! $this->types->contains($type)) {
212 212
             $this->types[] = $type;
213 213
             $type->addLemma($this);
214 214
         }
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
      */
320 320
     public function addLemma(Lemma $lemma)
321 321
     {
322
-        if (! $this->lemmas->contains($lemma)) {
322
+        if ( ! $this->lemmas->contains($lemma)) {
323 323
             $this->lemmas[] = $lemma;
324 324
             $lemma->addType($this);
325 325
         }
Please login to merge, or discard this patch.