@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | { |
| 127 | 127 | $metadata->setPrimaryTable( |
| 128 | 128 | [ |
| 129 | - 'name' => 'company_person', |
|
| 129 | + 'name' => 'company_person', |
|
| 130 | 130 | ] |
| 131 | 131 | ); |
| 132 | 132 | |
@@ -191,18 +191,18 @@ discard block |
||
| 191 | 191 | 'entities' => [ |
| 192 | 192 | [ |
| 193 | 193 | 'fields' => [ |
| 194 | - [ |
|
| 194 | + [ |
|
| 195 | 195 | 'name' => 'id', |
| 196 | 196 | 'column' => 'id', |
| 197 | - ], |
|
| 198 | - [ |
|
| 197 | + ], |
|
| 198 | + [ |
|
| 199 | 199 | 'name' => 'city', |
| 200 | 200 | 'column' => 'city', |
| 201 | - ], |
|
| 202 | - [ |
|
| 201 | + ], |
|
| 202 | + [ |
|
| 203 | 203 | 'name' => 'country', |
| 204 | 204 | 'column' => 'country', |
| 205 | - ], |
|
| 205 | + ], |
|
| 206 | 206 | ], |
| 207 | 207 | 'entityClass' => CmsAddress::class, |
| 208 | 208 | ], |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | { |
| 275 | 275 | $metadata->setPrimaryTable( |
| 276 | 276 | [ |
| 277 | - 'name' => 'cms_users_customid', |
|
| 277 | + 'name' => 'cms_users_customid', |
|
| 278 | 278 | ] |
| 279 | 279 | ); |
| 280 | 280 | |
@@ -333,34 +333,34 @@ discard block |
||
| 333 | 333 | 'entities' => [ |
| 334 | 334 | [ |
| 335 | 335 | 'fields'=> [ |
| 336 | - [ |
|
| 336 | + [ |
|
| 337 | 337 | 'name' => 'id', |
| 338 | 338 | 'column' => 'id', |
| 339 | - ], |
|
| 340 | - [ |
|
| 339 | + ], |
|
| 340 | + [ |
|
| 341 | 341 | 'name' => 'name', |
| 342 | 342 | 'column' => 'name', |
| 343 | - ], |
|
| 344 | - [ |
|
| 343 | + ], |
|
| 344 | + [ |
|
| 345 | 345 | 'name' => 'status', |
| 346 | 346 | 'column' => 'status', |
| 347 | - ], |
|
| 348 | - [ |
|
| 347 | + ], |
|
| 348 | + [ |
|
| 349 | 349 | 'name' => 'address.zip', |
| 350 | 350 | 'column' => 'zip', |
| 351 | - ], |
|
| 352 | - [ |
|
| 351 | + ], |
|
| 352 | + [ |
|
| 353 | 353 | 'name' => 'address.city', |
| 354 | 354 | 'column' => 'city', |
| 355 | - ], |
|
| 356 | - [ |
|
| 355 | + ], |
|
| 356 | + [ |
|
| 357 | 357 | 'name' => 'address.country', |
| 358 | 358 | 'column' => 'country', |
| 359 | - ], |
|
| 360 | - [ |
|
| 359 | + ], |
|
| 360 | + [ |
|
| 361 | 361 | 'name' => 'address.id', |
| 362 | 362 | 'column' => 'a_id', |
| 363 | - ], |
|
| 363 | + ], |
|
| 364 | 364 | ], |
| 365 | 365 | 'entityClass' => CmsUser::class, |
| 366 | 366 | 'discriminatorColumn' => null |
@@ -376,22 +376,22 @@ discard block |
||
| 376 | 376 | 'entities' => [ |
| 377 | 377 | [ |
| 378 | 378 | 'fields'=> [ |
| 379 | - [ |
|
| 379 | + [ |
|
| 380 | 380 | 'name' => 'id', |
| 381 | 381 | 'column' => 'id', |
| 382 | - ], |
|
| 383 | - [ |
|
| 382 | + ], |
|
| 383 | + [ |
|
| 384 | 384 | 'name' => 'name', |
| 385 | 385 | 'column' => 'name', |
| 386 | - ], |
|
| 387 | - [ |
|
| 386 | + ], |
|
| 387 | + [ |
|
| 388 | 388 | 'name' => 'status', |
| 389 | 389 | 'column' => 'status', |
| 390 | - ], |
|
| 391 | - [ |
|
| 390 | + ], |
|
| 391 | + [ |
|
| 392 | 392 | 'name' => 'phonenumbers.phonenumber', |
| 393 | 393 | 'column' => 'number', |
| 394 | - ], |
|
| 394 | + ], |
|
| 395 | 395 | ], |
| 396 | 396 | 'entityClass' => CmsUser::class, |
| 397 | 397 | 'discriminatorColumn' => null |
@@ -405,29 +405,29 @@ discard block |
||
| 405 | 405 | 'name' => 'mappingUserPhonenumberCount', |
| 406 | 406 | 'columns' => [], |
| 407 | 407 | 'entities' => [ |
| 408 | - [ |
|
| 408 | + [ |
|
| 409 | 409 | 'fields' => [ |
| 410 | - [ |
|
| 410 | + [ |
|
| 411 | 411 | 'name' => 'id', |
| 412 | 412 | 'column' => 'id', |
| 413 | - ], |
|
| 414 | - [ |
|
| 413 | + ], |
|
| 414 | + [ |
|
| 415 | 415 | 'name' => 'name', |
| 416 | 416 | 'column' => 'name', |
| 417 | - ], |
|
| 418 | - [ |
|
| 417 | + ], |
|
| 418 | + [ |
|
| 419 | 419 | 'name' => 'status', |
| 420 | 420 | 'column' => 'status', |
| 421 | - ] |
|
| 421 | + ] |
|
| 422 | 422 | ], |
| 423 | 423 | 'entityClass' => CmsUser::class, |
| 424 | 424 | 'discriminatorColumn' => null |
| 425 | - ] |
|
| 425 | + ] |
|
| 426 | 426 | ], |
| 427 | 427 | 'columns' => [ |
| 428 | - [ |
|
| 428 | + [ |
|
| 429 | 429 | 'name' => 'numphones', |
| 430 | - ] |
|
| 430 | + ] |
|
| 431 | 431 | ] |
| 432 | 432 | ] |
| 433 | 433 | ); |
@@ -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; |