@@ -11,7 +11,7 @@ |
||
11 | 11 | protected function setUp() { |
12 | 12 | parent::setUp(); |
13 | 13 | if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'mysql') { |
14 | - $this->markTestSkipped('The ' . __CLASS__ .' requires the use of mysql.'); |
|
14 | + $this->markTestSkipped('The '.__CLASS__.' requires the use of mysql.'); |
|
15 | 15 | } |
16 | 16 | } |
17 | 17 |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $iter = $paginator->getIterator(); |
131 | 131 | $this->assertCount(9, $iter); |
132 | 132 | $result = iterator_to_array($iter); |
133 | - $this->assertEquals($checkField . "0", $result[0]->$checkField); |
|
133 | + $this->assertEquals($checkField."0", $result[0]->$checkField); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | private function iterateWithOrderAscWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $iter = $paginator->getIterator(); |
147 | 147 | $this->assertCount(3, $iter); |
148 | 148 | $result = iterator_to_array($iter); |
149 | - $this->assertEquals($checkField . "0", $result[0]->$checkField); |
|
149 | + $this->assertEquals($checkField."0", $result[0]->$checkField); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | private function iterateWithOrderAscWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField) |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $iter = $paginator->getIterator(); |
163 | 163 | $this->assertCount(3, $iter); |
164 | 164 | $result = iterator_to_array($iter); |
165 | - $this->assertEquals($checkField . "3", $result[0]->$checkField); |
|
165 | + $this->assertEquals($checkField."3", $result[0]->$checkField); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | private function iterateWithOrderDesc($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField) |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $iter = $paginator->getIterator(); |
176 | 176 | $this->assertCount(9, $iter); |
177 | 177 | $result = iterator_to_array($iter); |
178 | - $this->assertEquals($checkField . "8", $result[0]->$checkField); |
|
178 | + $this->assertEquals($checkField."8", $result[0]->$checkField); |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | private function iterateWithOrderDescWithLimit($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField) |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $iter = $paginator->getIterator(); |
191 | 191 | $this->assertCount(3, $iter); |
192 | 192 | $result = iterator_to_array($iter); |
193 | - $this->assertEquals($checkField . "8", $result[0]->$checkField); |
|
193 | + $this->assertEquals($checkField."8", $result[0]->$checkField); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | private function iterateWithOrderDescWithLimitAndOffset($useOutputWalkers, $fetchJoinCollection, $baseDql, $checkField) |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $iter = $paginator->getIterator(); |
206 | 206 | $this->assertCount(3, $iter); |
207 | 207 | $result = iterator_to_array($iter); |
208 | - $this->assertEquals($checkField . "5", $result[0]->$checkField); |
|
208 | + $this->assertEquals($checkField."5", $result[0]->$checkField); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | /** |
@@ -478,8 +478,8 @@ discard block |
||
478 | 478 | public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBoth($useOutputWalkers) |
479 | 479 | { |
480 | 480 | $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name'; |
481 | - $dqlAsc = $dql . " ASC, d.name"; |
|
482 | - $dqlDesc = $dql . " DESC, d.name"; |
|
481 | + $dqlAsc = $dql." ASC, d.name"; |
|
482 | + $dqlDesc = $dql." DESC, d.name"; |
|
483 | 483 | $this->iterateWithOrderAsc($useOutputWalkers, true, $dqlAsc, "name"); |
484 | 484 | $this->iterateWithOrderDesc($useOutputWalkers, true, $dqlDesc, "name"); |
485 | 485 | } |
@@ -487,8 +487,8 @@ discard block |
||
487 | 487 | public function testIterateWithFetchJoinOneToManyWithOrderByColumnFromBothWithLimitWithOutputWalker() |
488 | 488 | { |
489 | 489 | $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name'; |
490 | - $dqlAsc = $dql . " ASC, d.name"; |
|
491 | - $dqlDesc = $dql . " DESC, d.name"; |
|
490 | + $dqlAsc = $dql." ASC, d.name"; |
|
491 | + $dqlDesc = $dql." DESC, d.name"; |
|
492 | 492 | $this->iterateWithOrderAscWithLimit(true, true, $dqlAsc, "name"); |
493 | 493 | $this->iterateWithOrderDescWithLimit(true, true, $dqlDesc, "name"); |
494 | 494 | } |
@@ -499,8 +499,8 @@ discard block |
||
499 | 499 | $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.'); |
500 | 500 | |
501 | 501 | $dql = 'SELECT c, d FROM Doctrine\Tests\Models\Pagination\Company c JOIN c.departments d ORDER BY c.name'; |
502 | - $dqlAsc = $dql . " ASC, d.name"; |
|
503 | - $dqlDesc = $dql . " DESC, d.name"; |
|
502 | + $dqlAsc = $dql." ASC, d.name"; |
|
503 | + $dqlDesc = $dql." DESC, d.name"; |
|
504 | 504 | $this->iterateWithOrderAscWithLimit(false, true, $dqlAsc, "name"); |
505 | 505 | $this->iterateWithOrderDescWithLimit(false, true, $dqlDesc, "name"); |
506 | 506 | } |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | $users = iterator_to_array($paginator->getIterator()); |
585 | 585 | $this->assertCount(9, $users); |
586 | 586 | foreach ($users as $i => $user) { |
587 | - $this->assertEquals("username" . (8 - $i), $user->username); |
|
587 | + $this->assertEquals("username".(8 - $i), $user->username); |
|
588 | 588 | } |
589 | 589 | } |
590 | 590 | |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | $groups = []; |
700 | 700 | for ($j = 0; $j < 3; $j++) {; |
701 | 701 | $group = new CmsGroup(); |
702 | - $group->id = new CustomIdObject('group' . $j); |
|
702 | + $group->id = new CustomIdObject('group'.$j); |
|
703 | 703 | $group->name = "group$j"; |
704 | 704 | $groups[] = $group; |
705 | 705 | $this->_em->persist($group); |
@@ -707,10 +707,10 @@ discard block |
||
707 | 707 | |
708 | 708 | for ($i = 0; $i < 9; $i++) { |
709 | 709 | $email = new CmsEmail(); |
710 | - $email->id = new CustomIdObject('email' . $i); |
|
710 | + $email->id = new CustomIdObject('email'.$i); |
|
711 | 711 | |
712 | 712 | $user = new CmsUser(); |
713 | - $user->id = new CustomIdObject('user' . $i); |
|
713 | + $user->id = new CustomIdObject('user'.$i); |
|
714 | 714 | $user->name = "Name$i"; |
715 | 715 | $user->username = "username$i"; |
716 | 716 | $user->status = "active"; |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | $this->_em->persist($user); |
724 | 724 | for ($j = 0; $j < $i + 1; $j++) { |
725 | 725 | $article = new CmsArticle(); |
726 | - $article->id = new CustomIdObject('article' . $j . "_user" . $i); |
|
726 | + $article->id = new CustomIdObject('article'.$j."_user".$i); |
|
727 | 727 | $article->topic = "topic$i$j"; |
728 | 728 | $article->text = "text$i$j"; |
729 | 729 | $article->setAuthor($user); |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | $company->logo->image_width = 100 + $i; |
741 | 741 | $company->logo->image_height = 100 + $i; |
742 | 742 | $company->logo->company = $company; |
743 | - for($j=0;$j<3;$j++) { |
|
743 | + for ($j = 0; $j < 3; $j++) { |
|
744 | 744 | $department = new Department(); |
745 | 745 | $department->name = "name$i$j"; |
746 | 746 | $department->company = $company; |