@@ -12,7 +12,7 @@ |
||
| 12 | 12 | public static function fromClassAndAssociation(string $class, string $associationName) : self |
| 13 | 13 | { |
| 14 | 14 | return new self(sprintf( |
| 15 | - 'Cannot match on %s::%s with a non-object value. Matching objects by id is ' . |
|
| 15 | + 'Cannot match on %s::%s with a non-object value. Matching objects by id is '. |
|
| 16 | 16 | 'not compatible with matching on an in-memory collection, which compares objects by reference.', |
| 17 | 17 | $class, |
| 18 | 18 | $associationName |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $this->currentPersisterContext->rsm->setDiscriminatorColumn('r', $resultColumnName); |
| 46 | 46 | $this->currentPersisterContext->rsm->addMetaResult('r', $resultColumnName, $discrColumnName, false, $discrColumnType); |
| 47 | 47 | |
| 48 | - $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias . '.' . $quotedColumnName, $this->platform); |
|
| 48 | + $columnList[] = $discrColumnType->convertToDatabaseValueSQL($discrTableAlias.'.'.$quotedColumnName, $this->platform); |
|
| 49 | 49 | |
| 50 | 50 | // Append subclass columns |
| 51 | 51 | foreach ($this->class->getSubClasses() as $subClassName) { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | /** @var JoinColumnMetadata $joinColumn */ |
| 70 | 70 | $referencedColumnName = $joinColumn->getReferencedColumnName(); |
| 71 | 71 | |
| 72 | - if (! $joinColumn->getType()) { |
|
| 72 | + if ( ! $joinColumn->getType()) { |
|
| 73 | 73 | $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em)); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $conditionSql .= ' AND '; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL(); |
|
| 126 | + return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL(); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $conditionSql .= ' AND '; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - return $conditionSql . $this->getSelectConditionDiscriminatorValueSQL(); |
|
| 140 | + return $conditionSql.$this->getSelectConditionDiscriminatorValueSQL(); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | return sprintf( |
| 166 | 166 | '%s IN (%s)', |
| 167 | - $discrColumnType->convertToDatabaseValueSQL($tableAlias . '.' . $quotedColumnName, $this->platform), |
|
| 167 | + $discrColumnType->convertToDatabaseValueSQL($tableAlias.'.'.$quotedColumnName, $this->platform), |
|
| 168 | 168 | implode(', ', $values) |
| 169 | 169 | ); |
| 170 | 170 | } |
@@ -56,6 +56,6 @@ |
||
| 56 | 56 | $columnType |
| 57 | 57 | ); |
| 58 | 58 | |
| 59 | - return $columnType->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias; |
|
| 59 | + return $columnType->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias; |
|
| 60 | 60 | } |
| 61 | 61 | } |
@@ -10,6 +10,6 @@ |
||
| 10 | 10 | { |
| 11 | 11 | public static function fromClassNameAndField(string $className, string $field) : self |
| 12 | 12 | { |
| 13 | - return new self('Invalid order by orientation specified for ' . $className . '#' . $field); |
|
| 13 | + return new self('Invalid order by orientation specified for '.$className.'#'.$field); |
|
| 14 | 14 | } |
| 15 | 15 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | 'u__status' => 'developer', |
| 64 | 64 | 'u__username' => 'jwage', |
| 65 | 65 | 'u__name' => 'Jonathan', |
| 66 | - 'sclr0' => 'JWAGE' . $i, |
|
| 66 | + 'sclr0' => 'JWAGE'.$i, |
|
| 67 | 67 | 'p__phonenumber' => '91', |
| 68 | 68 | ]; |
| 69 | 69 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | $isInitialized = $collection->isInitialized(); |
| 62 | 62 | $isDirty = $collection->isDirty(); |
| 63 | 63 | |
| 64 | - if (! $isInitialized && ! $isDirty) { |
|
| 64 | + if ( ! $isInitialized && ! $isDirty) { |
|
| 65 | 65 | return; |
| 66 | 66 | } |
| 67 | 67 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $this->addToAssertionCount(1); |
| 30 | 30 | } catch (QueryException $e) { |
| 31 | 31 | if ($debug) { |
| 32 | - echo $e->getTraceAsString() . PHP_EOL; |
|
| 32 | + echo $e->getTraceAsString().PHP_EOL; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | $this->fail($e->getMessage()); |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | $this->fail('No syntax errors were detected, when syntax errors were expected'); |
| 45 | 45 | } catch (QueryException $e) { |
| 46 | 46 | if ($debug) { |
| 47 | - echo $e->getMessage() . PHP_EOL; |
|
| 48 | - echo $e->getTraceAsString() . PHP_EOL; |
|
| 47 | + echo $e->getMessage().PHP_EOL; |
|
| 48 | + echo $e->getTraceAsString().PHP_EOL; |
|
| 49 | 49 | } |
| 50 | 50 | $this->addToAssertionCount(1); |
| 51 | 51 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'], |
| 108 | 108 | |
| 109 | 109 | /* Checks for invalid AbstractSchemaName */ |
| 110 | - ['SELECT u FROM UnknownClass u'], // unknown |
|
| 110 | + ['SELECT u FROM UnknownClass u'], // unknown |
|
| 111 | 111 | ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash |
| 112 | 112 | ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\) |
| 113 | 113 | ['SELECT u FROM Unknown\Class\ u'], // unknown, syntactically bogus (trailing \) |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | */ |
| 574 | 574 | public function testDQLKeywordInJoinIsAllowed() : void |
| 575 | 575 | { |
| 576 | - self::assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g'); |
|
| 576 | + self::assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g'); |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | 579 | /** |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | */ |
| 582 | 582 | public function testDQLKeywordInConditionIsAllowed() : void |
| 583 | 583 | { |
| 584 | - self::assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0'); |
|
| 584 | + self::assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0'); |
|
| 585 | 585 | } |
| 586 | 586 | |
| 587 | 587 | /* The exception is currently thrown in the SQLWalker, not earlier. |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | */ |
| 687 | 687 | public function testNewLiteralExpression() : void |
| 688 | 688 | { |
| 689 | - self::assertValidDQL('SELECT new ' . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u"); |
|
| 689 | + self::assertValidDQL('SELECT new '.__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u"); |
|
| 690 | 690 | } |
| 691 | 691 | |
| 692 | 692 | /** |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | */ |
| 695 | 695 | public function testNewLiteralWithSubselectExpression() : void |
| 696 | 696 | { |
| 697 | - self::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"); |
|
| 697 | + self::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"); |
|
| 698 | 698 | } |
| 699 | 699 | |
| 700 | 700 | public function testStringPrimaryAcceptsAggregateExpression() : void |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $query = $this->em->createQuery( |
| 41 | 41 | 'SELECT CONCAT(e.type, MIN(e.version)) pair' |
| 42 | - . ' FROM ' . GH7286Entity::class . ' e' |
|
| 42 | + . ' FROM '.GH7286Entity::class.' e' |
|
| 43 | 43 | . ' WHERE e.type IS NOT NULL' |
| 44 | 44 | . ' GROUP BY e.type' |
| 45 | 45 | . ' ORDER BY e.type' |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | $query = $this->em->createQuery( |
| 65 | 65 | 'SELECT CC(e.type, MIN(e.version)) pair' |
| 66 | - . ' FROM ' . GH7286Entity::class . ' e' |
|
| 66 | + . ' FROM '.GH7286Entity::class.' e' |
|
| 67 | 67 | . ' WHERE e.type IS NOT NULL AND e.type != :type' |
| 68 | 68 | . ' GROUP BY e.type' |
| 69 | 69 | ); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | // remove namespace separators from remaining class name |
| 47 | 47 | $fileName = str_replace('\\', '', $classNameRelativeToMetadataNamespace); |
| 48 | 48 | |
| 49 | - return $metadataDir . DIRECTORY_SEPARATOR . $fileName . '.php'; |
|
| 49 | + return $metadataDir.DIRECTORY_SEPARATOR.$fileName.'.php'; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | ) : Closure { |
| 64 | 64 | $metadataNamespace = ltrim($metadataNamespace, '\\'); |
| 65 | 65 | |
| 66 | - if (! ($notFoundCallback === null || is_callable($notFoundCallback))) { |
|
| 66 | + if ( ! ($notFoundCallback === null || is_callable($notFoundCallback))) { |
|
| 67 | 67 | $type = is_object($notFoundCallback) ? get_class($notFoundCallback) : gettype($notFoundCallback); |
| 68 | 68 | |
| 69 | 69 | throw new InvalidArgumentException( |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | ); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - $autoloader = static function ($className) use ($metadataDir, $metadataNamespace, $notFoundCallback) { |
|
| 74 | + $autoloader = static function($className) use ($metadataDir, $metadataNamespace, $notFoundCallback) { |
|
| 75 | 75 | if (strpos($className, $metadataNamespace) === 0) { |
| 76 | 76 | $file = Autoloader::resolveFile($metadataDir, $metadataNamespace, $className); |
| 77 | 77 | |