@@ -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(); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Doctrine\Tests\ORM\Functional\Ticket; |
| 6 | 6 | |
@@ -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 { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Doctrine\Tests\ORM\Functional; |
| 6 | 6 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | try { |
| 46 | 46 | $sqlGenerated = $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker); |
| 47 | 47 | } catch (\Exception $e) { |
| 48 | - $this->fail($e->getMessage() . ' at "' . $e->getFile() . '" on line ' . $e->getLine()); |
|
| 48 | + $this->fail($e->getMessage().' at "'.$e->getFile().'" on line '.$e->getLine()); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | self::assertEquals($sqlToBeConfirmed, $sqlGenerated); |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | { |
| 206 | 206 | $rangeVariableDecl = $identificationVariableDecl->rangeVariableDeclaration; |
| 207 | 207 | $joinAssocPathExpression = new Query\AST\JoinAssociationPathExpression($rangeVariableDecl->aliasIdentificationVariable, 'address'); |
| 208 | - $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null); |
|
| 208 | + $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable.'a', null); |
|
| 209 | 209 | $join = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration); |
| 210 | - $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false); |
|
| 210 | + $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable.'a', null, false); |
|
| 211 | 211 | |
| 212 | 212 | $identificationVariableDecl->joins[] = $join; |
| 213 | 213 | $selectStatement->selectClause->selectExpressions[] = $selectExpression; |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $userMetadata = $entityManager->getClassMetadata(CmsUser::class); |
| 217 | 217 | $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class); |
| 218 | 218 | |
| 219 | - $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', |
|
| 219 | + $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable.'a', |
|
| 220 | 220 | [ |
| 221 | 221 | 'metadata' => $addressMetadata, |
| 222 | 222 | 'parent' => $rangeVariableDecl->aliasIdentificationVariable, |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | abstract class AbstractEntityPersister implements CachedEntityPersister |
| 43 | 43 | { |
| 44 | - /** |
|
| 45 | - * @var \Doctrine\ORM\UnitOfWork |
|
| 46 | - */ |
|
| 44 | + /** |
|
| 45 | + * @var \Doctrine\ORM\UnitOfWork |
|
| 46 | + */ |
|
| 47 | 47 | protected $uow; |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | protected $class; |
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @var array |
|
| 66 | - */ |
|
| 64 | + /** |
|
| 65 | + * @var array |
|
| 66 | + */ |
|
| 67 | 67 | protected $queuedCache = []; |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | /** |
| 286 | 286 | * Generates a string of currently query |
| 287 | 287 | * |
| 288 | - * @param array $query |
|
| 288 | + * @param string $query |
|
| 289 | 289 | * @param string $criteria |
| 290 | 290 | * @param array $orderBy |
| 291 | 291 | * @param integer $limit |
@@ -352,6 +352,7 @@ discard block |
||
| 352 | 352 | |
| 353 | 353 | /** |
| 354 | 354 | * {@inheritdoc} |
| 355 | + * @param string $fieldName |
|
| 355 | 356 | */ |
| 356 | 357 | public function getOwningTable($fieldName) |
| 357 | 358 | { |
@@ -376,6 +377,7 @@ discard block |
||
| 376 | 377 | |
| 377 | 378 | /** |
| 378 | 379 | * {@inheritdoc} |
| 380 | + * @param \Doctrine\Tests\Models\Cache\Country $entity |
|
| 379 | 381 | */ |
| 380 | 382 | public function insert($entity) |
| 381 | 383 | { |
@@ -676,7 +678,7 @@ discard block |
||
| 676 | 678 | } |
| 677 | 679 | |
| 678 | 680 | /** |
| 679 | - * @param array $association |
|
| 681 | + * @param AssociationMetadata $association |
|
| 680 | 682 | * @param array $ownerId |
| 681 | 683 | * |
| 682 | 684 | * @return CollectionCacheKey |
@@ -34,12 +34,10 @@ |
||
| 34 | 34 | use Doctrine\ORM\Mapping\FetchMode; |
| 35 | 35 | use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata; |
| 36 | 36 | use Doctrine\ORM\Mapping\OneToManyAssociationMetadata; |
| 37 | -use Doctrine\ORM\Mapping\OneToOneAssociationMetadata; |
|
| 38 | 37 | use Doctrine\ORM\Mapping\ToOneAssociationMetadata; |
| 39 | 38 | use Doctrine\ORM\PersistentCollection; |
| 40 | 39 | use Doctrine\ORM\EntityManagerInterface; |
| 41 | 40 | use Doctrine\ORM\Persisters\Entity\EntityPersister; |
| 42 | - |
|
| 43 | 41 | use Doctrine\Common\Util\ClassUtils; |
| 44 | 42 | use Doctrine\Common\Collections\Criteria; |
| 45 | 43 | |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | |
| 4 | -declare(strict_types=1); |
|
| 4 | +declare(strict_types = 1); |
|
| 5 | 5 | |
| 6 | 6 | namespace Doctrine\ORM\Cache\Persister\Entity; |
| 7 | 7 | |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | ? $this->persister->expandCriteriaParameters($criteria) |
| 283 | 283 | : $this->persister->expandParameters($criteria); |
| 284 | 284 | |
| 285 | - return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset); |
|
| 285 | + return sha1($query.serialize($params).serialize($orderBy).$limit.$offset); |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | /** |
@@ -30,9 +30,9 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | class ReadOnlyCachedCollectionPersister extends NonStrictReadWriteCachedCollectionPersister |
| 32 | 32 | { |
| 33 | - /** |
|
| 34 | - * {@inheritdoc} |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * {@inheritdoc} |
|
| 35 | + */ |
|
| 36 | 36 | public function update(PersistentCollection $collection) |
| 37 | 37 | { |
| 38 | 38 | if ($collection->isDirty() && $collection->getSnapshot()) { |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | |
| 4 | -declare(strict_types=1); |
|
| 4 | +declare(strict_types = 1); |
|
| 5 | 5 | |
| 6 | 6 | namespace Doctrine\ORM\Cache\Persister\Collection; |
| 7 | 7 | |
@@ -37,9 +37,9 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | abstract class AbstractCollectionPersister implements CachedCollectionPersister |
| 39 | 39 | { |
| 40 | - /** |
|
| 41 | - * @var \Doctrine\ORM\UnitOfWork |
|
| 42 | - */ |
|
| 40 | + /** |
|
| 41 | + * @var \Doctrine\ORM\UnitOfWork |
|
| 42 | + */ |
|
| 43 | 43 | protected $uow; |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | protected $association; |
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @var array |
|
| 72 | - */ |
|
| 70 | + /** |
|
| 71 | + * @var array |
|
| 72 | + */ |
|
| 73 | 73 | protected $queuedCache = []; |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | |
| 4 | -declare(strict_types=1); |
|
| 4 | +declare(strict_types = 1); |
|
| 5 | 5 | |
| 6 | 6 | namespace Doctrine\ORM\Cache\Persister\Collection; |
| 7 | 7 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $targetHydrator = $targetPersister->getEntityHydrator(); |
| 165 | 165 | |
| 166 | 166 | // Only preserve ordering if association configured it |
| 167 | - if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) { |
|
| 167 | + if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) { |
|
| 168 | 168 | // Elements may be an array or a Collection |
| 169 | 169 | $elements = \array_values($elements instanceof Collection ? $elements->getValues() : $elements); |
| 170 | 170 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function getCacheLogger() |
| 75 | 75 | { |
| 76 | - return $this->cacheLogger; |
|
| 76 | + return $this->cacheLogger; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | ); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - return $this->queryValidator; |
|
| 118 | + return $this->queryValidator; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | |
| 4 | -declare(strict_types=1); |
|
| 4 | +declare(strict_types = 1); |
|
| 5 | 5 | |
| 6 | 6 | namespace Doctrine\ORM\Cache; |
| 7 | 7 | |
@@ -5,8 +5,6 @@ |
||
| 5 | 5 | use Doctrine\Tests\Models\Quote\Address; |
| 6 | 6 | use Doctrine\Tests\Models\Quote\City; |
| 7 | 7 | use Doctrine\Tests\Models\Quote\FullAddress; |
| 8 | -use Doctrine\Tests\Models\Quote\Group; |
|
| 9 | -use Doctrine\Tests\Models\Quote\Phone; |
|
| 10 | 8 | use Doctrine\Tests\Models\Quote\User; |
| 11 | 9 | use Doctrine\Tests\OrmFunctionalTestCase; |
| 12 | 10 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Doctrine\Tests\ORM\Functional\Ticket; |
| 6 | 6 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | { |
| 38 | 38 | $id = $this->createAddress(); |
| 39 | 39 | |
| 40 | - $addresses = $this->em->createQuery('SELECT a FROM ' . Address::class . ' a WHERE a.id = :id') |
|
| 40 | + $addresses = $this->em->createQuery('SELECT a FROM '.Address::class.' a WHERE a.id = :id') |
|
| 41 | 41 | ->setParameter('id', $id) |
| 42 | 42 | ->getResult(); |
| 43 | 43 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | $id = $this->createFullAddress(); |
| 60 | 60 | |
| 61 | - $addresses = $this->em->createQuery('SELECT a FROM ' . FullAddress::class . ' a WHERE a.id = :id') |
|
| 61 | + $addresses = $this->em->createQuery('SELECT a FROM '.FullAddress::class.' a WHERE a.id = :id') |
|
| 62 | 62 | ->setParameter('id', $id) |
| 63 | 63 | ->getResult(); |
| 64 | 64 | |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | * declarations (from ... x join ... y join ... z ...) appear in the query |
| 414 | 414 | * as the hydration process relies on that order for proper operation. |
| 415 | 415 | * |
| 416 | - * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST |
|
| 416 | + * @param AST\SelectStatement $AST |
|
| 417 | 417 | * |
| 418 | 418 | * @return void |
| 419 | 419 | */ |
@@ -1617,7 +1617,7 @@ discard block |
||
| 1617 | 1617 | * accessible is "FROM", prohibiting an easy implementation without larger |
| 1618 | 1618 | * changes.} |
| 1619 | 1619 | * |
| 1620 | - * @return \Doctrine\ORM\Query\AST\SubselectIdentificationVariableDeclaration | |
|
| 1620 | + * @return AST\IdentificationVariableDeclaration | |
|
| 1621 | 1621 | * \Doctrine\ORM\Query\AST\IdentificationVariableDeclaration |
| 1622 | 1622 | */ |
| 1623 | 1623 | public function SubselectIdentificationVariableDeclaration() |
@@ -1755,7 +1755,7 @@ discard block |
||
| 1755 | 1755 | /** |
| 1756 | 1756 | * JoinAssociationDeclaration ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy] |
| 1757 | 1757 | * |
| 1758 | - * @return \Doctrine\ORM\Query\AST\JoinAssociationPathExpression |
|
| 1758 | + * @return AST\JoinAssociationDeclaration |
|
| 1759 | 1759 | */ |
| 1760 | 1760 | public function JoinAssociationDeclaration() |
| 1761 | 1761 | { |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | namespace Doctrine\ORM\Query; |
| 23 | 23 | |
| 24 | 24 | use Doctrine\ORM\Mapping\AssociationMetadata; |
| 25 | -use Doctrine\ORM\Mapping\ClassMetadata; |
|
| 26 | 25 | use Doctrine\ORM\Mapping\FieldMetadata; |
| 27 | 26 | use Doctrine\ORM\Mapping\ToOneAssociationMetadata; |
| 28 | 27 | use Doctrine\ORM\Query; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Doctrine\ORM\Query; |
| 6 | 6 | |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | $tokenStr = substr($dql, (int) $token['position'], $length); |
| 471 | 471 | |
| 472 | 472 | // Building informative message |
| 473 | - $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message; |
|
| 473 | + $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message; |
|
| 474 | 474 | |
| 475 | 475 | throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL())); |
| 476 | 476 | } |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | // If the namespace is not given then assumes the first FROM entity namespace |
| 618 | 618 | if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) { |
| 619 | 619 | $namespace = substr($fromClassName, 0, strrpos($fromClassName, '\\')); |
| 620 | - $fqcn = $namespace . '\\' . $className; |
|
| 620 | + $fqcn = $namespace.'\\'.$className; |
|
| 621 | 621 | |
| 622 | 622 | if (class_exists($fqcn)) { |
| 623 | 623 | $expression->className = $fqcn; |
@@ -666,13 +666,13 @@ discard block |
||
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | $this->semanticalError( |
| 669 | - "There is no mapped field named '$field' on class " . $class->getClassName() . ".", $deferredItem['token'] |
|
| 669 | + "There is no mapped field named '$field' on class ".$class->getClassName().".", $deferredItem['token'] |
|
| 670 | 670 | ); |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) { |
| 674 | 674 | $this->semanticalError( |
| 675 | - "The partial field selection of class " . $class->getClassName() . " must contain the identifier.", |
|
| 675 | + "The partial field selection of class ".$class->getClassName()." must contain the identifier.", |
|
| 676 | 676 | $deferredItem['token'] |
| 677 | 677 | ); |
| 678 | 678 | } |
@@ -741,9 +741,9 @@ discard block |
||
| 741 | 741 | $property = $class->getProperty($field); |
| 742 | 742 | |
| 743 | 743 | // Check if field or association exists |
| 744 | - if (! $property) { |
|
| 744 | + if ( ! $property) { |
|
| 745 | 745 | $this->semanticalError( |
| 746 | - 'Class ' . $class->getClassName() . ' has no field or association named ' . $field, |
|
| 746 | + 'Class '.$class->getClassName().' has no field or association named '.$field, |
|
| 747 | 747 | $deferredItem['token'] |
| 748 | 748 | ); |
| 749 | 749 | } |
@@ -782,8 +782,8 @@ discard block |
||
| 782 | 782 | // Build the error message |
| 783 | 783 | $semanticalError = 'Invalid PathExpression. '; |
| 784 | 784 | $semanticalError .= \count($expectedStringTypes) === 1 |
| 785 | - ? 'Must be a ' . $expectedStringTypes[0] . '.' |
|
| 786 | - : implode(' or ', $expectedStringTypes) . ' expected.'; |
|
| 785 | + ? 'Must be a '.$expectedStringTypes[0].'.' |
|
| 786 | + : implode(' or ', $expectedStringTypes).' expected.'; |
|
| 787 | 787 | |
| 788 | 788 | $this->semanticalError($semanticalError, $deferredItem['token']); |
| 789 | 789 | } |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | |
| 953 | 953 | list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']); |
| 954 | 954 | |
| 955 | - $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName; |
|
| 955 | + $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName; |
|
| 956 | 956 | } |
| 957 | 957 | |
| 958 | 958 | return $schemaName; |
@@ -967,7 +967,7 @@ discard block |
||
| 967 | 967 | */ |
| 968 | 968 | private function validateAbstractSchemaName($schemaName) |
| 969 | 969 | { |
| 970 | - if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) { |
|
| 970 | + if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) { |
|
| 971 | 971 | $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token); |
| 972 | 972 | } |
| 973 | 973 | } |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | |
| 1024 | 1024 | if ( ! isset($this->queryComponents[$identVariable])) { |
| 1025 | 1025 | $this->semanticalError( |
| 1026 | - 'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.' |
|
| 1026 | + 'Identification Variable '.$identVariable.' used in join path expression but was not defined before.' |
|
| 1027 | 1027 | ); |
| 1028 | 1028 | } |
| 1029 | 1029 | |
@@ -1036,8 +1036,8 @@ discard block |
||
| 1036 | 1036 | $qComp = $this->queryComponents[$identVariable]; |
| 1037 | 1037 | $class = $qComp['metadata']; |
| 1038 | 1038 | |
| 1039 | - if (! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) { |
|
| 1040 | - $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field); |
|
| 1039 | + if ( ! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) { |
|
| 1040 | + $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field); |
|
| 1041 | 1041 | } |
| 1042 | 1042 | |
| 1043 | 1043 | return new AST\JoinAssociationPathExpression($identVariable, $field); |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | // Peek beyond the matching closing parenthesis ')' |
| 2460 | 2460 | $peek = $this->peekBeyondClosingParenthesis(); |
| 2461 | 2461 | |
| 2462 | - if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) || |
|
| 2462 | + if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) || |
|
| 2463 | 2463 | in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) || |
| 2464 | 2464 | $this->isMathOperator($peek)) { |
| 2465 | 2465 | $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression(); |
@@ -2564,7 +2564,7 @@ discard block |
||
| 2564 | 2564 | return $this->NullComparisonExpression(); |
| 2565 | 2565 | } |
| 2566 | 2566 | |
| 2567 | - if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) { |
|
| 2567 | + if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) { |
|
| 2568 | 2568 | return $this->EmptyCollectionComparisonExpression(); |
| 2569 | 2569 | } |
| 2570 | 2570 | |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\Cache\ArrayCache; |
| 6 | 6 | use Doctrine\DBAL\Driver\Connection; |
| 7 | -use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver; |
|
| 8 | 7 | use Doctrine\DBAL\Logging\DebugStack; |
| 9 | 8 | use Doctrine\DBAL\Types\Type; |
| 10 | 9 | use Doctrine\ORM\Cache\CacheConfiguration; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace Doctrine\Tests; |
| 6 | 6 | |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | $conn->executeUpdate('DELETE FROM RoutingLocation'); |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | - if(isset($this->usedModelSets['navigation'])) { |
|
| 404 | + if (isset($this->usedModelSets['navigation'])) { |
|
| 405 | 405 | $conn->executeUpdate('DELETE FROM navigation_tour_pois'); |
| 406 | 406 | $conn->executeUpdate('DELETE FROM navigation_photos'); |
| 407 | 407 | $conn->executeUpdate('DELETE FROM navigation_pois'); |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $conn->executeUpdate('DELETE FROM navigation_countries'); |
| 410 | 410 | } |
| 411 | 411 | if (isset($this->usedModelSets['directorytree'])) { |
| 412 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file")); |
|
| 412 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file")); |
|
| 413 | 413 | // MySQL doesn't know deferred deletions therefore only executing the second query gives errors. |
| 414 | 414 | $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); |
| 415 | 415 | $conn->executeUpdate('DELETE FROM Directory'); |
@@ -499,12 +499,12 @@ discard block |
||
| 499 | 499 | ) |
| 500 | 500 | ); |
| 501 | 501 | |
| 502 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); |
|
| 503 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group")); |
|
| 504 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone")); |
|
| 505 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user")); |
|
| 506 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address")); |
|
| 507 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); |
|
| 502 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups')); |
|
| 503 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-group")); |
|
| 504 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-phone")); |
|
| 505 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-user")); |
|
| 506 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-address")); |
|
| 507 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city')); |
|
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | if (isset($this->usedModelSets['vct_onetoone'])) { |
@@ -639,15 +639,15 @@ discard block |
||
| 639 | 639 | { |
| 640 | 640 | $this->setUpDBALTypes(); |
| 641 | 641 | |
| 642 | - if (! isset(static::$sharedConn)) { |
|
| 642 | + if ( ! isset(static::$sharedConn)) { |
|
| 643 | 643 | static::$sharedConn = TestUtil::getConnection(); |
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { |
| 647 | 647 | if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) { |
| 648 | - static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/'); |
|
| 648 | + static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/'); |
|
| 649 | 649 | } else if (static::$sharedConn->getDatabasePlatform()->getName() === "oracle") { |
| 650 | - static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual'); |
|
| 650 | + static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual'); |
|
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | 653 | |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | } |
| 658 | 658 | |
| 659 | 659 | foreach ($this->usedModelSets as $setName => $bool) { |
| 660 | - if (! isset(static::$tablesCreated[$setName])) { |
|
| 660 | + if ( ! isset(static::$tablesCreated[$setName])) { |
|
| 661 | 661 | $this->setUpEntitySchema(static::$modelSets[$setName]); |
| 662 | 662 | |
| 663 | 663 | static::$tablesCreated[$setName] = true; |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | |
| 701 | 701 | $config->setMetadataCacheImpl(self::$metadataCacheImpl); |
| 702 | 702 | $config->setQueryCacheImpl(self::$queryCacheImpl); |
| 703 | - $config->setProxyDir(__DIR__ . '/Proxies'); |
|
| 703 | + $config->setProxyDir(__DIR__.'/Proxies'); |
|
| 704 | 704 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
| 705 | 705 | |
| 706 | 706 | if (null !== $this->resultCacheImpl) { |
@@ -732,8 +732,8 @@ discard block |
||
| 732 | 732 | |
| 733 | 733 | $config->setMetadataDriverImpl( |
| 734 | 734 | $config->newDefaultAnnotationDriver([ |
| 735 | - realpath(__DIR__ . '/Models/Cache'), |
|
| 736 | - realpath(__DIR__ . '/Models/GeoNames') |
|
| 735 | + realpath(__DIR__.'/Models/Cache'), |
|
| 736 | + realpath(__DIR__.'/Models/GeoNames') |
|
| 737 | 737 | ]) |
| 738 | 738 | ); |
| 739 | 739 | |
@@ -797,9 +797,9 @@ discard block |
||
| 797 | 797 | $trace = $e->getTrace(); |
| 798 | 798 | $traceMsg = ""; |
| 799 | 799 | |
| 800 | - foreach($trace AS $part) { |
|
| 801 | - if(isset($part['file'])) { |
|
| 802 | - if(strpos($part['file'], "PHPUnit/") !== false) { |
|
| 800 | + foreach ($trace AS $part) { |
|
| 801 | + if (isset($part['file'])) { |
|
| 802 | + if (strpos($part['file'], "PHPUnit/") !== false) { |
|
| 803 | 803 | // Beginning with PHPUnit files we don't print the trace anymore. |
| 804 | 804 | break; |
| 805 | 805 | } |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | |
| 811 | 811 | $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg; |
| 812 | 812 | |
| 813 | - throw new \Exception($message, (int)$e->getCode(), $e); |
|
| 813 | + throw new \Exception($message, (int) $e->getCode(), $e); |
|
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | throw $e; |
@@ -786,7 +786,11 @@ |
||
| 786 | 786 | foreach ($last25queries as $i => $query) { |
| 787 | 787 | $params = array_map( |
| 788 | 788 | function($p) { |
| 789 | - if (is_object($p)) return get_class($p); else return var_export($p, true); |
|
| 789 | + if (is_object($p)) { |
|
| 790 | + return get_class($p); |
|
| 791 | + } else { |
|
| 792 | + return var_export($p, true); |
|
| 793 | + } |
|
| 790 | 794 | }, |
| 791 | 795 | $query['params'] ?: [] |
| 792 | 796 | ); |