Completed
Pull Request — master (#7046)
by Gabriel
12:09
created
tests/Doctrine/Tests/Models/Cache/Traveler.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\Models\Cache;
6 6
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
      */
96 96
     public function addTravel(Travel $item)
97 97
     {
98
-        if (! $this->travels->contains($item)) {
98
+        if ( ! $this->travels->contains($item)) {
99 99
             $this->travels->add($item);
100 100
         }
101 101
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Models/ManyToManyPersister/ParentClass.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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\Models\ManyToManyPersister;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/Models/CMS/CmsComment.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\Models\CMS;
6 6
 
@@ -39,6 +39,6 @@  discard block
 block discarded – undo
39 39
 
40 40
     public function __toString()
41 41
     {
42
-        return __CLASS__ . '[id=' . $this->id . ']';
42
+        return __CLASS__.'[id='.$this->id.']';
43 43
     }
44 44
 }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/OrmTestCase.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;
6 6
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     {
67 67
         $reader = new Annotations\CachedReader(new Annotations\AnnotationReader(), new ArrayCache());
68 68
 
69
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php');
69
+        Annotations\AnnotationRegistry::registerFile(__DIR__.'/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php');
70 70
 
71 71
         return new AnnotationDriver($reader, (array) $paths);
72 72
     }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
106 106
         $config->setMetadataDriverImpl(
107 107
             $config->newDefaultAnnotationDriver([
108
-                realpath(__DIR__ . '/Models/Cache'),
108
+                realpath(__DIR__.'/Models/Cache'),
109 109
             ])
110 110
         );
111 111
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php 1 patch
Spacing   +9 added lines, -9 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\Performance;
6 6
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $size         = 500;
134 134
         $startPersist = microtime(true);
135 135
 
136
-        echo PHP_EOL . $label;
136
+        echo PHP_EOL.$label;
137 137
 
138 138
         for ($i = 0; $i < $size; $i++) {
139 139
             $em->persist(new Country("Country $i"));
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
         $startPersist = microtime(true);
168 168
         $country      = new Country('Country');
169 169
 
170
-        echo PHP_EOL . $label;
170
+        echo PHP_EOL.$label;
171 171
 
172 172
         $em->persist($country);
173 173
         $em->flush();
@@ -197,9 +197,9 @@  discard block
 block discarded – undo
197 197
         $em->flush();
198 198
         $em->clear();
199 199
 
200
-        printf("\n[%s] persist %s states and %s cities", number_format( microtime(true) - $startPersist, 6), count($states), count($cities));
200
+        printf("\n[%s] persist %s states and %s cities", number_format(microtime(true) - $startPersist, 6), count($states), count($cities));
201 201
 
202
-        $startFind  = microtime(true);
202
+        $startFind = microtime(true);
203 203
 
204 204
         for ($i = 0; $i < $times; $i++) {
205 205
             foreach ($states as $state) {
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         $countries    = [];
223 223
         $startPersist = microtime(true);
224 224
 
225
-        echo PHP_EOL . $label;
225
+        echo PHP_EOL.$label;
226 226
 
227 227
         for ($i = 0; $i < $size; $i++) {
228 228
             $country = new Country("Country $i");
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
239 239
 
240
-        $startFind  = microtime(true);
240
+        $startFind = microtime(true);
241 241
 
242 242
         for ($i = 0; $i <= $times; $i++) {
243 243
             foreach ($countries as $country) {
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
         $startPersist = microtime(true);
258 258
         $rep          = $em->getRepository(Country::class);
259 259
 
260
-        echo PHP_EOL . $label;
260
+        echo PHP_EOL.$label;
261 261
 
262 262
         for ($i = 0; $i < $size; $i++) {
263 263
             $em->persist(new Country("Country $i"));
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
270 270
 
271
-        $startFind  = microtime(true);
271
+        $startFind = microtime(true);
272 272
 
273 273
         for ($i = 0; $i <= $times; $i++) {
274 274
             $list = $rep->findAll();
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php 1 patch
Spacing   +7 added lines, -7 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
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         try {
43 43
             $sqlGenerated = $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker);
44 44
         } catch (\Exception $e) {
45
-            $this->fail($e->getMessage() . ' at "' . $e->getFile() . '" on line ' . $e->getLine());
45
+            $this->fail($e->getMessage().' at "'.$e->getFile().'" on line '.$e->getLine());
46 46
         }
47 47
 
48 48
         self::assertEquals($sqlToBeConfirmed, $sqlGenerated);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
             $condExpr = $whereClause->conditionalExpression;
142 142
 
143 143
             // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression
144
-            if (! ($condExpr instanceof Query\AST\ConditionalExpression)) {
144
+            if ( ! ($condExpr instanceof Query\AST\ConditionalExpression)) {
145 145
                 $condExpr = new Query\AST\ConditionalExpression([$condExpr]);
146 146
 
147 147
                 $whereClause->conditionalExpression = $condExpr;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
                 $singleTerm = $selectStatement->whereClause->conditionalExpression->conditionalTerms[0];
165 165
 
166 166
                 // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression
167
-                if (! ($singleTerm instanceof Query\AST\ConditionalTerm)) {
167
+                if ( ! ($singleTerm instanceof Query\AST\ConditionalTerm)) {
168 168
                     $singleTerm = new Query\AST\ConditionalTerm([$singleTerm]);
169 169
 
170 170
                     $selectStatement->whereClause->conditionalExpression->conditionalTerms[0] = $singleTerm;
@@ -202,9 +202,9 @@  discard block
 block discarded – undo
202 202
     {
203 203
         $rangeVariableDecl       = $identificationVariableDecl->rangeVariableDeclaration;
204 204
         $joinAssocPathExpression = new Query\AST\JoinAssociationPathExpression($rangeVariableDecl->aliasIdentificationVariable, 'address');
205
-        $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null);
205
+        $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable.'a', null);
206 206
         $join                    = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration);
207
-        $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false);
207
+        $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable.'a', null, false);
208 208
 
209 209
         $identificationVariableDecl->joins[]                = $join;
210 210
         $selectStatement->selectClause->selectExpressions[] = $selectExpression;
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
         $userMetadata    = $entityManager->getClassMetadata(CmsUser::class);
214 214
         $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class);
215 215
 
216
-        $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a',
216
+        $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable.'a',
217 217
             [
218 218
                 'metadata'     => $addressMetadata,
219 219
                 'parent'       => $rangeVariableDecl->aliasIdentificationVariable,
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php 1 patch
Spacing   +8 added lines, -8 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
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
             $query->free();
66 66
         } catch (\Exception $e) {
67
-            $this->fail($e->getMessage() . "\n" . $e->getTraceAsString());
67
+            $this->fail($e->getMessage()."\n".$e->getTraceAsString());
68 68
         }
69 69
 
70 70
         self::assertEquals($sqlToBeConfirmed, $sqlGenerated);
@@ -1618,7 +1618,7 @@  discard block
 block discarded – undo
1618 1618
     public function testAliasDoesNotExceedPlatformDefinedLength()
1619 1619
     {
1620 1620
         $this->assertSqlGeneration(
1621
-            'SELECT m FROM ' . __NAMESPACE__ . '\\DDC1384Model m',
1621
+            'SELECT m FROM '.__NAMESPACE__.'\\DDC1384Model m',
1622 1622
             'SELECT t0."aVeryLongIdentifierThatShouldBeShortenedByTheSQLWalker_fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" AS c0 FROM "DDC1384Model" t0'
1623 1623
         );
1624 1624
     }
@@ -1651,12 +1651,12 @@  discard block
 block discarded – undo
1651 1651
     public function testSelectWithArithmeticExpressionBeforeField()
1652 1652
     {
1653 1653
         $this->assertSqlGeneration(
1654
-            'SELECT - e.value AS value, e.id FROM ' . __NAMESPACE__ . '\DDC1474Entity e',
1654
+            'SELECT - e.value AS value, e.id FROM '.__NAMESPACE__.'\DDC1474Entity e',
1655 1655
             'SELECT -t0."value" AS c0, t0."id" AS c1 FROM "DDC1474Entity" t0'
1656 1656
         );
1657 1657
 
1658 1658
         $this->assertSqlGeneration(
1659
-            'SELECT e.id, + e.value AS value FROM ' . __NAMESPACE__ . '\DDC1474Entity e',
1659
+            'SELECT e.id, + e.value AS value FROM '.__NAMESPACE__.'\DDC1474Entity e',
1660 1660
             'SELECT t0."id" AS c0, +t0."value" AS c1 FROM "DDC1474Entity" t0'
1661 1661
         );
1662 1662
     }
@@ -2333,8 +2333,8 @@  discard block
 block discarded – undo
2333 2333
     public function testHavingRegressionUsingVariableWithMathOperatorsExpression($operator)
2334 2334
     {
2335 2335
         $this->assertSqlGeneration(
2336
-            'SELECT COUNT(u.name) AS countName FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING 1 ' . $operator . ' countName > 0',
2337
-            'SELECT COUNT(t0."name") AS c0 FROM "cms_users" t0 HAVING 1 ' . $operator . ' c0 > 0'
2336
+            'SELECT COUNT(u.name) AS countName FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING 1 '.$operator.' countName > 0',
2337
+            'SELECT COUNT(t0."name") AS c0 FROM "cms_users" t0 HAVING 1 '.$operator.' c0 > 0'
2338 2338
         );
2339 2339
     }
2340 2340
 
@@ -2356,7 +2356,7 @@  discard block
 block discarded – undo
2356 2356
      */
2357 2357
     public function getSql(SqlWalker $sqlWalker)
2358 2358
     {
2359
-        return 'ABS(' . $sqlWalker->walkSimpleArithmeticExpression($this->simpleArithmeticExpression) . ')';
2359
+        return 'ABS('.$sqlWalker->walkSimpleArithmeticExpression($this->simpleArithmeticExpression).')';
2360 2360
     }
2361 2361
 
2362 2362
     /**
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php 1 patch
Spacing   +9 added lines, -9 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
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
             $this->addToAssertionCount(1);
31 31
         } catch (QueryException $e) {
32 32
             if ($debug) {
33
-                echo $e->getTraceAsString() . PHP_EOL;
33
+                echo $e->getTraceAsString().PHP_EOL;
34 34
             }
35 35
 
36 36
             $this->fail($e->getMessage());
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
             $this->fail('No syntax errors were detected, when syntax errors were expected');
46 46
         } catch (QueryException $e) {
47 47
             if ($debug) {
48
-                echo $e->getMessage() . PHP_EOL;
49
-                echo $e->getTraceAsString() . PHP_EOL;
48
+                echo $e->getMessage().PHP_EOL;
49
+                echo $e->getTraceAsString().PHP_EOL;
50 50
             }
51 51
             $this->addToAssertionCount(1);
52 52
         }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'],
109 109
 
110 110
             /* Checks for invalid AbstractSchemaName */
111
-            ['SELECT u FROM UnknownClass u'],  // unknown
111
+            ['SELECT u FROM UnknownClass u'], // unknown
112 112
             ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash
113 113
             ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\)
114 114
             ['SELECT u FROM Unknown\Class\ u'], // unknown, syntactically bogus (trailing \)
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
      */
575 575
     public function testDQLKeywordInJoinIsAllowed()
576 576
     {
577
-        self::assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g');
577
+        self::assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g');
578 578
     }
579 579
 
580 580
     /**
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
      */
583 583
     public function testDQLKeywordInConditionIsAllowed()
584 584
     {
585
-        self::assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0');
585
+        self::assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0');
586 586
     }
587 587
 
588 588
     /* The exception is currently thrown in the SQLWalker, not earlier.
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
      */
688 688
     public function testNewLiteralExpression()
689 689
     {
690
-        self::assertValidDQL('SELECT new ' . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
690
+        self::assertValidDQL('SELECT new '.__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
691 691
     }
692 692
 
693 693
     /**
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
      */
696 696
     public function testNewLiteralWithSubselectExpression()
697 697
     {
698
-        self::assertValidDQL('SELECT new ' . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
698
+        self::assertValidDQL('SELECT new '.__NAMESPACE__."\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
699 699
     }
700 700
 }
701 701
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Query/QueryTest.php 1 patch
Spacing   +8 added lines, -8 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
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
             9 => 'St Julien',
167 167
         ];
168 168
 
169
-        $query  = $this->em
169
+        $query = $this->em
170 170
                 ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)")
171 171
                 ->setParameter('cities', $cities);
172 172
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      */
183 183
     public function testProcessParameterValueClassMetadata()
184 184
     {
185
-        $query  = $this->em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
185
+        $query = $this->em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
186 186
         self::assertEquals(
187 187
             CmsAddress::class,
188 188
             $query->processParameterValue($this->em->getClassMetadata(CmsAddress::class))
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
      */
316 316
     public function testGetParameterTypeJuggling() : void
317 317
     {
318
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id = ?0');
318
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id = ?0');
319 319
 
320 320
         $query->setParameter(0, 0);
321 321
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
      */
330 330
     public function testSetParameterWithNameZeroIsNotOverridden() : void
331 331
     {
332
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
332
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
333 333
 
334 334
         $query->setParameter(0, 0);
335 335
         $query->setParameter('name', 'Doctrine');
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
      */
345 345
     public function testSetParameterWithNameZeroDoesNotOverrideAnotherParameter() : void
346 346
     {
347
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
347
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
348 348
 
349 349
         $query->setParameter('name', 'Doctrine');
350 350
         $query->setParameter(0, 0);
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
      */
360 360
     public function testSetParameterWithTypeJugglingWorks() : void
361 361
     {
362
-        $query = $this->em->createQuery('select u from ' . CmsUser::class . ' u where u.id != ?0 and u.username = :name');
362
+        $query = $this->em->createQuery('select u from '.CmsUser::class.' u where u.id != ?0 and u.username = :name');
363 363
 
364 364
         $query->setParameter('0', 1);
365 365
         $query->setParameter('name', 'Doctrine');
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
     {
380 380
         $this->em->getConfiguration()->setResultCacheImpl(new ArrayCache());
381 381
 
382
-        $query = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u');
382
+        $query = $this->em->createQuery('SELECT u FROM '.CmsUser::class.' u');
383 383
         $query->useResultCache(true);
384 384
         $query->setResultCacheProfile();
385 385
 
Please login to merge, or discard this patch.