@@ -173,6 +173,10 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | public $phones; |
| 175 | 175 | |
| 176 | + /** |
|
| 177 | + * @param string $email |
|
| 178 | + * @param string $name |
|
| 179 | + */ |
|
| 176 | 180 | public function __construct($email, $name, array $numbers = []) |
| 177 | 181 | { |
| 178 | 182 | $this->name = $name; |
@@ -208,6 +212,9 @@ discard block |
||
| 208 | 212 | */ |
| 209 | 213 | public $user; |
| 210 | 214 | |
| 215 | + /** |
|
| 216 | + * @param DDC1335User $user |
|
| 217 | + */ |
|
| 211 | 218 | public function __construct($user, $number) |
| 212 | 219 | { |
| 213 | 220 | $this->user = $user; |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | ] |
| 19 | 19 | ); |
| 20 | 20 | $this->loadFixture(); |
| 21 | - } catch(\Exception $e) { |
|
| 21 | + } catch (\Exception $e) { |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | public function testDql() |
| 27 | 27 | { |
| 28 | - $dql = 'SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id'; |
|
| 28 | + $dql = 'SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.id'; |
|
| 29 | 29 | $query = $this->_em->createQuery($dql); |
| 30 | 30 | $result = $query->getResult(); |
| 31 | 31 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $this->assertArrayHasKey(2, $result); |
| 35 | 35 | $this->assertArrayHasKey(3, $result); |
| 36 | 36 | |
| 37 | - $dql = 'SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id'; |
|
| 37 | + $dql = 'SELECT u, p FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id'; |
|
| 38 | 38 | $query = $this->_em->createQuery($dql); |
| 39 | 39 | $result = $query->getResult(); |
| 40 | 40 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $this->assertArrayHasKey(1, $result); |
| 77 | 77 | $this->assertArrayHasKey(2, $result); |
| 78 | 78 | $this->assertArrayHasKey(3, $result); |
| 79 | - $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id', $dql); |
|
| 79 | + $this->assertEquals('SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.id', $dql); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function testIndexByUnique() |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | $this->assertArrayHasKey('[email protected]', $result); |
| 92 | 92 | $this->assertArrayHasKey('[email protected]', $result); |
| 93 | 93 | $this->assertArrayHasKey('[email protected]', $result); |
| 94 | - $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.email', $dql); |
|
| 94 | + $this->assertEquals('SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email', $dql); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | public function testIndexWithJoin() |
| 98 | 98 | { |
| 99 | 99 | $builder = $this->_em->createQueryBuilder(); |
| 100 | - $builder->select('u','p') |
|
| 100 | + $builder->select('u', 'p') |
|
| 101 | 101 | ->from(DDC1335User::class, 'u', 'u.email') |
| 102 | 102 | ->join('u.phones', 'p', null, null, 'p.id'); |
| 103 | 103 | |
@@ -125,18 +125,18 @@ discard block |
||
| 125 | 125 | $this->assertArrayHasKey(8, $result['[email protected]']->phones->toArray()); |
| 126 | 126 | $this->assertArrayHasKey(9, $result['[email protected]']->phones->toArray()); |
| 127 | 127 | |
| 128 | - $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql); |
|
| 128 | + $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | private function loadFixture() |
| 132 | 132 | { |
| 133 | - $p1 = ['11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz']; |
|
| 134 | - $p2 = ['22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz']; |
|
| 135 | - $p3 = ['33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz']; |
|
| 133 | + $p1 = ['11 xxxx-xxxx', '11 yyyy-yyyy', '11 zzzz-zzzz']; |
|
| 134 | + $p2 = ['22 xxxx-xxxx', '22 yyyy-yyyy', '22 zzzz-zzzz']; |
|
| 135 | + $p3 = ['33 xxxx-xxxx', '33 yyyy-yyyy', '33 zzzz-zzzz']; |
|
| 136 | 136 | |
| 137 | - $u1 = new DDC1335User("[email protected]", "Foo",$p1); |
|
| 138 | - $u2 = new DDC1335User("[email protected]", "Bar",$p2); |
|
| 139 | - $u3 = new DDC1335User("[email protected]", "Foo Bar",$p3); |
|
| 137 | + $u1 = new DDC1335User("[email protected]", "Foo", $p1); |
|
| 138 | + $u2 = new DDC1335User("[email protected]", "Bar", $p2); |
|
| 139 | + $u3 = new DDC1335User("[email protected]", "Foo Bar", $p3); |
|
| 140 | 140 | |
| 141 | 141 | $this->_em->persist($u1); |
| 142 | 142 | $this->_em->persist($u2); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $this->phones = new \Doctrine\Common\Collections\ArrayCollection(); |
| 181 | 181 | |
| 182 | 182 | foreach ($numbers as $number) { |
| 183 | - $this->phones->add(new DDC1335Phone($this,$number)); |
|
| 183 | + $this->phones->add(new DDC1335Phone($this, $number)); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | public function __construct($user, $number) |
| 212 | 212 | { |
| 213 | - $this->user = $user; |
|
| 214 | - $this->numericalValue = $number; |
|
| 213 | + $this->user = $user; |
|
| 214 | + $this->numericalValue = $number; |
|
| 215 | 215 | } |
| 216 | 216 | } |
@@ -119,6 +119,10 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public $driverRides; |
| 121 | 121 | |
| 122 | + /** |
|
| 123 | + * @param integer $id |
|
| 124 | + * @param string $name |
|
| 125 | + */ |
|
| 122 | 126 | public function __construct($id, $name) |
| 123 | 127 | { |
| 124 | 128 | $this->driverRides = new ArrayCollection(); |
@@ -181,6 +185,10 @@ discard block |
||
| 181 | 185 | */ |
| 182 | 186 | public $carRides; |
| 183 | 187 | |
| 188 | + /** |
|
| 189 | + * @param string $brand |
|
| 190 | + * @param string $model |
|
| 191 | + */ |
|
| 184 | 192 | public function __construct($brand, $model) |
| 185 | 193 | { |
| 186 | 194 | $this->carRides = new ArrayCollection(); |
@@ -227,6 +227,9 @@ discard block |
||
| 227 | 227 | $this->assertEquals([], $metadata); |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | + /** |
|
| 231 | + * @param \PHPUnit_Framework_MockObject_MockObject $conn |
|
| 232 | + */ |
|
| 230 | 233 | protected function _createEntityManager($metadataDriver, $conn = null) |
| 231 | 234 | { |
| 232 | 235 | $driverMock = new DriverMock(); |
@@ -255,7 +258,6 @@ discard block |
||
| 255 | 258 | } |
| 256 | 259 | |
| 257 | 260 | /** |
| 258 | - * @param string $class |
|
| 259 | 261 | * @return ClassMetadata |
| 260 | 262 | */ |
| 261 | 263 | protected function _createValidClassMetadata() |
@@ -469,6 +471,10 @@ discard block |
||
| 469 | 471 | return $this->mockMetadata[$className]; |
| 470 | 472 | } |
| 471 | 473 | |
| 474 | + /** |
|
| 475 | + * @param string $className |
|
| 476 | + * @param ClassMetadata $metadata |
|
| 477 | + */ |
|
| 472 | 478 | public function setMetadataForClass($className, $metadata) |
| 473 | 479 | { |
| 474 | 480 | $this->mockMetadata[$className] = $metadata; |
@@ -131,13 +131,13 @@ discard block |
||
| 131 | 131 | $cmf = new ClassMetadataFactory(); |
| 132 | 132 | $driver = $this->createMock(MappingDriver::class); |
| 133 | 133 | $driver->expects($this->at(0)) |
| 134 | - ->method('isTransient') |
|
| 135 | - ->with($this->equalTo(CmsUser::class)) |
|
| 136 | - ->will($this->returnValue(true)); |
|
| 134 | + ->method('isTransient') |
|
| 135 | + ->with($this->equalTo(CmsUser::class)) |
|
| 136 | + ->will($this->returnValue(true)); |
|
| 137 | 137 | $driver->expects($this->at(1)) |
| 138 | - ->method('isTransient') |
|
| 139 | - ->with($this->equalTo(CmsArticle::class)) |
|
| 140 | - ->will($this->returnValue(false)); |
|
| 138 | + ->method('isTransient') |
|
| 139 | + ->with($this->equalTo(CmsArticle::class)) |
|
| 140 | + ->will($this->returnValue(false)); |
|
| 141 | 141 | |
| 142 | 142 | $em = $this->_createEntityManager($driver); |
| 143 | 143 | |
@@ -153,13 +153,13 @@ discard block |
||
| 153 | 153 | $cmf = new ClassMetadataFactory(); |
| 154 | 154 | $driver = $this->createMock(MappingDriver::class); |
| 155 | 155 | $driver->expects($this->at(0)) |
| 156 | - ->method('isTransient') |
|
| 157 | - ->with($this->equalTo(CmsUser::class)) |
|
| 158 | - ->will($this->returnValue(true)); |
|
| 156 | + ->method('isTransient') |
|
| 157 | + ->with($this->equalTo(CmsUser::class)) |
|
| 158 | + ->will($this->returnValue(true)); |
|
| 159 | 159 | $driver->expects($this->at(1)) |
| 160 | - ->method('isTransient') |
|
| 161 | - ->with($this->equalTo(CmsArticle::class)) |
|
| 162 | - ->will($this->returnValue(false)); |
|
| 160 | + ->method('isTransient') |
|
| 161 | + ->with($this->equalTo(CmsArticle::class)) |
|
| 162 | + ->will($this->returnValue(false)); |
|
| 163 | 163 | |
| 164 | 164 | $em = $this->_createEntityManager($driver); |
| 165 | 165 | $em->getConfiguration()->addEntityNamespace('CMS', 'Doctrine\Tests\Models\CMS'); |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | /** |
| 286 | - * @group DDC-1845 |
|
| 287 | - */ |
|
| 286 | + * @group DDC-1845 |
|
| 287 | + */ |
|
| 288 | 288 | public function testQuoteMetadata() |
| 289 | 289 | { |
| 290 | 290 | $cmf = new ClassMetadataFactory(); |
@@ -108,15 +108,15 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php"; |
| 110 | 110 | |
| 111 | - $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']); |
|
| 111 | + $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']); |
|
| 112 | 112 | |
| 113 | 113 | $entityManager = $this->_createEntityManager($metadataDriver); |
| 114 | 114 | |
| 115 | 115 | $mf = $entityManager->getMetadataFactory(); |
| 116 | 116 | $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class); |
| 117 | 117 | $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class); |
| 118 | - $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class); |
|
| 119 | - $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class); |
|
| 118 | + $h2 = $mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class); |
|
| 119 | + $m2 = $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class); |
|
| 120 | 120 | |
| 121 | 121 | $this->assertNotSame($m1, $m2); |
| 122 | 122 | $this->assertFalse($h2); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | public function testAddDefaultDiscriminatorMap() |
| 172 | 172 | { |
| 173 | 173 | $cmf = new ClassMetadataFactory(); |
| 174 | - $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']); |
|
| 174 | + $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/JoinedInheritanceType/']); |
|
| 175 | 175 | $em = $this->_createEntityManager($driver); |
| 176 | 176 | $cmf->setEntityManager($em); |
| 177 | 177 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | { |
| 212 | 212 | // DDC-3551 |
| 213 | 213 | $conn = $this->createMock(Connection::class); |
| 214 | - $mockDriver = new MetadataDriverMock(); |
|
| 214 | + $mockDriver = new MetadataDriverMock(); |
|
| 215 | 215 | $em = $this->_createEntityManager($mockDriver, $conn); |
| 216 | 216 | |
| 217 | 217 | $conn->expects($this->any()) |
@@ -231,10 +231,10 @@ discard block |
||
| 231 | 231 | { |
| 232 | 232 | $driverMock = new DriverMock(); |
| 233 | 233 | $config = new Configuration(); |
| 234 | - $config->setProxyDir(__DIR__ . '/../../Proxies'); |
|
| 234 | + $config->setProxyDir(__DIR__.'/../../Proxies'); |
|
| 235 | 235 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
| 236 | 236 | $eventManager = new EventManager(); |
| 237 | - if (!$conn) { |
|
| 237 | + if ( ! $conn) { |
|
| 238 | 238 | $conn = new ConnectionMock([], $driverMock, $config, $eventManager); |
| 239 | 239 | } |
| 240 | 240 | $config->setMetadataDriverImpl($metadataDriver); |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | public function testQuoteMetadata() |
| 289 | 289 | { |
| 290 | 290 | $cmf = new ClassMetadataFactory(); |
| 291 | - $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']); |
|
| 291 | + $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/Quote/']); |
|
| 292 | 292 | $em = $this->_createEntityManager($driver); |
| 293 | 293 | $cmf->setEntityManager($em); |
| 294 | 294 | |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | $listener |
| 384 | 384 | ->expects($this->any()) |
| 385 | 385 | ->method('onClassMetadataNotFound') |
| 386 | - ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) { |
|
| 386 | + ->will($this->returnCallback(function(OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) { |
|
| 387 | 387 | $test->assertNull($args->getFoundMetadata()); |
| 388 | 388 | $test->assertSame('Foo', $args->getClassName()); |
| 389 | 389 | $test->assertSame($em, $args->getObjectManager()); |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | public function testInheritsIdGeneratorMappingFromEmbeddable() |
| 444 | 444 | { |
| 445 | 445 | $cmf = new ClassMetadataFactory(); |
| 446 | - $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']); |
|
| 446 | + $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/DDC4006/']); |
|
| 447 | 447 | $em = $this->_createEntityManager($driver); |
| 448 | 448 | $cmf->setEntityManager($em); |
| 449 | 449 | |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Doctrine\Instantiator\Instantiator; |
| 6 | 6 | use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty; |
| 7 | 7 | use Doctrine\Tests\Models\Generic\BooleanModel; |
| 8 | -use Doctrine\Tests\Models\Mapping\Entity; |
|
| 9 | 8 | use Doctrine\Tests\Models\Reflection\AbstractEmbeddable; |
| 10 | 9 | use Doctrine\Tests\Models\Reflection\ArrayObjectExtendingClass; |
| 11 | 10 | use Doctrine\Tests\Models\Reflection\ConcreteEmbeddable; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Doctrine\Tests\ORM\Performance; |
| 4 | 4 | |
| 5 | -use Doctrine\ORM\Query; |
|
| 6 | 5 | use Doctrine\Tests\Models\CMS\CmsUser; |
| 7 | 6 | use Doctrine\Tests\Models\CMS\CmsGroup; |
| 8 | 7 | use Doctrine\Tests\Models\CMS\CmsArticle; |
@@ -41,13 +41,13 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | $start = microtime(true); |
| 43 | 43 | $articles = $this->_em->getRepository(CmsArticle::class)->findAll(); |
| 44 | - echo "100 CmsArticle findAll(): " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 44 | + echo "100 CmsArticle findAll(): ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 45 | 45 | |
| 46 | 46 | $this->_em->clear(); |
| 47 | 47 | |
| 48 | 48 | $start = microtime(true); |
| 49 | 49 | $articles = $this->_em->getRepository(CmsArticle::class)->findAll(); |
| 50 | - echo "100 CmsArticle findAll(): " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 50 | + echo "100 CmsArticle findAll(): ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 51 | 51 | |
| 52 | 52 | $this->_em->clear(); |
| 53 | 53 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | for ($i = 0; $i < 100; $i++) { |
| 56 | 56 | $articles = $this->_em->getRepository(CmsArticle::class)->find($ids[$i]->id); |
| 57 | 57 | } |
| 58 | - echo "100 CmsArticle find(): " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 58 | + echo "100 CmsArticle find(): ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 59 | 59 | |
| 60 | 60 | $this->_em->clear(); |
| 61 | 61 | |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | for ($i = 0; $i < 100; $i++) { |
| 64 | 64 | $articles = $this->_em->getRepository(CmsArticle::class)->find($ids[$i]->id); |
| 65 | 65 | } |
| 66 | - echo "100 CmsArticle find(): " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 66 | + echo "100 CmsArticle find(): ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function testFindCmsGroup() |
| 70 | 70 | { |
| 71 | 71 | for ($i = 0; $i < 100; $i++) { |
| 72 | 72 | $group = new CmsGroup(); |
| 73 | - $group->name = "foo" . $i; |
|
| 73 | + $group->name = "foo".$i; |
|
| 74 | 74 | $this->_em->persist($group); |
| 75 | 75 | } |
| 76 | 76 | $this->_em->flush(); |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $start = microtime(true); |
| 80 | 80 | $articles = $this->_em->getRepository(CmsGroup::class)->findAll(); |
| 81 | - echo "100 CmsGroup: " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 81 | + echo "100 CmsGroup: ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 82 | 82 | |
| 83 | 83 | $this->_em->clear(); |
| 84 | 84 | |
| 85 | 85 | $start = microtime(true); |
| 86 | 86 | $articles = $this->_em->getRepository(CmsGroup::class)->findAll(); |
| 87 | - echo "100 CmsGroup: " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 87 | + echo "100 CmsGroup: ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | public function testFindCmsUser() |
@@ -102,12 +102,12 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $start = microtime(true); |
| 104 | 104 | $articles = $this->_em->getRepository(CmsUser::class)->findAll(); |
| 105 | - echo "100 CmsUser: " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 105 | + echo "100 CmsUser: ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 106 | 106 | |
| 107 | 107 | $this->_em->clear(); |
| 108 | 108 | |
| 109 | 109 | $start = microtime(true); |
| 110 | 110 | $articles = $this->_em->getRepository(CmsUser::class)->findAll(); |
| 111 | - echo "100 CmsUser: " . number_format(microtime(true) - $start, 6) . "\n"; |
|
| 111 | + echo "100 CmsUser: ".number_format(microtime(true) - $start, 6)."\n"; |
|
| 112 | 112 | } |
| 113 | 113 | } |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use Doctrine\DBAL\Types\Type as DBALType; |
| 8 | 8 | use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; |
| 9 | 9 | use Doctrine\Tests\Models\CustomType\CustomTypeChild; |
| 10 | -use Doctrine\Tests\Models\CustomType\CustomTypeFriend; |
|
| 11 | 10 | use Doctrine\Tests\Models\CustomType\CustomTypeParent; |
| 12 | 11 | use Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity; |
| 13 | 12 | use Doctrine\Tests\OrmTestCase; |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | $method = new \ReflectionMethod($this->_persister, 'getSelectConditionSQL'); |
| 85 | 85 | $method->setAccessible(true); |
| 86 | 86 | |
| 87 | - $sql = $method->invoke($this->_persister, ['customInteger' => 1, 'child' => 1]); |
|
| 87 | + $sql = $method->invoke($this->_persister, ['customInteger' => 1, 'child' => 1]); |
|
| 88 | 88 | |
| 89 | 89 | $this->assertEquals('t0.customInteger = ABS(?) AND t0.child_id = ?', $sql); |
| 90 | 90 | } |
@@ -38,6 +38,10 @@ |
||
| 38 | 38 | return $query->getSql(); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | + /** |
|
| 42 | + * @param string $dqlToBeTested |
|
| 43 | + * @param string $sqlToBeConfirmed |
|
| 44 | + */ |
|
| 41 | 45 | public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = [], $outputWalker = null) |
| 42 | 46 | { |
| 43 | 47 | try { |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | try { |
| 44 | 44 | $this->assertEquals($sqlToBeConfirmed, $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker)); |
| 45 | 45 | } catch (\Exception $e) { |
| 46 | - $this->fail($e->getMessage() . ' at "' . $e->getFile() . '" on line ' . $e->getLine()); |
|
| 46 | + $this->fail($e->getMessage().' at "'.$e->getFile().'" on line '.$e->getLine()); |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | $rangeVariableDecl = $identificationVariableDecl->rangeVariableDeclaration; |
| 203 | 203 | $joinAssocPathExpression = new Query\AST\JoinAssociationPathExpression($rangeVariableDecl->aliasIdentificationVariable, 'address'); |
| 204 | - $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null); |
|
| 204 | + $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable.'a', null); |
|
| 205 | 205 | $join = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration); |
| 206 | - $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false); |
|
| 206 | + $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable.'a', null, false); |
|
| 207 | 207 | |
| 208 | 208 | $identificationVariableDecl->joins[] = $join; |
| 209 | 209 | $selectStatement->selectClause->selectExpressions[] = $selectExpression; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $userMetadata = $entityManager->getClassMetadata(CmsUser::class); |
| 213 | 213 | $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class); |
| 214 | 214 | |
| 215 | - $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', |
|
| 215 | + $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable.'a', |
|
| 216 | 216 | [ |
| 217 | 217 | 'metadata' => $addressMetadata, |
| 218 | 218 | 'parent' => $rangeVariableDecl->aliasIdentificationVariable, |
@@ -43,6 +43,10 @@ |
||
| 43 | 43 | $this->_em = $this->_getTestEntityManager(); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | + /** |
|
| 47 | + * @param string $dqlToBeTested |
|
| 48 | + * @param string $sqlToBeConfirmed |
|
| 49 | + */ |
|
| 46 | 50 | public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed) |
| 47 | 51 | { |
| 48 | 52 | try { |
@@ -35,6 +35,9 @@ |
||
| 35 | 35 | $this->_em = $this->_getTestEntityManager(); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | + /** |
|
| 39 | + * @param string $expectedDql |
|
| 40 | + */ |
|
| 38 | 41 | protected function assertValidQueryBuilder(QueryBuilder $qb, $expectedDql) |
| 39 | 42 | { |
| 40 | 43 | $dql = $qb->getDQL(); |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | { |
| 273 | 273 | $qb = $this->_em->createQueryBuilder(); |
| 274 | 274 | $qb->select('u') |
| 275 | - ->from(CmsUser::class, 'u') |
|
| 276 | - ->where('u.id = :uid') |
|
| 277 | - ->orWhere('u.id = :uid2') |
|
| 278 | - ->andWhere('u.id = :uid3') |
|
| 279 | - ->orWhere('u.name = :name1', 'u.name = :name2') |
|
| 280 | - ->andWhere('u.name <> :noname'); |
|
| 275 | + ->from(CmsUser::class, 'u') |
|
| 276 | + ->where('u.id = :uid') |
|
| 277 | + ->orWhere('u.id = :uid2') |
|
| 278 | + ->andWhere('u.id = :uid3') |
|
| 279 | + ->orWhere('u.name = :name1', 'u.name = :name2') |
|
| 280 | + ->andWhere('u.name <> :noname'); |
|
| 281 | 281 | |
| 282 | 282 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (((u.id = :uid OR u.id = :uid2) AND u.id = :uid3) OR u.name = :name1 OR u.name = :name2) AND u.name <> :noname'); |
| 283 | 283 | } |
@@ -286,9 +286,9 @@ discard block |
||
| 286 | 286 | { |
| 287 | 287 | $qb = $this->_em->createQueryBuilder(); |
| 288 | 288 | $qb->select('u') |
| 289 | - ->from(CmsUser::class, 'u') |
|
| 290 | - ->where('u.id = :uid') |
|
| 291 | - ->andWhere($qb->expr()->in('u.id', [1, 2, 3])); |
|
| 289 | + ->from(CmsUser::class, 'u') |
|
| 290 | + ->where('u.id = :uid') |
|
| 291 | + ->andWhere($qb->expr()->in('u.id', [1, 2, 3])); |
|
| 292 | 292 | |
| 293 | 293 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id IN(1, 2, 3)'); |
| 294 | 294 | } |
@@ -297,9 +297,9 @@ discard block |
||
| 297 | 297 | { |
| 298 | 298 | $qb = $this->_em->createQueryBuilder(); |
| 299 | 299 | $qb->select('u') |
| 300 | - ->from(CmsUser::class, 'u') |
|
| 301 | - ->where('u.id = :uid') |
|
| 302 | - ->orWhere($qb->expr()->in('u.id', [1, 2, 3])); |
|
| 300 | + ->from(CmsUser::class, 'u') |
|
| 301 | + ->where('u.id = :uid') |
|
| 302 | + ->orWhere($qb->expr()->in('u.id', [1, 2, 3])); |
|
| 303 | 303 | |
| 304 | 304 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id IN(1, 2, 3)'); |
| 305 | 305 | } |
@@ -308,9 +308,9 @@ discard block |
||
| 308 | 308 | { |
| 309 | 309 | $qb = $this->_em->createQueryBuilder(); |
| 310 | 310 | $qb->select('u') |
| 311 | - ->from(CmsUser::class, 'u') |
|
| 312 | - ->where('u.id = :uid') |
|
| 313 | - ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3])); |
|
| 311 | + ->from(CmsUser::class, 'u') |
|
| 312 | + ->where('u.id = :uid') |
|
| 313 | + ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3])); |
|
| 314 | 314 | |
| 315 | 315 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id NOT IN(1, 2, 3)'); |
| 316 | 316 | } |
@@ -319,9 +319,9 @@ discard block |
||
| 319 | 319 | { |
| 320 | 320 | $qb = $this->_em->createQueryBuilder(); |
| 321 | 321 | $qb->select('u') |
| 322 | - ->from(CmsUser::class, 'u') |
|
| 323 | - ->where('u.id = :uid') |
|
| 324 | - ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3])); |
|
| 322 | + ->from(CmsUser::class, 'u') |
|
| 323 | + ->where('u.id = :uid') |
|
| 324 | + ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3])); |
|
| 325 | 325 | |
| 326 | 326 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id NOT IN(1, 2, 3)'); |
| 327 | 327 | } |
@@ -617,8 +617,8 @@ discard block |
||
| 617 | 617 | { |
| 618 | 618 | $qb = $this->_em->createQueryBuilder(); |
| 619 | 619 | $qb->select('u') |
| 620 | - ->from(CmsUser::class, 'u') |
|
| 621 | - ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2')); |
|
| 620 | + ->from(CmsUser::class, 'u') |
|
| 621 | + ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2')); |
|
| 622 | 622 | |
| 623 | 623 | $parameters = new ArrayCollection(); |
| 624 | 624 | $parameters->add(new Parameter('username', 'jwage')); |
@@ -634,8 +634,8 @@ discard block |
||
| 634 | 634 | { |
| 635 | 635 | $qb = $this->_em->createQueryBuilder(); |
| 636 | 636 | $qb->select('u') |
| 637 | - ->from(CmsUser::class, 'u') |
|
| 638 | - ->where('u.id = :id'); |
|
| 637 | + ->from(CmsUser::class, 'u') |
|
| 638 | + ->where('u.id = :id'); |
|
| 639 | 639 | |
| 640 | 640 | $parameters = new ArrayCollection(); |
| 641 | 641 | $parameters->add(new Parameter('id', 1)); |
@@ -684,8 +684,8 @@ discard block |
||
| 684 | 684 | { |
| 685 | 685 | $qb = $this->_em->createQueryBuilder(); |
| 686 | 686 | $qb->select('u') |
| 687 | - ->from(CmsUser::class, 'u') |
|
| 688 | - ->orWhere('u.id = :uid', $qb->expr()->eq('u.id', ':uid2')); |
|
| 687 | + ->from(CmsUser::class, 'u') |
|
| 688 | + ->orWhere('u.id = :uid', $qb->expr()->eq('u.id', ':uid2')); |
|
| 689 | 689 | |
| 690 | 690 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id = :uid2'); |
| 691 | 691 | } |
@@ -698,8 +698,8 @@ discard block |
||
| 698 | 698 | $orExpr->add($qb->expr()->in('u.id', [1])); |
| 699 | 699 | |
| 700 | 700 | $qb->select('u') |
| 701 | - ->from(CmsUser::class, 'u') |
|
| 702 | - ->where($orExpr); |
|
| 701 | + ->from(CmsUser::class, 'u') |
|
| 702 | + ->where($orExpr); |
|
| 703 | 703 | |
| 704 | 704 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR u.id IN(1)'); |
| 705 | 705 | } |
@@ -708,8 +708,8 @@ discard block |
||
| 708 | 708 | { |
| 709 | 709 | $qb = $this->_em->createQueryBuilder(); |
| 710 | 710 | $qb->select('u') |
| 711 | - ->from(CmsUser::class, 'u') |
|
| 712 | - ->where($qb->expr()->in('u.name', ['one', 'two', 'three'])); |
|
| 711 | + ->from(CmsUser::class, 'u') |
|
| 712 | + ->where($qb->expr()->in('u.name', ['one', 'two', 'three'])); |
|
| 713 | 713 | |
| 714 | 714 | $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); |
| 715 | 715 | |
@@ -723,8 +723,8 @@ discard block |
||
| 723 | 723 | $qb = $this->_em->createQueryBuilder(); |
| 724 | 724 | $expr = $this->_em->getExpressionBuilder(); |
| 725 | 725 | $qb->select('u') |
| 726 | - ->from(CmsUser::class, 'u') |
|
| 727 | - ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')])); |
|
| 726 | + ->from(CmsUser::class, 'u') |
|
| 727 | + ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')])); |
|
| 728 | 728 | |
| 729 | 729 | $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); |
| 730 | 730 | |
@@ -742,8 +742,8 @@ discard block |
||
| 742 | 742 | |
| 743 | 743 | $qb = $this->_em->createQueryBuilder(); |
| 744 | 744 | $qb->select('u') |
| 745 | - ->from(CmsUser::class, 'u') |
|
| 746 | - ->where($orExpr); |
|
| 745 | + ->from(CmsUser::class, 'u') |
|
| 746 | + ->where($orExpr); |
|
| 747 | 747 | |
| 748 | 748 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR NOT(u.id IN(1))'); |
| 749 | 749 | } |
@@ -754,8 +754,8 @@ discard block |
||
| 754 | 754 | $expr = $this->_em->getExpressionBuilder(); |
| 755 | 755 | |
| 756 | 756 | $qb->select('u') |
| 757 | - ->from(CmsUser::class, 'u') |
|
| 758 | - ->where($expr->gt('u.id', $expr->all('select a.id from Doctrine\Tests\Models\CMS\CmsArticle a'))); |
|
| 757 | + ->from(CmsUser::class, 'u') |
|
| 758 | + ->where($expr->gt('u.id', $expr->all('select a.id from Doctrine\Tests\Models\CMS\CmsArticle a'))); |
|
| 759 | 759 | |
| 760 | 760 | $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id > ALL(select a.id from Doctrine\Tests\Models\CMS\CmsArticle a)'); |
| 761 | 761 | |
@@ -1121,9 +1121,9 @@ discard block |
||
| 1121 | 1121 | public function testRebuildsFromParts() |
| 1122 | 1122 | { |
| 1123 | 1123 | $qb = $this->_em->createQueryBuilder() |
| 1124 | - ->select('u') |
|
| 1125 | - ->from(CmsUser::class, 'u') |
|
| 1126 | - ->join('u.article', 'a'); |
|
| 1124 | + ->select('u') |
|
| 1125 | + ->from(CmsUser::class, 'u') |
|
| 1126 | + ->join('u.article', 'a'); |
|
| 1127 | 1127 | |
| 1128 | 1128 | $dqlParts = $qb->getDQLParts(); |
| 1129 | 1129 | $dql = $qb->getDQL(); |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | $qb = $this->_em->createQueryBuilder(); |
| 548 | 548 | $qb->select('u') |
| 549 | 549 | ->from(CmsUser::class, 'u') |
| 550 | - ->join('u.article','a'); |
|
| 550 | + ->join('u.article', 'a'); |
|
| 551 | 551 | |
| 552 | 552 | $criteria = new Criteria(); |
| 553 | 553 | $criteria->orderBy(['a.field' => Criteria::DESC]); |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | ->from(CmsUser::class, 'u') |
| 825 | 825 | ->where('u.username = ?1')->orderBy('u.username'); |
| 826 | 826 | |
| 827 | - $this->assertEquals('u.username = ?1', (string)$qb->getDQLPart('where')); |
|
| 827 | + $this->assertEquals('u.username = ?1', (string) $qb->getDQLPart('where')); |
|
| 828 | 828 | $this->assertEquals(1, count($qb->getDQLPart('orderBy'))); |
| 829 | 829 | |
| 830 | 830 | $qb->resetDQLPart('where')->resetDQLPart('orderBy'); |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | { |
| 889 | 889 | $qb = $this->_em->createQueryBuilder(); |
| 890 | 890 | $qb->select('alias1')->from(CmsUser::class, 'alias1'); |
| 891 | - $qb->join('alias1.articles','alias2'); |
|
| 891 | + $qb->join('alias1.articles', 'alias2'); |
|
| 892 | 892 | |
| 893 | 893 | $criteria = new Criteria(); |
| 894 | 894 | $criteria->where($criteria->expr()->eq('field', 'value1')); |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | { |
| 909 | 909 | $qb = $this->_em->createQueryBuilder(); |
| 910 | 910 | $qb->select('alias1')->from(CmsUser::class, 'alias1'); |
| 911 | - $qb->join('alias1.articles','alias2'); |
|
| 911 | + $qb->join('alias1.articles', 'alias2'); |
|
| 912 | 912 | |
| 913 | 913 | $criteria = new Criteria(); |
| 914 | 914 | $criteria->where($criteria->expr()->eq('alias1.field', 'value1')); |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | { |
| 929 | 929 | $qb = $this->_em->createQueryBuilder(); |
| 930 | 930 | $qb->select('alias1')->from(CmsUser::class, 'alias1'); |
| 931 | - $qb->join('alias1.articles','alias2'); |
|
| 931 | + $qb->join('alias1.articles', 'alias2'); |
|
| 932 | 932 | |
| 933 | 933 | $criteria = new Criteria(); |
| 934 | 934 | $criteria->where($criteria->expr()->eq('alias1.field', 'value1')); |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | { |
| 1045 | 1045 | $qb = $this->_em->createQueryBuilder() |
| 1046 | 1046 | ->add('select', 'u') |
| 1047 | - ->add('from', CmsUser::class . ' u'); |
|
| 1047 | + ->add('from', CmsUser::class.' u'); |
|
| 1048 | 1048 | |
| 1049 | 1049 | $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL()); |
| 1050 | 1050 | } |