@@ -231,7 +231,7 @@ |
||
231 | 231 | */ |
232 | 232 | public function testLiteralExprProperlyQuotesStrings() |
233 | 233 | { |
234 | - $this->assertEquals("'00010001'", (string) $this->_expr->literal('00010001')); |
|
234 | + $this->assertEquals("'00010001'", (string) $this->_expr->literal('00010001')); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | public function testGreaterThanOrEqualToExpr() |
@@ -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, |
@@ -86,6 +86,6 @@ |
||
86 | 86 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
87 | 87 | { |
88 | 88 | // getParameter applies quoting automatically |
89 | - return $targetTableAlias . '.id = ' . $this->getParameter('id'); |
|
89 | + return $targetTableAlias.'.id = '.$this->getParameter('id'); |
|
90 | 90 | } |
91 | 91 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | $query->setDQL($dql); |
57 | 57 | |
58 | 58 | foreach ($hints as $key => $value) { |
59 | - $query->setHint($key, $value); |
|
59 | + $query->setHint($key, $value); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $parser = new Query\Parser($query); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $this->addToAssertionCount(1); |
28 | 28 | } catch (QueryException $e) { |
29 | 29 | if ($debug) { |
30 | - echo $e->getTraceAsString() . PHP_EOL; |
|
30 | + echo $e->getTraceAsString().PHP_EOL; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | $this->fail($e->getMessage()); |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | $this->fail('No syntax errors were detected, when syntax errors were expected'); |
43 | 43 | } catch (QueryException $e) { |
44 | 44 | if ($debug) { |
45 | - echo $e->getMessage() . PHP_EOL; |
|
46 | - echo $e->getTraceAsString() . PHP_EOL; |
|
45 | + echo $e->getMessage().PHP_EOL; |
|
46 | + echo $e->getTraceAsString().PHP_EOL; |
|
47 | 47 | } |
48 | 48 | $this->addToAssertionCount(1); |
49 | 49 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'], |
113 | 113 | |
114 | 114 | /* Checks for invalid AbstractSchemaName */ |
115 | - ['SELECT u FROM UnknownClass u'], // unknown |
|
115 | + ['SELECT u FROM UnknownClass u'], // unknown |
|
116 | 116 | ['SELECT u FROM Unknown\Class u'], // unknown with namespace |
117 | 117 | ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash |
118 | 118 | ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\) |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | */ |
586 | 586 | public function testDQLKeywordInJoinIsAllowed() |
587 | 587 | { |
588 | - $this->assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g'); |
|
588 | + $this->assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g'); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | /** |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | */ |
594 | 594 | public function testDQLKeywordInConditionIsAllowed() |
595 | 595 | { |
596 | - $this->assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0'); |
|
596 | + $this->assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0'); |
|
597 | 597 | } |
598 | 598 | |
599 | 599 | /* The exception is currently thrown in the SQLWalker, not earlier. |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | */ |
699 | 699 | public function testNewLiteralExpression() |
700 | 700 | { |
701 | - $this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u"); |
|
701 | + $this->assertValidDQL("SELECT new ".__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u"); |
|
702 | 702 | } |
703 | 703 | |
704 | 704 | /** |
@@ -706,7 +706,7 @@ discard block |
||
706 | 706 | */ |
707 | 707 | public function testNewLiteralWithSubselectExpression() |
708 | 708 | { |
709 | - $this->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"); |
|
709 | + $this->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"); |
|
710 | 710 | } |
711 | 711 | |
712 | 712 | public function testStringPrimaryAcceptsAggregateExpression() : void |
@@ -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 | } |