@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | 'empty string, single field' => [$emptyString, ''], |
426 | 426 | 'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id], |
427 | 427 | 'empty strings, two fields' => [$emptyStrings, ' '], |
428 | - 'non-empty strings, two fields' => [$nonEmptyStrings, $nonEmptyStrings->id1 . ' ' . $nonEmptyStrings->id2], |
|
428 | + 'non-empty strings, two fields' => [$nonEmptyStrings, $nonEmptyStrings->id1.' '.$nonEmptyStrings->id2], |
|
429 | 429 | 'boolean true' => [$booleanTrue, '1'], |
430 | 430 | 'boolean false' => [$booleanFalse, ''], |
431 | 431 | ]; |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | |
457 | 457 | public function entitiesWithInvalidIdentifiersProvider() |
458 | 458 | { |
459 | - $firstNullString = new EntityWithCompositeStringIdentifier(); |
|
459 | + $firstNullString = new EntityWithCompositeStringIdentifier(); |
|
460 | 460 | |
461 | 461 | $firstNullString->id2 = uniqid('id2', true); |
462 | 462 | |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | ->eventManager |
516 | 516 | ->expects(self::any()) |
517 | 517 | ->method('hasListeners') |
518 | - ->willReturnCallback(function ($eventName) { |
|
518 | + ->willReturnCallback(function($eventName) { |
|
519 | 519 | return $eventName === Events::prePersist; |
520 | 520 | }); |
521 | 521 | $this |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | ->method('dispatchEvent') |
525 | 525 | ->with( |
526 | 526 | self::anything(), |
527 | - self::callback(function (LifecycleEventArgs $args) use ($entity, $generatedFieldValue) { |
|
527 | + self::callback(function(LifecycleEventArgs $args) use ($entity, $generatedFieldValue) { |
|
528 | 528 | /* @var $object EntityWithRandomlyGeneratedField */ |
529 | 529 | $object = $args->getObject(); |
530 | 530 | |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | ->eventManager |
565 | 565 | ->expects(self::any()) |
566 | 566 | ->method('hasListeners') |
567 | - ->willReturnCallback(function ($eventName) { |
|
567 | + ->willReturnCallback(function($eventName) { |
|
568 | 568 | return $eventName === Events::prePersist; |
569 | 569 | }); |
570 | 570 | $this->eventManager->expects(self::never())->method('dispatchEvent'); |
@@ -17,8 +17,8 @@ |
||
17 | 17 | |
18 | 18 | $output = $this->createMock(OutputInterface::class); |
19 | 19 | $output->expects($this->once()) |
20 | - ->method('writeln') |
|
21 | - ->with($this->equalTo('No Metadata Classes to process.')); |
|
20 | + ->method('writeln') |
|
21 | + ->with($this->equalTo('No Metadata Classes to process.')); |
|
22 | 22 | |
23 | 23 | $command->convertDoctrine1Schema([], sys_get_temp_dir(), 'annotation', 4, null, $output); |
24 | 24 | } |
@@ -30,8 +30,8 @@ |
||
30 | 30 | public function testCmsModelSet(string $path) |
31 | 31 | { |
32 | 32 | $this->em->getConfiguration() |
33 | - ->getMetadataDriverImpl() |
|
34 | - ->addPaths([$path]); |
|
33 | + ->getMetadataDriverImpl() |
|
34 | + ->addPaths([$path]); |
|
35 | 35 | |
36 | 36 | self::assertEmpty($this->validator->validateMapping()); |
37 | 37 | } |
@@ -39,12 +39,12 @@ discard block |
||
39 | 39 | public function modelSetProvider(): array |
40 | 40 | { |
41 | 41 | return [ |
42 | - 'cms' => [__DIR__ . '/../../Models/CMS'], |
|
43 | - 'company' => [__DIR__ . '/../../Models/Company'], |
|
44 | - 'ecommerce' => [__DIR__ . '/../../Models/ECommerce'], |
|
45 | - 'forum' => [__DIR__ . '/../../Models/Forum'], |
|
46 | - 'navigation' => [__DIR__ . '/../../Models/Navigation'], |
|
47 | - 'routing' => [__DIR__ . '/../../Models/Routing'], |
|
42 | + 'cms' => [__DIR__.'/../../Models/CMS'], |
|
43 | + 'company' => [__DIR__.'/../../Models/Company'], |
|
44 | + 'ecommerce' => [__DIR__.'/../../Models/ECommerce'], |
|
45 | + 'forum' => [__DIR__.'/../../Models/Forum'], |
|
46 | + 'navigation' => [__DIR__.'/../../Models/Navigation'], |
|
47 | + 'routing' => [__DIR__.'/../../Models/Routing'], |
|
48 | 48 | ]; |
49 | 49 | } |
50 | 50 | |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | |
125 | 125 | $this->assertEquals( |
126 | 126 | [ |
127 | - "The field Doctrine\Tests\ORM\Tools\DDC3274One#two is on the inverse side of a bi-directional " . |
|
128 | - "relationship, but the specified mappedBy association on the target-entity " . |
|
127 | + "The field Doctrine\Tests\ORM\Tools\DDC3274One#two is on the inverse side of a bi-directional ". |
|
128 | + "relationship, but the specified mappedBy association on the target-entity ". |
|
129 | 129 | "Doctrine\Tests\ORM\Tools\DDC3274Two#one does not contain the required 'inversedBy=\"two\"' attribute." |
130 | 130 | ], |
131 | 131 | $ce |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $this->assertEquals( |
144 | 144 | [ |
145 | - "The association Doctrine\Tests\ORM\Tools\DDC3322One#invalidAssoc is ordered by a foreign field " . |
|
145 | + "The association Doctrine\Tests\ORM\Tools\DDC3322One#invalidAssoc is ordered by a foreign field ". |
|
146 | 146 | "invalidField that is not a field on the target entity Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1." |
147 | 147 | ], |
148 | 148 | $ce |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | $this->assertEquals( |
161 | 161 | [ |
162 | - "The association Doctrine\Tests\ORM\Tools\DDC3322Two#invalidAssoc is ordered by a field oneToMany " . |
|
162 | + "The association Doctrine\Tests\ORM\Tools\DDC3322Two#invalidAssoc is ordered by a field oneToMany ". |
|
163 | 163 | "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is a collection-valued association." |
164 | 164 | ], |
165 | 165 | $ce |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | $this->assertEquals( |
178 | 178 | [ |
179 | - "The association Doctrine\Tests\ORM\Tools\DDC3322Three#invalidAssoc is ordered by a field oneToOneInverse " . |
|
179 | + "The association Doctrine\Tests\ORM\Tools\DDC3322Three#invalidAssoc is ordered by a field oneToOneInverse ". |
|
180 | 180 | "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is the inverse side of an association." |
181 | 181 | ], |
182 | 182 | $ce |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $loaders = spl_autoload_functions(); |
38 | 38 | $numberOfLoaders = count($loaders); |
39 | 39 | for ($i = 0; $i < $numberOfLoaders; $i++) { |
40 | - if ($i > $this->originalAutoloaderCount+1) { |
|
40 | + if ($i > $this->originalAutoloaderCount + 1) { |
|
41 | 41 | spl_autoload_unregister($loaders[$i]); |
42 | 42 | } |
43 | 43 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | public function testDirectoryAutoload() |
47 | 47 | { |
48 | - Setup::registerAutoloadDirectory(__DIR__ . "/../../../../../vendor/doctrine/common/lib"); |
|
48 | + Setup::registerAutoloadDirectory(__DIR__."/../../../../../vendor/doctrine/common/lib"); |
|
49 | 49 | |
50 | 50 | $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions())); |
51 | 51 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function setUp() |
33 | 33 | { |
34 | 34 | $this->_namespace = uniqid('doctrine_'); |
35 | - $this->_tmpDir = \sys_get_temp_dir() . DIRECTORY_SEPARATOR . $this->_namespace; |
|
35 | + $this->_tmpDir = \sys_get_temp_dir().DIRECTORY_SEPARATOR.$this->_namespace; |
|
36 | 36 | \mkdir($this->_tmpDir); |
37 | 37 | |
38 | 38 | $this->_generator = new EntityGenerator(); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $em = $this->_getTestEntityManager(); |
79 | 79 | $ns = $this->_namespace; |
80 | 80 | |
81 | - $className = $ns . '\DDC3231User1Tmp'; |
|
81 | + $className = $ns.'\DDC3231User1Tmp'; |
|
82 | 82 | $this->writeEntityClass(DDC3231User1::class, $className); |
83 | 83 | |
84 | 84 | $rpath = $this->writeRepositoryClass($className); |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | $repo = new \ReflectionClass($em->getRepository($className)); |
91 | 91 | |
92 | 92 | $this->assertTrue($repo->inNamespace()); |
93 | - $this->assertSame($className . 'Repository', $repo->getName()); |
|
93 | + $this->assertSame($className.'Repository', $repo->getName()); |
|
94 | 94 | $this->assertSame(EntityRepository::class, $repo->getParentClass()->getName()); |
95 | 95 | |
96 | - require_once __DIR__ . '/../../Models/DDC3231/DDC3231User1NoNamespace.php'; |
|
96 | + require_once __DIR__.'/../../Models/DDC3231/DDC3231User1NoNamespace.php'; |
|
97 | 97 | |
98 | 98 | $className2 = 'DDC3231User1NoNamespaceTmp'; |
99 | 99 | $this->writeEntityClass(\DDC3231User1NoNamespace::class, $className2); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $repo2 = new \ReflectionClass($em->getRepository($className2)); |
108 | 108 | |
109 | 109 | $this->assertFalse($repo2->inNamespace()); |
110 | - $this->assertSame($className2 . 'Repository', $repo2->getName()); |
|
110 | + $this->assertSame($className2.'Repository', $repo2->getName()); |
|
111 | 111 | $this->assertSame(EntityRepository::class, $repo2->getParentClass()->getName()); |
112 | 112 | } |
113 | 113 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $em = $this->_getTestEntityManager(); |
120 | 120 | $ns = $this->_namespace; |
121 | 121 | |
122 | - $className = $ns . '\DDC3231User2Tmp'; |
|
122 | + $className = $ns.'\DDC3231User2Tmp'; |
|
123 | 123 | $this->writeEntityClass(DDC3231User2::class, $className); |
124 | 124 | |
125 | 125 | $rpath = $this->writeRepositoryClass($className, DDC3231EntityRepository::class); |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | $repo = new \ReflectionClass($em->getRepository($className)); |
133 | 133 | |
134 | 134 | $this->assertTrue($repo->inNamespace()); |
135 | - $this->assertSame($className . 'Repository', $repo->getName()); |
|
135 | + $this->assertSame($className.'Repository', $repo->getName()); |
|
136 | 136 | $this->assertSame(DDC3231EntityRepository::class, $repo->getParentClass()->getName()); |
137 | 137 | |
138 | 138 | |
139 | - require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2NoNamespace.php'; |
|
139 | + require_once __DIR__.'/../../Models/DDC3231/DDC3231User2NoNamespace.php'; |
|
140 | 140 | |
141 | 141 | $className2 = 'DDC3231User2NoNamespaceTmp'; |
142 | 142 | $this->writeEntityClass('DDC3231User2NoNamespace', $className2); |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $repo2 = new \ReflectionClass($em->getRepository($className2)); |
152 | 152 | |
153 | 153 | $this->assertFalse($repo2->inNamespace()); |
154 | - $this->assertSame($className2 . 'Repository', $repo2->getName()); |
|
154 | + $this->assertSame($className2.'Repository', $repo2->getName()); |
|
155 | 155 | $this->assertSame(DDC3231EntityRepository::class, $repo2->getParentClass()->getName()); |
156 | 156 | } |
157 | 157 | |
@@ -169,11 +169,11 @@ discard block |
||
169 | 169 | $metadata = $cmf->getMetadataFor($className); |
170 | 170 | $metadata->namespace = $this->_namespace; |
171 | 171 | $metadata->name = $newClassName; |
172 | - $metadata->customRepositoryClassName = $newClassName . "Repository"; |
|
172 | + $metadata->customRepositoryClassName = $newClassName."Repository"; |
|
173 | 173 | |
174 | 174 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
175 | 175 | |
176 | - require $this->_tmpDir . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $newClassName) . ".php"; |
|
176 | + require $this->_tmpDir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $newClassName).".php"; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | /** |
@@ -185,9 +185,9 @@ discard block |
||
185 | 185 | { |
186 | 186 | $this->_repositoryGenerator->setDefaultRepositoryName($defaultRepository); |
187 | 187 | |
188 | - $this->_repositoryGenerator->writeEntityRepositoryClass($className . 'Repository', $this->_tmpDir); |
|
188 | + $this->_repositoryGenerator->writeEntityRepositoryClass($className.'Repository', $this->_tmpDir); |
|
189 | 189 | |
190 | - return $this->_tmpDir . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className) . 'Repository.php'; |
|
190 | + return $this->_tmpDir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $className).'Repository.php'; |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | protected function _getType() |
18 | 18 | { |
19 | - if (!class_exists('Symfony\Component\Yaml\Yaml', true)) { |
|
19 | + if ( ! class_exists('Symfony\Component\Yaml\Yaml', true)) { |
|
20 | 20 | $this->markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.'); |
21 | 21 | } |
22 | 22 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | $driverMock = new DriverMock(); |
32 | 32 | $config = new Configuration(); |
33 | - $config->setProxyDir(__DIR__ . '/../../Proxies'); |
|
33 | + $config->setProxyDir(__DIR__.'/../../Proxies'); |
|
34 | 34 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
35 | 35 | $eventManager = new EventManager(); |
36 | 36 | $conn = new ConnectionMock([], $driverMock, $config, $eventManager); |
@@ -46,17 +46,17 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | $cme = new ClassMetadataExporter(); |
49 | - $converter = new ConvertDoctrine1Schema(__DIR__ . '/doctrine1schema'); |
|
49 | + $converter = new ConvertDoctrine1Schema(__DIR__.'/doctrine1schema'); |
|
50 | 50 | |
51 | - $exporter = $cme->getExporter('yml', __DIR__ . '/convert'); |
|
51 | + $exporter = $cme->getExporter('yml', __DIR__.'/convert'); |
|
52 | 52 | $exporter->setOverwriteExistingFiles(true); |
53 | 53 | $exporter->setMetadata($converter->getMetadata()); |
54 | 54 | $exporter->export(); |
55 | 55 | |
56 | - $this->assertTrue(file_exists(__DIR__ . '/convert/User.dcm.yml')); |
|
57 | - $this->assertTrue(file_exists(__DIR__ . '/convert/Profile.dcm.yml')); |
|
56 | + $this->assertTrue(file_exists(__DIR__.'/convert/User.dcm.yml')); |
|
57 | + $this->assertTrue(file_exists(__DIR__.'/convert/Profile.dcm.yml')); |
|
58 | 58 | |
59 | - $metadataDriver = new YamlDriver(__DIR__ . '/convert'); |
|
59 | + $metadataDriver = new YamlDriver(__DIR__.'/convert'); |
|
60 | 60 | $em = $this->_createEntityManager($metadataDriver); |
61 | 61 | $cmf = new DisconnectedClassMetadataFactory(); |
62 | 62 | $cmf->setEntityManager($em); |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | |
82 | 82 | public function tearDown() |
83 | 83 | { |
84 | - @unlink(__DIR__ . '/convert/User.dcm.yml'); |
|
85 | - @unlink(__DIR__ . '/convert/Profile.dcm.yml'); |
|
86 | - @rmdir(__DIR__ . '/convert'); |
|
84 | + @unlink(__DIR__.'/convert/User.dcm.yml'); |
|
85 | + @unlink(__DIR__.'/convert/Profile.dcm.yml'); |
|
86 | + @rmdir(__DIR__.'/convert'); |
|
87 | 87 | } |
88 | 88 | } |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
540 | 540 | |
541 | 541 | $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
542 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
542 | + . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
543 | 543 | |
544 | 544 | $this->assertFileExists($filename); |
545 | 545 | require_once $filename; |
@@ -600,9 +600,9 @@ discard block |
||
600 | 600 | |
601 | 601 | } |
602 | 602 | |
603 | - /** |
|
604 | - * @group DDC-2172 |
|
605 | - */ |
|
603 | + /** |
|
604 | + * @group DDC-2172 |
|
605 | + */ |
|
606 | 606 | public function testGetInheritanceTypeString() |
607 | 607 | { |
608 | 608 | $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadataInfo'); |
@@ -630,8 +630,8 @@ discard block |
||
630 | 630 | } |
631 | 631 | |
632 | 632 | /** |
633 | - * @group DDC-2172 |
|
634 | - */ |
|
633 | + * @group DDC-2172 |
|
634 | + */ |
|
635 | 635 | public function testGetChangeTrackingPolicyString() |
636 | 636 | { |
637 | 637 | $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadata'); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | { |
30 | 30 | $this->_namespace = uniqid("doctrine_"); |
31 | 31 | $this->_tmpDir = \sys_get_temp_dir(); |
32 | - \mkdir($this->_tmpDir . \DIRECTORY_SEPARATOR . $this->_namespace); |
|
32 | + \mkdir($this->_tmpDir.\DIRECTORY_SEPARATOR.$this->_namespace); |
|
33 | 33 | $this->_generator = new EntityGenerator(); |
34 | 34 | $this->_generator->setAnnotationPrefix(""); |
35 | 35 | $this->_generator->setGenerateAnnotations(true); |
@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | |
42 | 42 | public function tearDown() |
43 | 43 | { |
44 | - $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir . '/' . $this->_namespace)); |
|
44 | + $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir.'/'.$this->_namespace)); |
|
45 | 45 | foreach ($ri AS $file) { |
46 | 46 | /* @var $file \SplFileInfo */ |
47 | 47 | if ($file->isFile()) { |
48 | 48 | \unlink($file->getPathname()); |
49 | 49 | } |
50 | 50 | } |
51 | - rmdir($this->_tmpDir . '/' . $this->_namespace); |
|
51 | + rmdir($this->_tmpDir.'/'.$this->_namespace); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** @after */ |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function generateBookEntityFixture(array $embeddedClasses = []) |
66 | 66 | { |
67 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook'); |
|
67 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook'); |
|
68 | 68 | $metadata->namespace = $this->_namespace; |
69 | - $metadata->customRepositoryClassName = $this->_namespace . '\EntityGeneratorBookRepository'; |
|
69 | + $metadata->customRepositoryClassName = $this->_namespace.'\EntityGeneratorBookRepository'; |
|
70 | 70 | |
71 | 71 | $metadata->table['name'] = 'book'; |
72 | 72 | $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']]; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | private function generateEntityTypeFixture(array $field) |
110 | 110 | { |
111 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityType'); |
|
111 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityType'); |
|
112 | 112 | $metadata->namespace = $this->_namespace; |
113 | 113 | |
114 | 114 | $metadata->table['name'] = 'entity_type'; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null) |
131 | 131 | { |
132 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn'); |
|
132 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorIsbn'); |
|
133 | 133 | $metadata->namespace = $this->_namespace; |
134 | 134 | $metadata->isEmbeddedClass = true; |
135 | 135 | $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | private function generateTestEmbeddableFixture() |
154 | 154 | { |
155 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable'); |
|
155 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorTestEmbeddable'); |
|
156 | 156 | $metadata->namespace = $this->_namespace; |
157 | 157 | $metadata->isEmbeddedClass = true; |
158 | 158 | $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']); |
@@ -195,11 +195,11 @@ discard block |
||
195 | 195 | foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) { |
196 | 196 | $classMetadata->mapEmbedded( |
197 | 197 | [ |
198 | - 'fieldName' => $fieldName . '.' . $property, |
|
198 | + 'fieldName' => $fieldName.'.'.$property, |
|
199 | 199 | 'class' => $embeddableClass['class'], |
200 | 200 | 'columnPrefix' => $embeddableClass['columnPrefix'], |
201 | 201 | 'declaredField' => $embeddableClass['declaredField'] |
202 | - ? $fieldName . '.' . $embeddableClass['declaredField'] |
|
202 | + ? $fieldName.'.'.$embeddableClass['declaredField'] |
|
203 | 203 | : $fieldName, |
204 | 204 | 'originalField' => $embeddableClass['originalField'] ?: $property, |
205 | 205 | ] |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | private function loadEntityClass(ClassMetadataInfo $metadata) |
214 | 214 | { |
215 | 215 | $className = basename(str_replace('\\', '/', $metadata->name)); |
216 | - $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php'; |
|
216 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php'; |
|
217 | 217 | |
218 | 218 | $this->assertFileExists($path); |
219 | 219 | |
@@ -273,19 +273,19 @@ discard block |
||
273 | 273 | |
274 | 274 | $book = $this->newInstance($metadata); |
275 | 275 | $this->assertTrue(class_exists($metadata->name), "Class does not exist."); |
276 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing."); |
|
277 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing."); |
|
278 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing."); |
|
279 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing."); |
|
280 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing."); |
|
281 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing."); |
|
282 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing."); |
|
283 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing."); |
|
284 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing."); |
|
285 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing."); |
|
286 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing."); |
|
287 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing."); |
|
288 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing."); |
|
276 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing."); |
|
277 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing."); |
|
278 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing."); |
|
279 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing."); |
|
280 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing."); |
|
281 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing."); |
|
282 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing."); |
|
283 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing."); |
|
284 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing."); |
|
285 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing."); |
|
286 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing."); |
|
287 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing."); |
|
288 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing."); |
|
289 | 289 | |
290 | 290 | $reflClass = new \ReflectionClass($metadata->name); |
291 | 291 | |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | |
339 | 339 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
340 | 340 | |
341 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~"); |
|
341 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~"); |
|
342 | 342 | |
343 | 343 | $book = $this->newInstance($metadata); |
344 | 344 | $reflClass = new \ReflectionClass($metadata->name); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | // Should not throw a PHP fatal error |
384 | 384 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
385 | 385 | |
386 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~"); |
|
386 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~"); |
|
387 | 387 | |
388 | 388 | $this->newInstance($metadata); |
389 | 389 | $reflClass = new \ReflectionClass($metadata->name); |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | $this->assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor')); |
419 | 419 | $this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor')); |
420 | 420 | |
421 | - $expectedClassName = '\\' . $embeddedMetadata->name; |
|
421 | + $expectedClassName = '\\'.$embeddedMetadata->name; |
|
422 | 422 | $this->assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn')); |
423 | 423 | $this->assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn')); |
424 | 424 | $this->assertPhpDocParamType($expectedClassName, new \ReflectionMethod($book, 'setIsbn')); |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | */ |
529 | 529 | public function testMappedSuperclassAnnotationGeneration() |
530 | 530 | { |
531 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook'); |
|
531 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook'); |
|
532 | 532 | $metadata->namespace = $this->_namespace; |
533 | 533 | $metadata->isMappedSuperclass = true; |
534 | 534 | |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | */ |
567 | 567 | public function testGenerateEntityWithSequenceGenerator() |
568 | 568 | { |
569 | - $metadata = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity'); |
|
569 | + $metadata = new ClassMetadataInfo($this->_namespace.'\DDC1784Entity'); |
|
570 | 570 | $metadata->namespace = $this->_namespace; |
571 | 571 | $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); |
572 | 572 | $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); |
@@ -579,8 +579,8 @@ discard block |
||
579 | 579 | ); |
580 | 580 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
581 | 581 | |
582 | - $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
|
583 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
582 | + $filename = $this->_tmpDir.DIRECTORY_SEPARATOR |
|
583 | + . $this->_namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php'; |
|
584 | 584 | |
585 | 585 | $this->assertFileExists($filename); |
586 | 586 | require_once $filename; |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | */ |
601 | 601 | public function testGenerateEntityWithMultipleInverseJoinColumns() |
602 | 602 | { |
603 | - $metadata = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity'); |
|
603 | + $metadata = new ClassMetadataInfo($this->_namespace.'\DDC2079Entity'); |
|
604 | 604 | $metadata->namespace = $this->_namespace; |
605 | 605 | $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); |
606 | 606 | $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); |
@@ -611,20 +611,20 @@ discard block |
||
611 | 611 | 'joinTable' => [ |
612 | 612 | 'name' => 'unidade_centro_custo', |
613 | 613 | 'joinColumns' => [ |
614 | - ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'], |
|
615 | - ['name' => 'idunidade', 'referencedColumnName' => 'idunidade'] |
|
614 | + ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'], |
|
615 | + ['name' => 'idunidade', 'referencedColumnName' => 'idunidade'] |
|
616 | 616 | ], |
617 | 617 | 'inverseJoinColumns' => [ |
618 | - ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'], |
|
619 | - ['name' => 'idpais', 'referencedColumnName' => 'idpais'], |
|
618 | + ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'], |
|
619 | + ['name' => 'idpais', 'referencedColumnName' => 'idpais'], |
|
620 | 620 | ], |
621 | 621 | ], |
622 | 622 | ] |
623 | 623 | ); |
624 | 624 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
625 | 625 | |
626 | - $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
|
627 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php'; |
|
626 | + $filename = $this->_tmpDir.DIRECTORY_SEPARATOR |
|
627 | + . $this->_namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php'; |
|
628 | 628 | |
629 | 629 | $this->assertFileExists($filename); |
630 | 630 | require_once $filename; |
@@ -654,7 +654,7 @@ discard block |
||
654 | 654 | $method->setAccessible(true); |
655 | 655 | |
656 | 656 | foreach ($constants as $name => $value) { |
657 | - if( ! preg_match($pattern, $name)) { |
|
657 | + if ( ! preg_match($pattern, $name)) { |
|
658 | 658 | continue; |
659 | 659 | } |
660 | 660 | |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | $method->setAccessible(true); |
684 | 684 | |
685 | 685 | foreach ($constants as $name => $value) { |
686 | - if( ! preg_match($pattern, $name)) { |
|
686 | + if ( ! preg_match($pattern, $name)) { |
|
687 | 687 | continue; |
688 | 688 | } |
689 | 689 | |
@@ -712,7 +712,7 @@ discard block |
||
712 | 712 | $method->setAccessible(true); |
713 | 713 | |
714 | 714 | foreach ($constants as $name => $value) { |
715 | - if( ! preg_match($pattern, $name)) { |
|
715 | + if ( ! preg_match($pattern, $name)) { |
|
716 | 716 | continue; |
717 | 717 | } |
718 | 718 | |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | public function testEntityTypeAlias(array $field) |
737 | 737 | { |
738 | 738 | $metadata = $this->generateEntityTypeFixture($field); |
739 | - $path = $this->_tmpDir . '/'. $this->_namespace . '/EntityType.php'; |
|
739 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/EntityType.php'; |
|
740 | 740 | |
741 | 741 | $this->assertFileExists($path); |
742 | 742 | require_once $path; |
@@ -747,8 +747,8 @@ discard block |
||
747 | 747 | $type = $field['phpType']; |
748 | 748 | $name = $field['fieldName']; |
749 | 749 | $value = $field['value']; |
750 | - $getter = "get" . ucfirst($name); |
|
751 | - $setter = "set" . ucfirst($name); |
|
750 | + $getter = "get".ucfirst($name); |
|
751 | + $setter = "set".ucfirst($name); |
|
752 | 752 | |
753 | 753 | $this->assertPhpDocVarType($type, $reflClass->getProperty($name)); |
754 | 754 | $this->assertPhpDocParamType($type, $reflClass->getMethod($setter)); |
@@ -769,13 +769,13 @@ discard block |
||
769 | 769 | |
770 | 770 | $user = new DDC2372User(); |
771 | 771 | $metadata = $cmf->getMetadataFor(get_class($user)); |
772 | - $metadata->name = $this->_namespace . "\DDC2372User"; |
|
772 | + $metadata->name = $this->_namespace."\DDC2372User"; |
|
773 | 773 | $metadata->namespace = $this->_namespace; |
774 | 774 | |
775 | 775 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
776 | 776 | |
777 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php"); |
|
778 | - require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php"; |
|
777 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372User.php"); |
|
778 | + require $this->_tmpDir."/".$this->_namespace."/DDC2372User.php"; |
|
779 | 779 | |
780 | 780 | $reflClass = new \ReflectionClass($metadata->name); |
781 | 781 | |
@@ -795,13 +795,13 @@ discard block |
||
795 | 795 | |
796 | 796 | $user = new DDC2372Admin(); |
797 | 797 | $metadata = $cmf->getMetadataFor(get_class($user)); |
798 | - $metadata->name = $this->_namespace . "\DDC2372Admin"; |
|
798 | + $metadata->name = $this->_namespace."\DDC2372Admin"; |
|
799 | 799 | $metadata->namespace = $this->_namespace; |
800 | 800 | |
801 | 801 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
802 | 802 | |
803 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php"); |
|
804 | - require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php"; |
|
803 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php"); |
|
804 | + require $this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php"; |
|
805 | 805 | |
806 | 806 | $reflClass = new \ReflectionClass($metadata->name); |
807 | 807 | |
@@ -821,20 +821,20 @@ discard block |
||
821 | 821 | $cmf->setEntityManager($em); |
822 | 822 | |
823 | 823 | $ns = $this->_namespace; |
824 | - $nsdir = $this->_tmpDir . '/' . $ns; |
|
824 | + $nsdir = $this->_tmpDir.'/'.$ns; |
|
825 | 825 | |
826 | 826 | $content = str_replace( |
827 | 827 | 'namespace Doctrine\Tests\Models\DDC1590', |
828 | - 'namespace ' . $ns, |
|
829 | - file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php') |
|
828 | + 'namespace '.$ns, |
|
829 | + file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php') |
|
830 | 830 | ); |
831 | 831 | |
832 | - $fname = $nsdir . "/DDC1590User.php"; |
|
832 | + $fname = $nsdir."/DDC1590User.php"; |
|
833 | 833 | file_put_contents($fname, $content); |
834 | 834 | require $fname; |
835 | 835 | |
836 | 836 | |
837 | - $metadata = $cmf->getMetadataFor($ns . '\DDC1590User'); |
|
837 | + $metadata = $cmf->getMetadataFor($ns.'\DDC1590User'); |
|
838 | 838 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
839 | 839 | |
840 | 840 | // class DDC1590User extends DDC1590Entity { ... } |
@@ -842,13 +842,13 @@ discard block |
||
842 | 842 | |
843 | 843 | // class _DDC1590User extends DDC1590Entity { ... } |
844 | 844 | $source2 = str_replace('class DDC1590User', 'class _DDC1590User', $source); |
845 | - $fname2 = $nsdir . "/_DDC1590User.php"; |
|
845 | + $fname2 = $nsdir."/_DDC1590User.php"; |
|
846 | 846 | file_put_contents($fname2, $source2); |
847 | 847 | require $fname2; |
848 | 848 | |
849 | 849 | // class __DDC1590User { ... } |
850 | 850 | $source3 = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source); |
851 | - $fname3 = $nsdir . "/__DDC1590User.php"; |
|
851 | + $fname3 = $nsdir."/__DDC1590User.php"; |
|
852 | 852 | file_put_contents($fname3, $source3); |
853 | 853 | require $fname3; |
854 | 854 | |
@@ -1002,7 +1002,7 @@ discard block |
||
1002 | 1002 | $this->loadEntityClass($metadata); |
1003 | 1003 | |
1004 | 1004 | $className = basename(str_replace('\\', '/', $metadata->name)); |
1005 | - $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php'; |
|
1005 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php'; |
|
1006 | 1006 | $classTest = file_get_contents($path); |
1007 | 1007 | |
1008 | 1008 | $this->_generator->setRegenerateEntityIfExists(true); |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
1012 | 1012 | $classNew = file_get_contents($path); |
1013 | 1013 | |
1014 | - $this->assertSame($classTest,$classNew); |
|
1014 | + $this->assertSame($classTest, $classNew); |
|
1015 | 1015 | } |
1016 | 1016 | |
1017 | 1017 | /** |
@@ -1198,14 +1198,14 @@ discard block |
||
1198 | 1198 | */ |
1199 | 1199 | public function testOptionsAreGeneratedProperly(string $expectedAnnotation, array $fieldConfiguration) : void |
1200 | 1200 | { |
1201 | - $metadata = new ClassMetadataInfo($this->_namespace . '\GH6703Options'); |
|
1201 | + $metadata = new ClassMetadataInfo($this->_namespace.'\GH6703Options'); |
|
1202 | 1202 | $metadata->namespace = $this->_namespace; |
1203 | 1203 | $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); |
1204 | 1204 | $metadata->mapField(['fieldName' => 'test'] + $fieldConfiguration); |
1205 | 1205 | $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); |
1206 | 1206 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
1207 | 1207 | |
1208 | - $filename = $this->_tmpDir . DIRECTORY_SEPARATOR . $this->_namespace . DIRECTORY_SEPARATOR . 'GH6703Options.php'; |
|
1208 | + $filename = $this->_tmpDir.DIRECTORY_SEPARATOR.$this->_namespace.DIRECTORY_SEPARATOR.'GH6703Options.php'; |
|
1209 | 1209 | |
1210 | 1210 | self::assertFileExists($filename); |
1211 | 1211 | require_once $filename; |
@@ -72,7 +72,7 @@ |
||
72 | 72 | /** |
73 | 73 | * Arbitrary Join |
74 | 74 | */ |
75 | - public function testLimitSubqueryWithArbitraryJoin() |
|
75 | + public function testLimitSubqueryWithArbitraryJoin() |
|
76 | 76 | { |
77 | 77 | $dql = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'; |
78 | 78 | $query = $this->entityManager->createQuery($dql); |