From bf322b903d6d2598b2d879edf0ea89ae23b2ff5c Mon Sep 17 00:00:00 2001 From: Mikhail Shamin Date: Wed, 11 May 2016 01:55:12 +0700 Subject: [PATCH 1/2] Optimize imports. Remove full qualified class names --- lib/Doctrine/ORM/AbstractQuery.php | 1 - lib/Doctrine/ORM/Cache/DefaultQueryCache.php | 1 - lib/Doctrine/ORM/Cache/EntityCacheEntry.php | 2 +- lib/Doctrine/ORM/EntityRepository.php | 1 - .../ORM/Internal/Hydration/ObjectHydrator.php | 3 - .../Hydration/SimpleObjectHydrator.php | 1 - .../Collection/ManyToManyPersister.php | 3 +- .../Collection/OneToManyPersister.php | 1 - .../Entity/JoinedSubclassPersister.php | 1 - lib/Doctrine/ORM/Query/Parser.php | 2 +- .../ORM/Query/ResultSetMappingBuilder.php | 1 - .../Pagination/LimitSubqueryOutputWalker.php | 9 -- .../Tools/Pagination/LimitSubqueryWalker.php | 1 - lib/Doctrine/ORM/UnitOfWork.php | 3 +- .../Tests/Mocks/ClassMetadataMock.php | 4 +- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 3 +- .../Tests/Mocks/DatabasePlatformMock.php | 4 +- .../Tests/Mocks/DriverConnectionMock.php | 4 +- tests/Doctrine/Tests/Mocks/DriverMock.php | 15 +- .../Tests/Mocks/EntityManagerMock.php | 13 +- .../Tests/Mocks/EntityPersisterMock.php | 6 +- .../Tests/Mocks/HydratorMockStatement.php | 4 +- .../Tests/Mocks/MetadataDriverMock.php | 7 +- tests/Doctrine/Tests/Mocks/MockTreeWalker.php | 4 +- .../Tests/Mocks/SchemaManagerMock.php | 7 +- tests/Doctrine/Tests/Mocks/SequenceMock.php | 3 +- tests/Doctrine/Tests/Mocks/StatementMock.php | 4 +- tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php | 4 +- .../Tests/Models/DDC3579/DDC3579Admin.php | 2 - .../Models/DDC753/DDC753InvalidRepository.php | 2 - .../Tests/Models/DDC964/DDC964Admin.php | 2 - .../Tests/Models/DDC964/DDC964Guest.php | 2 - .../Tests/Models/Legacy/LegacyCar.php | 2 - .../Tests/Models/StockExchange/Bond.php | 3 +- .../Tests/Models/StockExchange/Stock.php | 2 - .../Doctrine/Tests/ORM/Cache/CacheKeyTest.php | 3 +- .../Tests/ORM/Cache/DefaultQueryCacheTest.php | 6 +- .../Tests/ORM/Cache/DefaultRegionTest.php | 5 +- .../Tests/ORM/Cache/MultiGetRegionTest.php | 2 - .../AbstractCollectionPersisterTest.php | 3 +- .../Tests/ORM/CommitOrderCalculatorTest.php | 3 +- .../Doctrine/Tests/ORM/ConfigurationTest.php | 1 - .../Decorator/EntityManagerDecoratorTest.php | 2 - .../Tests/ORM/Entity/ConstructorTest.php | 4 +- .../Doctrine/Tests/ORM/EntityManagerTest.php | 9 +- .../ORM/Functional/AdvancedDqlQueryTest.php | 1 - .../ORM/Functional/BasicFunctionalTest.php | 2 - .../Functional/ClassTableInheritanceTest.php | 4 +- .../ORM/Functional/DetachedEntityTest.php | 1 - .../ORM/Functional/EntityRepositoryTest.php | 1 - .../ORM/Functional/HydrationCacheTest.php | 3 +- .../Functional/Locking/GearmanLockTest.php | 9 +- .../Tests/ORM/Functional/Locking/LockTest.php | 3 +- .../ORM/Functional/Locking/OptimisticTest.php | 7 +- .../MergeVersionedManyToOneTest.php | 5 +- .../Functional/OneToManyOrphanRemovalTest.php | 1 - .../Functional/OneToOneOrphanRemovalTest.php | 3 +- .../OneToOneSingleTableInheritanceTest.php | 4 - .../Functional/ProxiesLikeEntitiesTest.php | 4 +- .../Tests/ORM/Functional/QueryCacheTest.php | 1 - .../Tests/ORM/Functional/QueryTest.php | 1 - .../Tests/ORM/Functional/SQLFilterTest.php | 2 +- .../ORM/Functional/SchemaTool/DBAL483Test.php | 2 +- .../SchemaTool/MySqlSchemaToolTest.php | 6 +- .../SchemaTool/PostgreSqlSchemaToolTest.php | 3 +- .../ORM/Functional/SchemaValidatorTest.php | 1 - .../SecondLevelCacheOneToOneTest.php | 2 - .../ORM/Functional/Ticket/DDC1040Test.php | 4 +- .../ORM/Functional/Ticket/DDC1041Test.php | 7 +- .../ORM/Functional/Ticket/DDC1043Test.php | 7 +- .../ORM/Functional/Ticket/DDC1050Test.php | 7 +- .../ORM/Functional/Ticket/DDC1080Test.php | 4 +- .../ORM/Functional/Ticket/DDC1113Test.php | 2 - .../ORM/Functional/Ticket/DDC1129Test.php | 2 - .../ORM/Functional/Ticket/DDC1181Test.php | 4 +- .../ORM/Functional/Ticket/DDC1193Test.php | 5 +- .../ORM/Functional/Ticket/DDC1209Test.php | 4 +- .../ORM/Functional/Ticket/DDC1225Test.php | 3 - .../ORM/Functional/Ticket/DDC1228Test.php | 3 - .../ORM/Functional/Ticket/DDC1238Test.php | 3 - .../ORM/Functional/Ticket/DDC1250Test.php | 3 - .../ORM/Functional/Ticket/DDC1276Test.php | 1 - .../ORM/Functional/Ticket/DDC1306Test.php | 2 - .../ORM/Functional/Ticket/DDC1335Test.php | 2 - .../ORM/Functional/Ticket/DDC1360Test.php | 2 +- .../ORM/Functional/Ticket/DDC1383Test.php | 1 - .../ORM/Functional/Ticket/DDC1400Test.php | 2 - .../ORM/Functional/Ticket/DDC1436Test.php | 1 - .../ORM/Functional/Ticket/DDC144Test.php | 4 +- .../ORM/Functional/Ticket/DDC1452Test.php | 1 - .../ORM/Functional/Ticket/DDC1454Test.php | 2 - .../ORM/Functional/Ticket/DDC1458Test.php | 6 +- .../ORM/Functional/Ticket/DDC1461Test.php | 4 - .../ORM/Functional/Ticket/DDC1509Test.php | 2 - .../ORM/Functional/Ticket/DDC1514Test.php | 1 - .../ORM/Functional/Ticket/DDC1545Test.php | 3 - .../ORM/Functional/Ticket/DDC1594Test.php | 4 - .../ORM/Functional/Ticket/DDC1757Test.php | 4 +- .../ORM/Functional/Ticket/DDC1884Test.php | 4 +- .../ORM/Functional/Ticket/DDC192Test.php | 4 +- .../ORM/Functional/Ticket/DDC199Test.php | 4 +- .../ORM/Functional/Ticket/DDC2106Test.php | 1 - .../ORM/Functional/Ticket/DDC211Test.php | 4 +- .../ORM/Functional/Ticket/DDC2182Test.php | 2 - .../ORM/Functional/Ticket/DDC2230Test.php | 4 +- .../ORM/Functional/Ticket/DDC2256Test.php | 4 +- .../ORM/Functional/Ticket/DDC2306Test.php | 4 +- .../ORM/Functional/Ticket/DDC2346Test.php | 4 +- .../ORM/Functional/Ticket/DDC2359Test.php | 2 - .../ORM/Functional/Ticket/DDC258Test.php | 5 +- .../ORM/Functional/Ticket/DDC2660Test.php | 5 +- .../ORM/Functional/Ticket/DDC2692Test.php | 4 +- .../ORM/Functional/Ticket/DDC2759Test.php | 4 +- .../ORM/Functional/Ticket/DDC2825Test.php | 4 +- .../ORM/Functional/Ticket/DDC2996Test.php | 3 - .../ORM/Functional/Ticket/DDC309Test.php | 5 +- .../ORM/Functional/Ticket/DDC3170Test.php | 4 +- .../ORM/Functional/Ticket/DDC331Test.php | 9 -- .../ORM/Functional/Ticket/DDC3699Test.php | 2 - .../ORM/Functional/Ticket/DDC381Test.php | 2 - .../ORM/Functional/Ticket/DDC4003Test.php | 5 +- .../ORM/Functional/Ticket/DDC448Test.php | 5 +- .../ORM/Functional/Ticket/DDC501Test.php | 2 - .../ORM/Functional/Ticket/DDC512Test.php | 5 +- .../ORM/Functional/Ticket/DDC522Test.php | 2 - .../ORM/Functional/Ticket/DDC618Test.php | 2 - .../ORM/Functional/Ticket/DDC633Test.php | 2 - .../ORM/Functional/Ticket/DDC656Test.php | 2 - .../ORM/Functional/Ticket/DDC698Test.php | 2 - .../ORM/Functional/Ticket/DDC748Test.php | 1 - .../ORM/Functional/Ticket/DDC758Test.php | 1 - .../ORM/Functional/Ticket/DDC767Test.php | 1 - .../ORM/Functional/Ticket/DDC809Test.php | 4 - .../ORM/Functional/Ticket/DDC832Test.php | 4 - .../ORM/Functional/Ticket/DDC849Test.php | 1 - .../ORM/Functional/Ticket/DDC933Test.php | 6 +- .../ORM/Functional/Ticket/DDC949Test.php | 4 +- .../ORM/Functional/Ticket/DDC960Test.php | 4 +- .../ManyToManyCompositeIdForeignKeyTest.php | 1 - .../ManyToManyCompositeIdTest.php | 1 - .../ManyToManyExtraLazyTest.php | 1 - .../ValueConversionType/ManyToManyTest.php | 1 - .../OneToManyCompositeIdForeignKeyTest.php | 1 - .../OneToManyCompositeIdTest.php | 1 - .../ValueConversionType/OneToManyTest.php | 1 - .../OneToOneCompositeIdForeignKeyTest.php | 1 - .../OneToOneCompositeIdTest.php | 1 - .../ValueConversionType/OneToOneTest.php | 1 - .../Tests/ORM/Hydration/HydrationTestCase.php | 1 - .../ORM/Hydration/ObjectHydratorTest.php | 4 - .../Tests/ORM/Id/AssignedGeneratorTest.php | 8 +- .../Tests/ORM/Id/SequenceGeneratorTest.php | 3 +- .../Tests/ORM/LazyCriteriaCollectionTest.php | 4 +- .../ORM/Mapping/AbstractMappingDriverTest.php | 18 +-- .../ORM/Mapping/AnnotationDriverTest.php | 28 ++-- .../ORM/Mapping/AnsiQuoteStrategyTest.php | 3 +- .../Mapping/BasicInheritanceMappingTest.php | 3 +- .../ORM/Mapping/ClassMetadataBuilderTest.php | 6 +- .../ORM/Mapping/ClassMetadataFactoryTest.php | 9 +- .../Mapping/ClassMetadataLoadEventTest.php | 7 +- .../Tests/ORM/Mapping/ClassMetadataTest.php | 13 +- .../Mapping/EntityListenerResolverTest.php | 3 +- .../Tests/ORM/Mapping/FieldBuilderTest.php | 3 +- .../Tests/ORM/Mapping/NamingStrategyTest.php | 3 +- .../ORM/Mapping/PHPMappingDriverTest.php | 3 +- .../Tests/ORM/Mapping/QuoteStrategyTest.php | 11 +- .../Mapping/Symfony/AbstractDriverTest.php | 14 -- .../ORM/Mapping/XmlMappingDriverTest.php | 3 +- .../ORM/Mapping/YamlMappingDriverTest.php | 4 +- .../Tests/ORM/Performance/DDC2602Test.php | 3 +- .../Performance/HydrationPerformanceTest.php | 20 +-- .../InheritancePersisterPerformanceTest.php | 16 ++- .../ORM/Performance/InsertPerformanceTest.php | 6 +- .../Performance/PersisterPerformanceTest.php | 7 +- .../ORM/Performance/ProxyPerformanceTest.php | 1 - .../Performance/UnitOfWorkPerformanceTest.php | 3 +- .../Tests/ORM/PersistentCollectionTest.php | 1 - ...tyPersisterCompositeTypeParametersTest.php | 3 +- ...sicEntityPersisterCompositeTypeSqlTest.php | 8 +- .../BasicEntityPersisterTypeValueSqlTest.php | 3 +- .../Tests/ORM/Proxy/ProxyFactoryTest.php | 7 +- .../ORM/Query/CustomTreeWalkersJoinTest.php | 3 +- .../Tests/ORM/Query/CustomTreeWalkersTest.php | 3 +- .../ORM/Query/DeleteSqlGenerationTest.php | 3 +- tests/Doctrine/Tests/ORM/Query/ExprTest.php | 3 +- .../Tests/ORM/Query/FilterCollectionTest.php | 5 +- .../ORM/Query/LanguageRecognitionTest.php | 6 +- tests/Doctrine/Tests/ORM/Query/LexerTest.php | 3 +- .../ORM/Query/ParameterTypeInfererTest.php | 3 +- tests/Doctrine/Tests/ORM/Query/ParserTest.php | 3 +- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 3 +- .../ORM/Query/SelectSqlGenerationTest.php | 130 ++++++++++-------- .../ORM/Query/UpdateSqlGenerationTest.php | 3 +- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 3 +- .../ConvertDoctrine1SchemaCommandTest.php | 3 +- .../Tools/Console/Command/InfoCommandTest.php | 1 - .../ORM/Tools/ConvertDoctrine1SchemaTest.php | 11 +- .../Tests/ORM/Tools/EntityGeneratorTest.php | 5 +- .../Tools/EntityRepositoryGeneratorTest.php | 3 +- .../AbstractClassMetadataExporterTest.php | 11 +- .../Pagination/CountOutputWalkerTest.php | 2 +- .../ORM/Tools/Pagination/CountWalkerTest.php | 2 +- .../LimitSubqueryOutputWalkerTest.php | 3 +- .../Pagination/LimitSubqueryWalkerTest.php | 2 +- .../Tools/Pagination/WhereInWalkerTest.php | 2 +- .../Tools/ResolveTargetEntityListenerTest.php | 3 +- .../Tests/ORM/Tools/SchemaToolTest.php | 3 +- .../Tests/ORM/Tools/SchemaValidatorTest.php | 4 +- tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 6 +- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 8 +- .../Doctrine/Tests/OrmFunctionalTestCase.php | 26 ++-- tests/Doctrine/Tests/OrmTestCase.php | 15 +- 212 files changed, 472 insertions(+), 516 deletions(-) diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php index b5a8902fd82..0b2b0663c09 100644 --- a/lib/Doctrine/ORM/AbstractQuery.php +++ b/lib/Doctrine/ORM/AbstractQuery.php @@ -28,7 +28,6 @@ use Doctrine\DBAL\Cache\QueryCacheProfile; use Doctrine\ORM\Cache; -use Doctrine\ORM\Query\QueryException; /** * Base contract for ORM queries. Base class for Query and NativeQuery. diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php index 83fc0d94687..07c9d8f4348 100644 --- a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php +++ b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php @@ -234,7 +234,6 @@ public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $h $data = array(); $entityName = reset($rsm->aliasMap); $hasRelation = ( ! empty($rsm->relationMap)); - $metadata = $this->em->getClassMetadata($entityName); $persister = $this->uow->getEntityPersister($entityName); if ( ! ($persister instanceof CachedPersister)) { diff --git a/lib/Doctrine/ORM/Cache/EntityCacheEntry.php b/lib/Doctrine/ORM/Cache/EntityCacheEntry.php index 3c552073d0f..155618be984 100644 --- a/lib/Doctrine/ORM/Cache/EntityCacheEntry.php +++ b/lib/Doctrine/ORM/Cache/EntityCacheEntry.php @@ -71,7 +71,7 @@ public static function __set_state(array $values) /** * Retrieves the entity data resolving cache entries * - * @param \Doctrine\ORM\EntityManagerInterfac $em + * @param \Doctrine\ORM\EntityManagerInterface $em * * @return array */ diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php index 6a60d505099..08b2ff19344 100644 --- a/lib/Doctrine/ORM/EntityRepository.php +++ b/lib/Doctrine/ORM/EntityRepository.php @@ -19,7 +19,6 @@ namespace Doctrine\ORM; -use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\ResultSetMappingBuilder; use Doctrine\Common\Persistence\ObjectRepository; use Doctrine\Common\Collections\Selectable; diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index 3cedaada0c3..8e45117abc7 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -24,9 +24,6 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\Query; -use Doctrine\ORM\Events; -use Doctrine\ORM\Event\LifecycleEventArgs; -use Doctrine\ORM\Event\PostLoadEventDispatcher; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Proxy\Proxy; diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 1c21369e346..92c77ddd3f3 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -20,7 +20,6 @@ namespace Doctrine\ORM\Internal\Hydration; use PDO; -use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; diff --git a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php index 25c03a45051..525ab34b322 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php @@ -21,7 +21,6 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\ORM\Persisters\SqlExpressionVisitor; use Doctrine\ORM\Persisters\SqlValueVisitor; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\Query; @@ -740,7 +739,7 @@ private function expandCriteriaParameters(Criteria $criteria) $valueVisitor->dispatch($expression); - list($values, $types) = $valueVisitor->getParamsAndTypes(); + list(, $types) = $valueVisitor->getParamsAndTypes(); return $types; } diff --git a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php index d4213f15d3a..0e2fda86815 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php @@ -20,7 +20,6 @@ namespace Doctrine\ORM\Persisters\Collection; use Doctrine\Common\Collections\Criteria; -use Doctrine\Common\Proxy\Proxy; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\Utility\PersisterHelper; diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 072407405d9..0975cf56ef1 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -20,7 +20,6 @@ namespace Doctrine\ORM\Persisters\Entity; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\DBAL\LockMode; use Doctrine\DBAL\Types\Type; diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 8b6feaf83dc..7619359cea7 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -2953,7 +2953,7 @@ public function StringPrimary() /** * EntityExpression ::= SingleValuedAssociationPathExpression | SimpleEntityExpression * - * @return \Doctrine\ORM\Query\AST\SingleValuedAssociationPathExpression | + * @return \Doctrine\ORM\Query\AST\PathExpression | * \Doctrine\ORM\Query\AST\SimpleEntityExpression */ public function EntityExpression() diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index 97bfb4709ae..73eb5ae5aa6 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -19,7 +19,6 @@ namespace Doctrine\ORM\Query; -use Doctrine\DBAL\Types\Type; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\MappingException; diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php index fc431227f6c..92386e46de2 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php @@ -18,18 +18,9 @@ use Doctrine\DBAL\Platforms\PostgreSqlPlatform; use Doctrine\DBAL\Platforms\SQLAnywherePlatform; use Doctrine\DBAL\Platforms\SQLServerPlatform; -use Doctrine\ORM\Query\AST\ArithmeticExpression; -use Doctrine\ORM\Query\AST\ArithmeticFactor; -use Doctrine\ORM\Query\AST\ArithmeticTerm; -use Doctrine\ORM\Query\AST\Literal; use Doctrine\ORM\Query\AST\OrderByClause; -use Doctrine\ORM\Query\AST\OrderByItem; use Doctrine\ORM\Query\AST\PartialObjectExpression; -use Doctrine\ORM\Query\AST\PathExpression; use Doctrine\ORM\Query\AST\SelectExpression; -use Doctrine\ORM\Query\AST\SimpleArithmeticExpression; -use Doctrine\ORM\Query\Expr\OrderBy; -use Doctrine\ORM\Query\Expr\Select; use Doctrine\ORM\Query\SqlWalker; use Doctrine\ORM\Query\AST\SelectStatement; diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php index d65ab6cfe23..fd51fb46bd5 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php @@ -20,7 +20,6 @@ use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Mapping\ClassMetadataInfo; -use Doctrine\ORM\ORMException; use Doctrine\ORM\Query; use Doctrine\ORM\Query\TreeWalkerAdapter; use Doctrine\ORM\Query\AST\Functions\IdentityFunction; diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 7d7da97544c..a66d7b46215 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -49,7 +49,6 @@ use Doctrine\ORM\Persisters\Collection\OneToManyPersister; use Doctrine\ORM\Persisters\Collection\ManyToManyPersister; use Doctrine\ORM\Utility\IdentifierFlattener; -use Doctrine\ORM\Cache\AssociationCacheEntry; /** * The UnitOfWork is responsible for tracking changes to objects during an @@ -1281,7 +1280,7 @@ public function scheduleExtraUpdate($entity, array $changeset) $extraUpdate = array($entity, $changeset); if (isset($this->extraUpdates[$oid])) { - list($ignored, $changeset2) = $this->extraUpdates[$oid]; + list(, $changeset2) = $this->extraUpdates[$oid]; $extraUpdate = array($entity, $changeset + $changeset2); } diff --git a/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php b/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php index deab5239ac9..599c4996f98 100644 --- a/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php +++ b/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php @@ -2,10 +2,12 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\ORM\Mapping\ClassMetadata; + /** * Mock class for ClassMetadata. */ -class ClassMetadataMock extends \Doctrine\ORM\Mapping\ClassMetadata +class ClassMetadataMock extends ClassMetadata { /* Mock API */ diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 5cf9dae4dd7..49ca3e4ea5a 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -1,11 +1,12 @@ _schemaManagerMock == null) { return new SchemaManagerMock($conn); @@ -55,7 +60,7 @@ public function getSchemaManager(\Doctrine\DBAL\Connection $conn) * * @return void */ - public function setDatabasePlatform(\Doctrine\DBAL\Platforms\AbstractPlatform $platform) + public function setDatabasePlatform(AbstractPlatform $platform) { $this->_platformMock = $platform; } @@ -65,7 +70,7 @@ public function setDatabasePlatform(\Doctrine\DBAL\Platforms\AbstractPlatform $p * * @return void */ - public function setSchemaManager(\Doctrine\DBAL\Schema\AbstractSchemaManager $sm) + public function setSchemaManager(AbstractSchemaManager $sm) { $this->_schemaManagerMock = $sm; } @@ -81,7 +86,7 @@ public function getName() /** * {@inheritdoc} */ - public function getDatabase(\Doctrine\DBAL\Connection $conn) + public function getDatabase(Connection $conn) { return; } diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index 74f4efcf0dd..24ecb59efe3 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -21,12 +21,14 @@ namespace Doctrine\Tests\Mocks; -use Doctrine\ORM\Proxy\ProxyFactory; +use Doctrine\Common\EventManager; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\EntityManager; /** * Special EntityManager mock used for testing purposes. */ -class EntityManagerMock extends \Doctrine\ORM\EntityManager +class EntityManagerMock extends EntityManager { /** * @var \Doctrine\ORM\UnitOfWork|null @@ -83,17 +85,16 @@ public function getProxyFactory() * * {@inheritdoc} */ - public static function create($conn, \Doctrine\ORM\Configuration $config = null, - \Doctrine\Common\EventManager $eventManager = null) + public static function create($conn, Configuration $config = null, EventManager $eventManager = null) { if (null === $config) { - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setProxyDir(__DIR__ . '/../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); } if (null === $eventManager) { - $eventManager = new \Doctrine\Common\EventManager(); + $eventManager = new EventManager(); } return new EntityManagerMock($conn, $config, $eventManager); diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 761ec4bc183..6130f58f301 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -3,11 +3,13 @@ namespace Doctrine\Tests\Mocks; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; /** * EntityPersister implementation used for mocking during tests. */ -class EntityPersisterMock extends \Doctrine\ORM\Persisters\Entity\BasicEntityPersister +class EntityPersisterMock extends BasicEntityPersister { /** * @var array @@ -52,7 +54,7 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\Entity\BasicEntityPer public function addInsert($entity) { $this->inserts[] = $entity; - if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == \Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY + if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == ClassMetadata::GENERATOR_TYPE_IDENTITY || $this->class->isIdGeneratorIdentity()) { $id = $this->identityColumnValueCounter++; $this->postInsertIds[] = array( diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index 5930db12c70..7afec2c607e 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -2,13 +2,15 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\DBAL\Driver\Statement; + /** * This class is a mock of the Statement interface that can be passed in to the Hydrator * to test the hydration standalone with faked result sets. * * @author Roman Borschel */ -class HydratorMockStatement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement +class HydratorMockStatement implements \IteratorAggregate, Statement { /** * @var array diff --git a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php index 21339c5f96e..b691ec02c3a 100644 --- a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php +++ b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php @@ -2,15 +2,18 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; +use Doctrine\Common\Persistence\Mapping\ClassMetadata; + /** * Mock class for MappingDriver. */ -class MetadataDriverMock implements \Doctrine\Common\Persistence\Mapping\Driver\MappingDriver +class MetadataDriverMock implements MappingDriver { /** * {@inheritdoc} */ - public function loadMetadataForClass($className, \Doctrine\Common\Persistence\Mapping\ClassMetadata $metadata) + public function loadMetadataForClass($className, ClassMetadata $metadata) { } diff --git a/tests/Doctrine/Tests/Mocks/MockTreeWalker.php b/tests/Doctrine/Tests/Mocks/MockTreeWalker.php index fd6c818152f..0edb8581a79 100644 --- a/tests/Doctrine/Tests/Mocks/MockTreeWalker.php +++ b/tests/Doctrine/Tests/Mocks/MockTreeWalker.php @@ -2,10 +2,12 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\ORM\Query\TreeWalkerAdapter; + /** * Mock class for TreeWalker. */ -class MockTreeWalker extends \Doctrine\ORM\Query\TreeWalkerAdapter +class MockTreeWalker extends TreeWalkerAdapter { /** * {@inheritdoc} diff --git a/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php b/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php index 02c7c0a7980..5de33a049ec 100644 --- a/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php @@ -2,15 +2,18 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\DBAL\Connection; +use Doctrine\DBAL\Schema\AbstractSchemaManager; + /** * Mock class for AbstractSchemaManager. */ -class SchemaManagerMock extends \Doctrine\DBAL\Schema\AbstractSchemaManager +class SchemaManagerMock extends AbstractSchemaManager { /** * @param \Doctrine\DBAL\Connection $conn */ - public function __construct(\Doctrine\DBAL\Connection $conn) + public function __construct(Connection $conn) { parent::__construct($conn); } diff --git a/tests/Doctrine/Tests/Mocks/SequenceMock.php b/tests/Doctrine/Tests/Mocks/SequenceMock.php index 4f512300494..fc6c10f41a4 100644 --- a/tests/Doctrine/Tests/Mocks/SequenceMock.php +++ b/tests/Doctrine/Tests/Mocks/SequenceMock.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\Mocks; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Id\SequenceGenerator; /** * Mock class for SequenceGenerator. */ -class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator +class SequenceMock extends SequenceGenerator { /** * @var int diff --git a/tests/Doctrine/Tests/Mocks/StatementMock.php b/tests/Doctrine/Tests/Mocks/StatementMock.php index 40ad1f3e5f7..8107ff1beb1 100644 --- a/tests/Doctrine/Tests/Mocks/StatementMock.php +++ b/tests/Doctrine/Tests/Mocks/StatementMock.php @@ -2,12 +2,14 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\DBAL\Driver\Statement; + /** * This class is a mock of the Statement interface. * * @author Alexander */ -class StatementMock implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement +class StatementMock implements \IteratorAggregate, Statement { /** * {@inheritdoc} diff --git a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php index c846bca1cd4..3d7361e7f8e 100644 --- a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php +++ b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php @@ -2,10 +2,12 @@ namespace Doctrine\Tests\Mocks; +use Doctrine\ORM\UnitOfWork; + /** * Mock class for UnitOfWork. */ -class UnitOfWorkMock extends \Doctrine\ORM\UnitOfWork +class UnitOfWorkMock extends UnitOfWork { /** * @var array diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php index cc9803d448e..effedc3c4b1 100644 --- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php +++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\Models\DDC3579; -use Doctrine\Common\Collections\ArrayCollection; - /** * @Entity * @AssociationOverrides({ diff --git a/tests/Doctrine/Tests/Models/DDC753/DDC753InvalidRepository.php b/tests/Doctrine/Tests/Models/DDC753/DDC753InvalidRepository.php index 9f0937aa1e9..decc07078a4 100644 --- a/tests/Doctrine/Tests/Models/DDC753/DDC753InvalidRepository.php +++ b/tests/Doctrine/Tests/Models/DDC753/DDC753InvalidRepository.php @@ -20,8 +20,6 @@ namespace Doctrine\Tests\Models\DDC753; -use Doctrine\ORM\EntityRepository; - class DDC753InvalidRepository { diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php index 464471b3174..110326b2c93 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\Models\DDC964; -use Doctrine\Common\Collections\ArrayCollection; - /** * @Entity * @AssociationOverrides({ diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php index 935ee59c0a2..cb64d15fae8 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\Models\DDC964; -use Doctrine\Common\Collections\ArrayCollection; - /** * @Entity * @AttributeOverrides({ diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php index ac383414598..4b955be914b 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\Models\Legacy; -use Doctrine\Common\Collections\ArrayCollection; - /** * @Entity * @Table(name="legacy_cars") diff --git a/tests/Doctrine/Tests/Models/StockExchange/Bond.php b/tests/Doctrine/Tests/Models/StockExchange/Bond.php index a93586f5ebe..a0d37bfe858 100644 --- a/tests/Doctrine/Tests/Models/StockExchange/Bond.php +++ b/tests/Doctrine/Tests/Models/StockExchange/Bond.php @@ -1,7 +1,6 @@ 'foo')); - $region1 = new DefaultRegion('region1', new \Doctrine\Common\Cache\ApcCache()); - $region2 = new DefaultRegion('region2', new \Doctrine\Common\Cache\ApcCache()); + $region1 = new DefaultRegion('region1', new ApcCache()); + $region2 = new DefaultRegion('region2', new ApcCache()); $this->assertFalse($region1->contains($key)); $this->assertFalse($region2->contains($key)); diff --git a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php index 091ec672a8f..65d21b93fbe 100644 --- a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php @@ -2,12 +2,10 @@ namespace Doctrine\Tests\ORM\Cache; -use Doctrine\Common\Cache\ArrayCache; use Doctrine\Tests\Mocks\CacheEntryMock; use Doctrine\Tests\Mocks\CacheKeyMock; use Doctrine\ORM\Cache\Region\DefaultMultiGetRegion; use Doctrine\ORM\Cache\CollectionCacheEntry; -use Doctrine\ORM\Cache\EntityCacheKey; /** * @author Asmir Mustafic diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php index 0d767aca9d9..e93924d4a0a 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Cache\Persister\Collection; +use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\OrmTestCase; use Doctrine\ORM\Cache\Region; @@ -101,7 +102,7 @@ protected function createCollection($owner, $assoc = null, $class = null, $eleme $em = $this->em; $class = $class ?: $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\State'); $assoc = $assoc ?: $class->associationMappings['cities']; - $coll = new \Doctrine\ORM\PersistentCollection($em, $class, $elements ?: new ArrayCollection); + $coll = new PersistentCollection($em, $class, $elements ?: new ArrayCollection); $coll->setOwner($owner, $assoc); $coll->setInitialized(true); diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php index e9bf04459ab..770ec7deb21 100644 --- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php +++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php @@ -4,6 +4,7 @@ use Doctrine\ORM\Internal\CommitOrderCalculator; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\OrmTestCase; /** * Tests of the commit order calculation. @@ -12,7 +13,7 @@ * can have many valid orderings, so you may want to build a graph that has only * 1 valid order to simplify your tests. */ -class CommitOrderCalculatorTest extends \Doctrine\Tests\OrmTestCase +class CommitOrderCalculatorTest extends OrmTestCase { private $_calc; diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index cb9ec66bead..0431eff39fc 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -6,7 +6,6 @@ use Doctrine\Common\Cache\ArrayCache; use Doctrine\ORM\Mapping as AnnotationNamespace; use Doctrine\ORM\Configuration; -use Doctrine\ORM\ORMException; use ReflectionClass; use PHPUnit_Framework_TestCase; diff --git a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php index 849f579fa0a..fb2c4ea42b9 100644 --- a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php +++ b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\ORM\Decorator; -use Doctrine\ORM\Decorator\EntityManagerDecorator; -use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\ResultSetMapping; class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase diff --git a/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php b/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php index 4cf98ec5e75..117525eca32 100644 --- a/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php +++ b/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php @@ -2,7 +2,9 @@ namespace Doctrine\Tests\ORM\Entity; -class ConstructorTest extends \Doctrine\Tests\OrmTestCase +use Doctrine\Tests\OrmTestCase; + +class ConstructorTest extends OrmTestCase { public function testFieldInitializationInConstructor() { diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index 37a444a606c..797e601738a 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -2,7 +2,10 @@ namespace Doctrine\Tests\ORM; -class EntityManagerTest extends \Doctrine\Tests\OrmTestCase +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\OrmTestCase; + +class EntityManagerTest extends OrmTestCase { private $_em; @@ -54,7 +57,7 @@ public function testGetEventManager() public function testCreateNativeQuery() { - $rsm = new \Doctrine\ORM\Query\ResultSetMapping(); + $rsm = new ResultSetMapping(); $query = $this->_em->createNativeQuery('SELECT foo', $rsm); $this->assertSame('SELECT foo', $query->getSql()); @@ -65,7 +68,7 @@ public function testCreateNativeQuery() */ public function testCreateNamedNativeQuery() { - $rsm = new \Doctrine\ORM\Query\ResultSetMapping(); + $rsm = new ResultSetMapping(); $this->_em->getConfiguration()->addNamedNativeQuery('foo', 'SELECT foo', $rsm); $query = $this->_em->createNamedNativeQuery('foo'); diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php index 7302a1d6f0b..67038a7818f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php @@ -4,7 +4,6 @@ use Doctrine\Tests\Models\Company\CompanyEmployee, Doctrine\Tests\Models\Company\CompanyManager, - Doctrine\Tests\Models\Company\CompanyPerson, Doctrine\Tests\Models\Company\CompanyCar; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index 29f8fab852f..42a75be140b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -2,12 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\ORM\Tools\SchemaTool; use Doctrine\ORM\Query; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; -use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Tests\Models\CMS\CmsComment; diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 9fa1cb8af73..f8dd3b7a582 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -6,10 +6,8 @@ Doctrine\Tests\Models\Company\CompanyEmployee, Doctrine\Tests\Models\Company\CompanyManager, Doctrine\Tests\Models\Company\CompanyOrganization, - Doctrine\Tests\Models\Company\CompanyEvent, Doctrine\Tests\Models\Company\CompanyAuction, - Doctrine\Tests\Models\Company\CompanyRaffle, - Doctrine\Tests\Models\Company\CompanyCar; + Doctrine\Tests\Models\Company\CompanyRaffle; use Doctrine\Common\Collections\Criteria; diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index 85d58888062..bc6c0cdd7f2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -6,7 +6,6 @@ use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsArticle; -use Doctrine\ORM\UnitOfWork; /** * Description of DetachedEntityTest diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index 705802306c9..8e20d570a7b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -5,7 +5,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\Tests\Models\CMS\CmsAddress; -use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\ArrayCollection; diff --git a/tests/Doctrine/Tests/ORM/Functional/HydrationCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/HydrationCacheTest.php index 9dc556d4b80..dc84ac4ed1f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/HydrationCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/HydrationCacheTest.php @@ -1,4 +1,5 @@ name = "Benjamin"; $user->username = "beberlei"; $user->status = 'active'; diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index c7bdf6bf810..e69d3ee6aa3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -2,15 +2,14 @@ namespace Doctrine\Tests\ORM\Functional\Locking; -use Doctrine\Tests\Models\CMS\CmsArticle, - Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\DBAL\LockMode, - Doctrine\ORM\EntityManager; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\DBAL\LockMode; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group locking_functional */ -class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase +class GearmanLockTest extends OrmFunctionalTestCase { private $gearman = null; private $maxRunTime = 0; diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index c2d3c7315e3..1face5f3115 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php @@ -4,8 +4,7 @@ use Doctrine\Tests\Models\CMS\CmsArticle, Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\DBAL\LockMode, - Doctrine\ORM\EntityManager; + Doctrine\DBAL\LockMode; /** * @group locking diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index df55bd798e2..e4cad517168 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -2,15 +2,12 @@ namespace Doctrine\Tests\ORM\Functional\Locking; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\OptimisticLockException; -use Doctrine\Common\EventManager; -use Doctrine\ORM\Mapping\ClassMetadataFactory; -use Doctrine\Tests\TestUtil; use Doctrine\DBAL\LockMode; use DateTime; +use Doctrine\Tests\OrmFunctionalTestCase; -class OptimisticTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OptimisticTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php index b534a5cb4e2..43af6720c83 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php @@ -2,15 +2,14 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\ORM\OptimisticLockException; -use Doctrine\ORM\ORMException; use Doctrine\Tests\Models\VersionedManyToOne\Article; use Doctrine\Tests\Models\VersionedManyToOne\Category; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group MergeVersionedOneToMany */ -class MergeVersionedManyToOneTest extends \Doctrine\Tests\OrmFunctionalTestCase +class MergeVersionedManyToOneTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php index e10c1f9236b..345d6190cba 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php @@ -3,7 +3,6 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\Tests\Models\CMS\CmsAddress, Doctrine\Tests\Models\CMS\CmsPhonenumber; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php index 98e30780067..528bf56b3c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php @@ -4,8 +4,7 @@ use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsEmail, - Doctrine\Tests\Models\CMS\CmsAddress, - Doctrine\Tests\Models\CMS\CmsPhonenumber; + Doctrine\Tests\Models\CMS\CmsAddress; /** * Tests a bidirectional one-to-one association mapping with orphan removal. diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php index af93793271f..b677df624d1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php @@ -2,10 +2,6 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceProduct; -use Doctrine\Tests\Models\ECommerce\ECommerceShipping; -use Doctrine\ORM\Mapping\AssociationMapping; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; use Doctrine\Tests\Models\OneToOneSingleTableInheritance\Cat; use Doctrine\Tests\Models\OneToOneSingleTableInheritance\LitterBox; diff --git a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php index 592706588b7..1528404dfdd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php @@ -2,8 +2,8 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Common\Util\ClassUtils; use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Test that Doctrine ORM correctly works with proxy instances exactly like with ordinary Entities @@ -13,7 +13,7 @@ * b) __initialized__ = false and identifier set in proxy and in property * @todo All other cases would cause lazy loading */ -class ProxiesLikeEntitiesTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase { /** * @var CmsUser diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php index 039bb165532..f84147374c5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Common\Cache\ArrayCache; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 2e6dbc3c6a7..922c463a90b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\DBAL\Connection; use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsArticle, Doctrine\Tests\Models\CMS\CmsPhonenumber; diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php index 831d0b5640e..bbf688c46b3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php @@ -4,7 +4,7 @@ use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\Query\Filter\SQLFilter; -use Doctrine\ORM\Mapping\ClassMetaData; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Common\Cache\ArrayCache; use Doctrine\ORM\Mapping\ClassMetadataInfo; diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php index 0c76edf7315..8887a0751c0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php @@ -10,7 +10,7 @@ public function setUp() { parent::setUp(); - $conn = $this->_em->getConnection(); + $this->_em->getConnection(); $this->schemaTool = new Tools\SchemaTool($this->_em); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php index 4df6032d0ed..a923c40fca3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php @@ -2,10 +2,10 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; -use Doctrine\ORM\Tools\SchemaTool, - Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Tools\SchemaTool; +use Doctrine\Tests\OrmFunctionalTestCase; -class MySqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase +class MySqlSchemaToolTest extends OrmFunctionalTestCase { protected function setUp() { parent::setUp(); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php index 52151e4ba87..66e9906883b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php @@ -2,8 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; -use Doctrine\ORM\Tools\SchemaTool, - Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Tools\SchemaTool; class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase { diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php index 948aad2efe1..c09f336c979 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\Tools\SchemaValidator; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php index e84be7e0760..316620f82d2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php @@ -2,10 +2,8 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\Cache\Action; use Doctrine\Tests\Models\Cache\Address; use Doctrine\Tests\Models\Cache\Client; -use Doctrine\Tests\Models\Cache\ComplexAction; use Doctrine\Tests\Models\Cache\Person; use Doctrine\Tests\Models\Cache\Token; use Doctrine\Tests\Models\Cache\Traveler; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php index 1b7c5b5212f..988e8ba99d2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php @@ -2,14 +2,14 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1040 */ -class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1040Test extends OrmFunctionalTestCase { public function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php index 0cf14aecc82..ee1218187bc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1041 */ -class DDC1041Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1041Test extends OrmFunctionalTestCase { public function setUp() { @@ -17,7 +18,7 @@ public function setUp() public function testGrabWrongSubtypeReturnsNull() { - $fix = new \Doctrine\Tests\Models\Company\CompanyFixContract(); + $fix = new CompanyFixContract(); $fix->setFixPrice(2000); $this->_em->persist($fix); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php index babb438442d..f3e255042c9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1043 */ -class DDC1043Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1043Test extends OrmFunctionalTestCase { public function setUp() { @@ -17,7 +18,7 @@ public function setUp() public function testChangeSetPlusWeirdPHPCastingIntCastingRule() { - $user = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user = new CmsUser(); $user->name = "John Galt"; $user->username = "jgalt"; $user->status = "+44"; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php index d956054253b..98de7ee38aa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1050 */ -class DDC1050Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1050Test extends OrmFunctionalTestCase { public function setUp() { @@ -21,7 +22,7 @@ public function setUp() public function testPerformance() { for ($i = 2; $i < 10000; ++$i) { - $user = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user = new CmsUser(); $user->status = 'developer'; $user->username = 'jwage'+$i; $user->name = 'Jonathan'; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php index 500b4e1e195..cd678d5f1de 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php @@ -2,10 +2,12 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\OrmFunctionalTestCase; + /** * @group DDC-1080 */ -class DDC1080Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1080Test extends OrmFunctionalTestCase { public function testHydration() { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php index 335c89dce43..e40f27994d0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; - /** * @group DDC-1113 * @group DDC-1306 diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php index 70d2e9fea82..1f59d07baeb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; - /** * @group DDC-1129 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php index 5a6d2e599a0..b6d82816c0f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -2,7 +2,9 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -class DDC1181Test extends \Doctrine\Tests\OrmFunctionalTestCase +use Doctrine\Tests\OrmFunctionalTestCase; + +class DDC1181Test extends OrmFunctionalTestCase { public function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php index 8e77ff0a39e..a4ecf5d39e5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php @@ -1,9 +1,10 @@ markTestSkipped("PostgreSQL only test."); } - $sql = $this->_schemaTool->getCreateSchemaSQL(array( + $sql = $this->_schemaTool->getCreateSchemaSql(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote') )); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php index ad5fc43179c..fb6ae25e63f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php @@ -1,7 +1,6 @@ _schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php index 949091f7750..42aeca43e3c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php @@ -10,9 +10,9 @@ */ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase { - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256Group') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php index 6a4066c1900..ca3ee1a50cd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php @@ -12,9 +12,9 @@ class DDC2306Test extends \Doctrine\Tests\OrmFunctionalTestCase /** * {@inheritDoc} */ - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Zone'), diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php index 8832b0f507b..3d2781763e9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php @@ -18,9 +18,9 @@ class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase /** * {@inheritDoc} */ - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Foo'), diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php index c1189d797c4..324e5e7eb98 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\ORM\Mapping\ClassMetadataFactory; - /** * @group DDC-2359 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index 39b918d26b3..d9dca3752c9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -1,7 +1,10 @@ _schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php index 94c3d60f0be..d52953d60ac 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php @@ -13,9 +13,9 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase /** * {@inheritDoc} */ - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); try { $this->_schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php index a071d4c0cdc..6198663e601 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php @@ -10,9 +10,9 @@ class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase /** * {@inheritDoc} */ - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); try { $this->_schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php index 0ba50564fc8..87c94cb8446 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php @@ -16,9 +16,9 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase /** * {@inheritDoc} */ - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); $platform = $this->_em->getConnection()->getDatabasePlatform(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php index 30724b2c781..09d7415d2f9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php @@ -2,9 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ORM\Event\LifecycleEventArgs; - /** * @group DDC-2996 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php index af1fcdc87c1..402c4374a41 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php @@ -1,7 +1,10 @@ _schemaTool->createSchema( array( diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php index 88da3268fd1..92df8d22fd0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php @@ -2,15 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\Company\CompanyPerson, - Doctrine\Tests\Models\Company\CompanyEmployee, - Doctrine\Tests\Models\Company\CompanyManager, - Doctrine\Tests\Models\Company\CompanyOrganization, - Doctrine\Tests\Models\Company\CompanyEvent, - Doctrine\Tests\Models\Company\CompanyAuction, - Doctrine\Tests\Models\Company\CompanyRaffle, - Doctrine\Tests\Models\Company\CompanyCar; - /** * Functional tests for the Class Table Inheritance mapping strategy. * diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php index a2eff6b5720..b33f9a4487e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php @@ -1,7 +1,5 @@ _assignedGen->generate($this->_em, $entity); $this->fail('Assigned generator did not throw exception even though ID was missing.'); - } catch (\Doctrine\ORM\ORMException $expected) {} + } catch (ORMException $expected) {} try { $entity = new AssignedCompositeIdEntity; $this->_assignedGen->generate($this->_em, $entity); $this->fail('Assigned generator did not throw exception even though ID was missing.'); - } catch (\Doctrine\ORM\ORMException $expected) {} + } catch (ORMException $expected) {} } public function testCorrectIdGeneration() diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index 41338497197..5d7f7a59b7f 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -3,13 +3,14 @@ namespace Doctrine\Tests\ORM\Id; use Doctrine\ORM\Id\SequenceGenerator; +use Doctrine\Tests\OrmTestCase; /** * Description of SequenceGeneratorTest * * @author robo */ -class SequenceGeneratorTest extends \Doctrine\Tests\OrmTestCase +class SequenceGeneratorTest extends OrmTestCase { private $_em; private $_seqGen; diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php index 92da34cda98..03f8bf1540b 100644 --- a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php @@ -4,16 +4,14 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\LazyCriteriaCollection; -use Doctrine\Tests\Mocks\ConnectionMock; use stdClass; -use PHPUnit_Framework_TestCase; /** * @author Marco Pivetta * * @covers \Doctrine\ORM\LazyCriteriaCollection */ -class LazyCriteriaCollectionTest extends PHPUnit_Framework_TestCase +class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase { /** * @var \Doctrine\ORM\Persisters\Entity\EntityPersister|\PHPUnit_Framework_MockObject_MockObject diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 7410979e08c..f3f0506b17a 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -2,19 +2,21 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Events; -use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\DiscriminatorColumn; use Doctrine\ORM\Mapping\Id; -use Doctrine\Tests\Models\Company\CompanyFixContract; -use Doctrine\Tests\Models\Company\CompanyFlexContract; +use Doctrine\ORM\Mapping\UnderscoreNamingStrategy; use Doctrine\Tests\Models\Cache\City; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable; use Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName; +use Doctrine\Tests\OrmTestCase; -abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase +abstract class AbstractMappingDriverTest extends OrmTestCase { abstract protected function _loadDriver(); @@ -23,7 +25,7 @@ public function createClassMetadata($entityClassName) $mappingDriver = $this->_loadDriver(); $class = new ClassMetadata($entityClassName); - $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $class->initializeReflection(new RuntimeReflectionService()); $mappingDriver->loadMetadataForClass($entityClassName, $class); return $class; @@ -33,11 +35,11 @@ public function createClassMetadata($entityClassName) * @param \Doctrine\ORM\EntityManager $entityClassName * @return \Doctrine\ORM\Mapping\ClassMetadataFactory */ - protected function createClassMetadataFactory(\Doctrine\ORM\EntityManager $em = null) + protected function createClassMetadataFactory(EntityManager $em = null) { $driver = $this->_loadDriver(); $em = $em ?: $this->_getTestEntityManager(); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $em->getConfiguration()->setMetadataDriverImpl($driver); $factory->setEntityManager($em); @@ -488,7 +490,7 @@ public function testNamingStrategy() $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy()); - $em->getConfiguration()->setNamingStrategy(new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER)); + $em->getConfiguration()->setNamingStrategy(new UnderscoreNamingStrategy(CASE_UPPER)); $this->assertInstanceOf('Doctrine\ORM\Mapping\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy()); $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index e1838dfe8b3..4b44d1d41de 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -2,10 +2,11 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Annotations\AnnotationReader; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\ORM\Events; -use Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable; -use Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName; +use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Mapping\Driver\AnnotationDriver; class AnnotationDriverTest extends AbstractMappingDriverTest { @@ -15,9 +16,9 @@ class AnnotationDriverTest extends AbstractMappingDriverTest public function testLoadMetadataForNonEntityThrowsException() { $cm = new ClassMetadata('stdClass'); - $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); - $annotationDriver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader); + $cm->initializeReflection(new RuntimeReflectionService()); + $reader = new AnnotationReader(); + $annotationDriver = new AnnotationDriver($reader); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException'); $annotationDriver->loadMetadataForClass('stdClass', $cm); @@ -42,7 +43,7 @@ public function testFailingSecondLevelCacheAssociation() public function testColumnWithMissingTypeDefaultsToString() { $cm = new ClassMetadata('Doctrine\Tests\ORM\Mapping\ColumnWithoutType'); - $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $cm->initializeReflection(new RuntimeReflectionService()); $annotationDriver = $this->_loadDriver(); $annotationDriver->loadMetadataForClass('Doctrine\Tests\ORM\Mapping\InvalidColumn', $cm); @@ -134,7 +135,7 @@ public function testJoinTablesWithMappedSuperclassForAnnotationDriver() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $classPage = $factory->getMetadataFor('Doctrine\Tests\Models\DirectoryTree\File'); @@ -153,7 +154,7 @@ public function testInvalidMappedSuperClassWithManyToManyAssociation() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', @@ -171,7 +172,7 @@ public function testInvalidMappedSuperClassWithInheritanceInformation() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', @@ -187,10 +188,9 @@ public function testInheritanceSkipsParentLifecycleCallbacks() { $annotationDriver = $this->_loadDriver(); - $cm = new ClassMetadata('Doctrine\Tests\ORM\Mapping\AnnotationChild'); $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationChild'); @@ -209,7 +209,7 @@ public function testMappedSuperclassInMiddleOfInheritanceHierarchy() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\ChildEntity'); @@ -221,7 +221,7 @@ public function testInvalidFetchOptionThrowsException() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $this->setExpectedException('Doctrine\Common\Annotations\AnnotationException', diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php index 8cec99717e1..d5f2a973837 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\AnsiQuoteStrategy; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\OrmTestCase; @@ -39,7 +40,7 @@ protected function setUp() private function createClassMetadata($className) { $class = new ClassMetadata($className); - $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $class->initializeReflection(new RuntimeReflectionService()); return $class; } diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 5a5f64277e7..977c1fa2618 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -6,8 +6,9 @@ use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Tests\Models\DDC869\DDC869Payment; +use Doctrine\Tests\OrmTestCase; -class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase +class BasicInheritanceMappingTest extends OrmTestCase { /** * @var ClassMetadataFactory diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php index d8824e767c2..58ee64a4227 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php @@ -19,13 +19,15 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-659 */ -class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase +class ClassMetadataBuilderTest extends OrmTestCase { /** * @var ClassMetadata @@ -39,7 +41,7 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase public function setUp() { $this->cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $this->cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $this->cm->initializeReflection(new RuntimeReflectionService()); $this->builder = new ClassMetadataBuilder($this->cm); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index 4cabaec88f0..71dc598a8c4 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -3,6 +3,8 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\EventManager; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; +use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Event\OnClassMetadataNotFoundEventArgs; use Doctrine\ORM\Events; @@ -13,8 +15,9 @@ use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\MetadataDriverMock; +use Doctrine\Tests\OrmTestCase; -class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase +class ClassMetadataFactoryTest extends OrmTestCase { public function testGetMetadataForSingleClass() { @@ -219,7 +222,7 @@ public function testGetAllMetadataWorksWithBadConnection() protected function _createEntityManager($metadataDriver, $conn = null) { $driverMock = new DriverMock(); - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setProxyDir(__DIR__ . '/../../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); @@ -251,7 +254,7 @@ protected function _createValidClassMetadata() { // Self-made metadata $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1'); - $cm1->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $cm1->initializeReflection(new RuntimeReflectionService()); $cm1->setPrimaryTable(array('name' => '`group`')); // Add a mapped field $cm1->mapField(array('fieldName' => 'name', 'type' => 'string')); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php index 2d949aeef45..04cea38944c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php @@ -2,10 +2,11 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmTestCase; -class ClassMetadataLoadEventTest extends \Doctrine\Tests\OrmTestCase +class ClassMetadataLoadEventTest extends OrmTestCase { /** * @group DDC-1610 @@ -22,7 +23,7 @@ public function testEvent() $this->assertInstanceOf('ReflectionProperty', $classMetadata->reflFields['about']); } - public function loadClassMetadata(\Doctrine\ORM\Event\LoadClassMetadataEventArgs $eventArgs) + public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) { $classMetadata = $eventArgs->getClassMetadata(); $field = array( diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 2a7b65002f4..e324c372966 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -7,10 +7,13 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Events; use Doctrine\ORM\Mapping\DefaultNamingStrategy; +use Doctrine\ORM\Mapping\UnderscoreNamingStrategy; +use Doctrine\Tests\OrmTestCase; +use Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser; require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php'; -class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase +class ClassMetadataTest extends OrmTestCase { public function testClassMetadataInstanceSerialization() { @@ -329,7 +332,7 @@ public function testDefaultJoinColumnName() */ public function testUnderscoreNamingStrategyDefaults() { - $namingStrategy = new \Doctrine\ORM\Mapping\UnderscoreNamingStrategy(CASE_UPPER); + $namingStrategy = new UnderscoreNamingStrategy(CASE_UPPER); $oneToOneMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); @@ -724,8 +727,8 @@ public function testSerializeEntityListeners() $metadata = new ClassMetadata('Doctrine\Tests\Models\Company\CompanyContract'); $metadata->initializeReflection(new RuntimeReflectionService()); - $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); - $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); + $metadata->addEntityListener(Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); + $metadata->addEntityListener(Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); $serialize = serialize($metadata); $unserialize = unserialize($serialize); @@ -814,7 +817,7 @@ public function testNamingCollisionSqlResultSetMappingShouldThrowException() */ public function testClassCaseSensitivity() { - $user = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user = new CmsUser(); $cm = new ClassMetadata('DOCTRINE\TESTS\MODELS\CMS\CMSUSER'); $cm->initializeReflection(new RuntimeReflectionService()); diff --git a/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php b/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php index 64007b0319f..bef03b9ba16 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\DefaultEntityListenerResolver; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-1955 */ -class EntityListenerResolverTest extends \Doctrine\Tests\OrmTestCase +class EntityListenerResolverTest extends OrmTestCase { /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php index f882dacc40e..3d759aade95 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php @@ -21,8 +21,9 @@ use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Tests\OrmTestCase; -class FieldBuilderTest extends \Doctrine\Tests\OrmTestCase +class FieldBuilderTest extends OrmTestCase { public function testCustomIdGeneratorCanBeSet() { diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php index 16f0fe576db..6274a146800 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php @@ -6,11 +6,12 @@ use Doctrine\ORM\Mapping\DefaultNamingStrategy; use Doctrine\ORM\Mapping\NamingStrategy; use Doctrine\Tests\ORM\Mapping\NamingStrategy\JoinColumnClassNamingStrategy; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-559 */ -class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase +class NamingStrategyTest extends OrmTestCase { /** * @return DefaultNamingStrategy diff --git a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php index 14245554226..cfc7f0cc8d7 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php @@ -3,8 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\Common\Persistence\Mapping\Driver\PHPDriver, - Doctrine\ORM\Tools\Export\ClassMetadataExporter; + Doctrine\Common\Persistence\Mapping\Driver\PHPDriver; class PHPMappingDriverTest extends AbstractMappingDriverTest { diff --git a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php index 0cb60fde419..0b736dd0b59 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php @@ -2,14 +2,15 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\DefaultQuoteStrategy; -use Doctrine\ORM\Mapping\QuoteStrategy; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-1845 */ -class QuoteStrategyTest extends \Doctrine\Tests\OrmTestCase +class QuoteStrategyTest extends OrmTestCase { /** @@ -37,7 +38,7 @@ protected function setUp() private function createClassMetadata($className) { $cm = new ClassMetadata($className); - $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $cm->initializeReflection(new RuntimeReflectionService()); return $cm; } @@ -73,7 +74,7 @@ public function testGetTableName() $this->assertEquals('"cms_user"' ,$this->strategy->getTableName($cm, $this->platform)); $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $cm->initializeReflection(new RuntimeReflectionService()); $cm->setPrimaryTable(array('name'=>'cms_user')); $this->assertEquals('cms_user' ,$this->strategy->getTableName($cm, $this->platform)); } @@ -189,7 +190,7 @@ public function testReferencedJoinColumnName() } } -class MyQuoteStrategy extends \Doctrine\ORM\Mapping\DefaultQuoteStrategy +class MyQuoteStrategy extends DefaultQuoteStrategy { } diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php index 99e436ae866..2056c1da0d9 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php @@ -96,18 +96,4 @@ protected function tearDown() abstract protected function getFileExtension(); abstract protected function getDriver(array $paths = array()); - - private function setField($obj, $field, $value) - { - $ref = new \ReflectionProperty($obj, $field); - $ref->setAccessible(true); - $ref->setValue($obj, $value); - } - - private function invoke($obj, $method, array $args = array()) { - $ref = new \ReflectionMethod($obj, $method); - $ref->setAccessible(true); - - return $ref->invokeArgs($obj, $args); - } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index c2822f1780e..735c16ed586 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\Driver\XmlDriver; @@ -19,7 +20,7 @@ public function testClassTableInheritanceDiscriminatorMap() $mappingDriver = $this->_loadDriver(); $class = new ClassMetadata($className); - $class->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $class->initializeReflection(new RuntimeReflectionService()); $mappingDriver->loadMetadataForClass($className, $class); $expectedMap = array( diff --git a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php index 95d6c7f9a27..c752c6a82ee 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php @@ -3,8 +3,8 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\Driver\XmlDriver, Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Mapping\ClassMetadataFactory; class YamlMappingDriverTest extends AbstractMappingDriverTest { @@ -29,7 +29,7 @@ public function testJoinTablesWithMappedSuperclassForYamlDriver() $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($yamlDriver); - $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); $classPage = new ClassMetadata('Doctrine\Tests\Models\DirectoryTree\File'); diff --git a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php index 5b307eba176..210f72c80cf 100644 --- a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php +++ b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php @@ -5,12 +5,13 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmPerformanceTestCase; /** * @group performance * @group DDC-2602 */ -class DDC2602Test extends \Doctrine\Tests\OrmPerformanceTestCase +class DDC2602Test extends OrmPerformanceTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php index ab6e3259ccb..e4d65e1e72d 100644 --- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php @@ -2,9 +2,13 @@ namespace Doctrine\Tests\ORM\Performance; +use Doctrine\ORM\Internal\Hydration\ArrayHydrator; +use Doctrine\ORM\Internal\Hydration\ObjectHydrator; +use Doctrine\ORM\Internal\Hydration\ScalarHydrator; use Doctrine\Tests\Mocks\HydratorMockStatement, Doctrine\ORM\Query\ResultSetMapping, Doctrine\ORM\Query; +use Doctrine\Tests\OrmPerformanceTestCase; /** * Tests to prevent serious performance regressions. @@ -15,7 +19,7 @@ * @author robo * @group performance */ -class HydrationPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase +class HydrationPerformanceTest extends OrmPerformanceTestCase { /** * Times for comparison: @@ -66,7 +70,7 @@ public function testSimpleQueryScalarHydrationPerformance10000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); + $hydrator = new ScalarHydrator($this->_em); $this->setMaxRunningTime(1); $s = microtime(true); @@ -124,7 +128,7 @@ public function testSimpleQueryArrayHydrationPerformance10000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); + $hydrator = new ArrayHydrator($this->_em); $this->setMaxRunningTime(2); $s = microtime(true); @@ -198,7 +202,7 @@ public function testMixedQueryFetchJoinArrayHydrationPerformance10000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); + $hydrator = new ArrayHydrator($this->_em); $this->setMaxRunningTime(3); $s = microtime(true); @@ -254,7 +258,7 @@ public function testSimpleQueryPartialObjectHydrationPerformance10000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); + $hydrator = new ObjectHydrator($this->_em); $this->setMaxRunningTime(3); $s = microtime(true); @@ -310,7 +314,7 @@ public function testSimpleQueryFullObjectHydrationPerformance10000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); + $hydrator = new ObjectHydrator($this->_em); $this->setMaxRunningTime(5); $s = microtime(true); @@ -382,7 +386,7 @@ public function testMixedQueryFetchJoinPartialObjectHydrationPerformance2000Rows } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); + $hydrator = new ObjectHydrator($this->_em); $this->setMaxRunningTime(1); $s = microtime(true); @@ -447,7 +451,7 @@ public function testMixedQueryFetchJoinFullObjectHydrationPerformance2000Rows() } $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); + $hydrator = new ObjectHydrator($this->_em); $this->setMaxRunningTime(1); $s = microtime(true); diff --git a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php index b18fe285054..2104587aea4 100644 --- a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php @@ -2,13 +2,17 @@ namespace Doctrine\Tests\ORM\Performance; -use Doctrine\ORM\Tools\SchemaTool; use Doctrine\ORM\Query; +use Doctrine\Tests\Models\Company\CompanyEmployee; +use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\Models\Company\CompanyFlexContract; +use Doctrine\Tests\Models\Company\CompanyFlexUltraContract; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group performance */ -class InheritancePersisterPerformanceTest extends \Doctrine\Tests\OrmFunctionalTestCase +class InheritancePersisterPerformanceTest extends OrmFunctionalTestCase { protected function setUp() { @@ -18,27 +22,27 @@ protected function setUp() public function testCompanyContract() { - $person = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $person = new CompanyEmployee(); $person->setName('Poor Sales Guy'); $person->setDepartment('Sales'); $person->setSalary(100); $this->_em->persist($person); for ($i = 0; $i < 33; $i++) { - $fix = new \Doctrine\Tests\Models\Company\CompanyFixContract(); + $fix = new CompanyFixContract(); $fix->setFixPrice(1000); $fix->setSalesPerson($person); $fix->markCompleted(); $this->_em->persist($fix); - $flex = new \Doctrine\Tests\Models\Company\CompanyFlexContract(); + $flex = new CompanyFlexContract(); $flex->setSalesPerson($person); $flex->setHoursWorked(100); $flex->setPricePerHour(100); $flex->markCompleted(); $this->_em->persist($flex); - $ultra = new \Doctrine\Tests\Models\Company\CompanyFlexUltraContract(); + $ultra = new CompanyFlexUltraContract(); $ultra->setSalesPerson($person); $ultra->setHoursWorked(150); $ultra->setPricePerHour(150); diff --git a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php index f387d1d23fb..db5455b062d 100644 --- a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Performance; use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmPerformanceTestCase; /** * Description of InsertPerformanceTest @@ -10,9 +11,10 @@ * @author robo * @group performance */ -class InsertPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase +class InsertPerformanceTest extends OrmPerformanceTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); } diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php index 21be1abad3a..db5d0f8ef60 100644 --- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php @@ -2,19 +2,16 @@ namespace Doctrine\Tests\ORM\Performance; -use Doctrine\ORM\Tools\SchemaTool; use Doctrine\ORM\Query; use Doctrine\Tests\Models\CMS\CmsUser; -use Doctrine\Tests\Models\CMS\CmsPhonenumber; -use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\Tests\Models\CMS\CmsArticle; -use Doctrine\Tests\Models\CMS\CmsComment; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group performance */ -class PersisterPerformanceTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PersisterPerformanceTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php index a43907f9ee5..ffe621eefd3 100644 --- a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php @@ -20,7 +20,6 @@ namespace Doctrine\Tests\ORM\Performance; use Doctrine\Tests\OrmPerformanceTestCase; -use Doctrine\Common\Proxy\Proxy; use Doctrine\ORM\EntityManager; use Doctrine\ORM\UnitOfWork; use Doctrine\ORM\Proxy\ProxyFactory; diff --git a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php index f2aeda71475..93493363598 100644 --- a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Performance; use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmPerformanceTestCase; /** * Description of InsertPerformanceTest @@ -10,7 +11,7 @@ * @author robo * @group performance */ -class UnitOfWorkPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase +class UnitOfWorkPerformanceTest extends OrmPerformanceTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php index 5b1ffce62a4..4956e5648c9 100644 --- a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php @@ -3,7 +3,6 @@ namespace Doctrine\Tests\ORM; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php index 76daadc3f86..74d72856ec1 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php @@ -6,8 +6,9 @@ use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; use Doctrine\Tests\Models\GeoNames\Admin1; use Doctrine\Tests\Models\GeoNames\Country; +use Doctrine\Tests\OrmTestCase; -class BasicEntityPersisterCompositeTypeParametersTest extends \Doctrine\Tests\OrmTestCase +class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase { /** * @var BasicEntityPersister diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php index 54b1a2351a6..e788826d481 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php @@ -2,15 +2,11 @@ namespace Doctrine\Tests\ORM\Persisters; -use Doctrine\Common\Collections\Criteria; -use Doctrine\DBAL\Types\Type as DBALType; -use Doctrine\ORM\EntityManager; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; -use Doctrine\Tests\Models\CustomType\CustomTypeParent; -use Doctrine\Tests\Models\CustomType\CustomTypeChild; use Doctrine\Common\Collections\Expr\Comparison; +use Doctrine\Tests\OrmTestCase; -class BasicEntityPersisterCompositeTypeSqlTest extends \Doctrine\Tests\OrmTestCase +class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase { /** * @var BasicEntityPersister diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php index d51e40555fd..b617d14da73 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php @@ -9,8 +9,9 @@ use Doctrine\Tests\Models\CustomType\CustomTypeChild; use Doctrine\Tests\Models\CustomType\CustomTypeFriend; use Doctrine\Common\Collections\Expr\Comparison; +use Doctrine\Tests\OrmTestCase; -class BasicEntityPersisterTypeValueSqlTest extends \Doctrine\Tests\OrmTestCase +class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase { /** * @var BasicEntityPersister diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php index a8a2adaba0d..39fab08b981 100644 --- a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php @@ -2,21 +2,22 @@ namespace Doctrine\Tests\ORM\Proxy; +use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\EntityNotFoundException; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Proxy\ProxyFactory; -use Doctrine\Common\Proxy\ProxyGenerator; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\UnitOfWorkMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Common\Proxy\AbstractProxyFactory; +use Doctrine\Tests\OrmTestCase; /** * Test the proxy generator. Its work is generating on-the-fly subclasses of a given model, which implement the Proxy pattern. * @author Giorgio Sironi */ -class ProxyFactoryTest extends \Doctrine\Tests\OrmTestCase +class ProxyFactoryTest extends OrmTestCase { /** * @var ConnectionMock @@ -75,7 +76,7 @@ public function testReferenceProxyDelegatesLoadingToThePersister() public function testSkipAbstractClassesOnGeneration() { $cm = new ClassMetadata(__NAMESPACE__ . '\\AbstractClass'); - $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); + $cm->initializeReflection(new RuntimeReflectionService()); $this->assertNotNull($cm->reflClass); $num = $this->proxyFactory->generateProxyClasses(array($cm)); diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php index 60545d4f9f3..284cc1adcab 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php @@ -20,6 +20,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmTestCase; /** * Test case for custom AST walking and adding new joins. @@ -28,7 +29,7 @@ * @license MIT * @link http://www.doctrine-project.org */ -class CustomTreeWalkersJoinTest extends \Doctrine\Tests\OrmTestCase +class CustomTreeWalkersJoinTest extends OrmTestCase { private $em; diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php index 574b37ae7b2..dffcd481a37 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php @@ -20,6 +20,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmTestCase; /** * Test case for custom AST walking and modification. @@ -29,7 +30,7 @@ * @link http://www.doctrine-project.org * @since 2.0 */ -class CustomTreeWalkersTest extends \Doctrine\Tests\OrmTestCase +class CustomTreeWalkersTest extends OrmTestCase { private $_em; diff --git a/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php index 21679c8944c..0bae052d808 100644 --- a/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php @@ -20,6 +20,7 @@ */ namespace Doctrine\Tests\ORM\Query; +use Doctrine\Tests\OrmTestCase; /** * Test case for testing the saving and referencing of query identifiers. @@ -35,7 +36,7 @@ * testcases later since we'll have a lot of them and we might want to have special SQL * generation tests for some dbms specific SQL syntaxes. */ -class DeleteSqlGenerationTest extends \Doctrine\Tests\OrmTestCase +class DeleteSqlGenerationTest extends OrmTestCase { private $_em; diff --git a/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/tests/Doctrine/Tests/ORM/Query/ExprTest.php index d64fed335e8..4974f2d7a30 100644 --- a/tests/Doctrine/Tests/ORM/Query/ExprTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ExprTest.php @@ -21,6 +21,7 @@ use Doctrine\ORM\Query\Expr; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmTestCase; /** * Test case for the DQL Expr class used for generating DQL snippets through @@ -32,7 +33,7 @@ * @since 2.0 * @version $Revision$ */ -class ExprTest extends \Doctrine\Tests\OrmTestCase +class ExprTest extends OrmTestCase { private $_em; diff --git a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php index 455949de023..7a50516a793 100644 --- a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php @@ -2,15 +2,16 @@ namespace Doctrine\Tests\ORM\Query; -use Doctrine\ORM\Mapping\ClassMetaData, +use Doctrine\ORM\Mapping\ClassMetadata, Doctrine\ORM\Query\Filter\SQLFilter; +use Doctrine\Tests\OrmTestCase; /** * Test case for FilterCollection * * @author Guilherme Blanco */ -class FilterCollectionTest extends \Doctrine\Tests\OrmTestCase +class FilterCollectionTest extends OrmTestCase { /** * @var \Doctrine\ORM\EntityManager diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index b90047e1991..daec446bbee 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -1,11 +1,13 @@ setHint($key, $value); } - $parser = new \Doctrine\ORM\Query\Parser($query); + $parser = new Query\Parser($query); // We do NOT test SQL output here. That only unnecessarily slows down the tests! $parser->setCustomOutputTreeWalker('Doctrine\Tests\Mocks\MockTreeWalker'); diff --git a/tests/Doctrine/Tests/ORM/Query/LexerTest.php b/tests/Doctrine/Tests/ORM/Query/LexerTest.php index 5c98287315d..9c4a889f04b 100644 --- a/tests/Doctrine/Tests/ORM/Query/LexerTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LexerTest.php @@ -3,8 +3,9 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\Query\Lexer; +use Doctrine\Tests\OrmTestCase; -class LexerTest extends \Doctrine\Tests\OrmTestCase +class LexerTest extends OrmTestCase { //private $_lexer; diff --git a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php index 4e00bbc887f..d10c78c9c49 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php @@ -21,9 +21,10 @@ use Doctrine\ORM\Query\ParameterTypeInferer; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Types\Type; +use Doctrine\Tests\OrmTestCase; use PDO; -class ParameterTypeInfererTest extends \Doctrine\Tests\OrmTestCase +class ParameterTypeInfererTest extends OrmTestCase { public function providerParameterTypeInferer() diff --git a/tests/Doctrine/Tests/ORM/Query/ParserTest.php b/tests/Doctrine/Tests/ORM/Query/ParserTest.php index 1bc7f5dfb08..097f9ec88a7 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParserTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParserTest.php @@ -5,8 +5,9 @@ use Doctrine\ORM\Query; use Doctrine\ORM\Query\Lexer; use Doctrine\ORM\Query\Parser; +use Doctrine\Tests\OrmTestCase; -class ParserTest extends \Doctrine\Tests\OrmTestCase +class ParserTest extends OrmTestCase { /** diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index 2618af1db71..d59c93b0741 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -9,8 +9,9 @@ use Doctrine\ORM\Query\Parameter; use Doctrine\Tests\Mocks\DriverConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; +use Doctrine\Tests\OrmTestCase; -class QueryTest extends \Doctrine\Tests\OrmTestCase +class QueryTest extends OrmTestCase { /** @var EntityManager */ protected $_em = null; diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 1aabaa78bd7..fa12a3e33c3 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -2,10 +2,24 @@ namespace Doctrine\Tests\ORM\Query; +use Doctrine\DBAL\LockMode; +use Doctrine\DBAL\Platforms\MySqlPlatform; +use Doctrine\DBAL\Platforms\OraclePlatform; +use Doctrine\DBAL\Platforms\PostgreSqlPlatform; +use Doctrine\DBAL\Platforms\SqlitePlatform; +use Doctrine\DBAL\Platforms\SQLServerPlatform; use Doctrine\DBAL\Types\Type as DBALType; -use Doctrine\ORM\Query; - -class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase +use Doctrine\ORM\Query as ORMQuery; +use Doctrine\ORM\Query\AST\Functions\FunctionNode; +use Doctrine\ORM\Query\Lexer; +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\OrmTestCase; + +class SelectSqlGenerationTest extends OrmTestCase { private $_em; @@ -31,7 +45,7 @@ public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $qu $query->setParameter($name, $value); } - $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true) + $query->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true) ->useQueryCache(false); foreach ($queryHints AS $name => $value) { @@ -70,7 +84,7 @@ public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, a $query->setParameter($name, $value); } - $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true) + $query->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true) ->useQueryCache(false); foreach ($queryHints AS $name => $value) { @@ -92,7 +106,7 @@ public function testJoinWithRangeVariablePutsConditionIntoSqlWhereClause() $this->assertSqlGeneration( 'SELECT c.id FROM Doctrine\Tests\Models\Company\CompanyPerson c JOIN Doctrine\Tests\Models\Company\CompanyPerson r WHERE c.spouse = r AND r.id = 42', 'SELECT c0_.id AS id_0 FROM company_persons c0_ INNER JOIN company_persons c1_ WHERE c0_.spouse_id = c1_.id AND c1_.id = 42', - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -109,7 +123,7 @@ public function testJoinWithRangeVariableAndInheritancePutsConditionIntoSqlWhere $this->assertSqlGeneration( 'SELECT c.id FROM Doctrine\Tests\Models\Company\CompanyPerson c JOIN Doctrine\Tests\Models\Company\CompanyPerson r WHERE c.spouse = r AND r.id = 42', 'SELECT c0_.id AS id_0 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id WHERE c0_.spouse_id = c3_.id AND c3_.id = 42', - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -299,7 +313,7 @@ public function testSupportsAggregateCountFunctionWithSimpleArithmetic() $connMock = $this->_em->getConnection(); $orgPlatform = $connMock->getDatabasePlatform(); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform); + $connMock->setDatabasePlatform(new MySqlPlatform()); $this->assertSqlGeneration( 'SELECT COUNT(CONCAT(u.id, u.name)) FROM Doctrine\Tests\Models\CMS\CmsUser u GROUP BY u.id', @@ -514,7 +528,7 @@ public function testSupportsInstanceOfExpressionsInWherePartWithUnrelatedClass() { $this->assertInvalidSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\CMS\CmsUser", - "Doctrine\ORM\Query\QueryException" + "Doctrine\\ORM\\Query\\QueryException" ); } @@ -601,7 +615,7 @@ public function testSupportsConcatFunctionForMysqlAndPostgresql() $connMock = $this->_em->getConnection(); $orgPlatform = $connMock->getDatabasePlatform(); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform); + $connMock->setDatabasePlatform(new MySqlPlatform()); $this->assertSqlGeneration( "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, 's') = ?1", "SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE CONCAT(c0_.name, 's') = ?" @@ -611,7 +625,7 @@ public function testSupportsConcatFunctionForMysqlAndPostgresql() "SELECT CONCAT(c0_.id, c0_.name) AS sclr_0 FROM cms_users c0_ WHERE c0_.id = ?" ); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform); + $connMock->setDatabasePlatform(new PostgreSqlPlatform()); $this->assertSqlGeneration( "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, 's') = ?1", "SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE c0_.name || 's' = ?" @@ -647,9 +661,9 @@ public function testSupportsMemberOfExpressionOneToMany() { // "Get all users who have $phone as a phonenumber." (*cough* doesnt really make sense...) $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE :param MEMBER OF u.phonenumbers'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); - $phone = new \Doctrine\Tests\Models\CMS\CmsPhonenumber; + $phone = new CmsPhonenumber(); $phone->phonenumber = 101; $q->setParameter('param', $phone); @@ -663,9 +677,9 @@ public function testSupportsMemberOfExpressionManyToMany() { // "Get all users who are members of $group." $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE :param MEMBER OF u.groups'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); - $group = new \Doctrine\Tests\Models\CMS\CmsGroup; + $group = new CmsGroup(); $group->id = 101; $q->setParameter('param', $group); @@ -678,11 +692,11 @@ public function testSupportsMemberOfExpressionManyToMany() public function testSupportsMemberOfExpressionManyToManyParameterArray() { $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE :param MEMBER OF u.groups'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); - $group = new \Doctrine\Tests\Models\CMS\CmsGroup; + $group = new CmsGroup(); $group->id = 101; - $group2 = new \Doctrine\Tests\Models\CMS\CmsGroup; + $group2 = new CmsGroup(); $group2->id = 105; $q->setParameter('param', array($group, $group2)); @@ -697,7 +711,7 @@ public function testSupportsMemberOfExpressionSelfReferencing() // "Get all persons who have $person as a friend." // Tough one: Many-many self-referencing ("friends") with class table inheritance $q = $this->_em->createQuery('SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p WHERE :param MEMBER OF p.friends'); - $person = new \Doctrine\Tests\Models\Company\CompanyPerson; + $person = new CompanyPerson(); $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, array('id' => 101)); $q->setParameter('param', $person); $this->assertEquals( @@ -731,21 +745,21 @@ public function testSupportsMemberOfWithIdentificationVariable() public function testSupportsCurrentDateFunction() { $q = $this->_em->createQuery('SELECT d.id FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.datetime > current_date()'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); $this->assertEquals('SELECT d0_.id AS id_0 FROM date_time_model d0_ WHERE d0_.col_datetime > CURRENT_DATE', $q->getSql()); } public function testSupportsCurrentTimeFunction() { $q = $this->_em->createQuery('SELECT d.id FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.time > current_time()'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); $this->assertEquals('SELECT d0_.id AS id_0 FROM date_time_model d0_ WHERE d0_.col_time > CURRENT_TIME', $q->getSql()); } public function testSupportsCurrentTimestampFunction() { $q = $this->_em->createQuery('SELECT d.id FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.datetime > current_timestamp()'); - $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + $q->setHint(ORMQuery::HINT_FORCE_PARTIAL_LOAD, true); $this->assertEquals('SELECT d0_.id AS id_0 FROM date_time_model d0_ WHERE d0_.col_datetime > CURRENT_TIMESTAMP', $q->getSql()); } @@ -884,7 +898,7 @@ public function testOrderBySupportsSingleValuedPathExpressionInverseSide() public function testBooleanLiteralInWhereOnSqlite() { $oldPlat = $this->_em->getConnection()->getDatabasePlatform(); - $this->_em->getConnection()->setDatabasePlatform(new \Doctrine\DBAL\Platforms\SqlitePlatform); + $this->_em->getConnection()->setDatabasePlatform(new SqlitePlatform()); $this->assertSqlGeneration( "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = true", @@ -902,7 +916,7 @@ public function testBooleanLiteralInWhereOnSqlite() public function testBooleanLiteralInWhereOnPostgres() { $oldPlat = $this->_em->getConnection()->getDatabasePlatform(); - $this->_em->getConnection()->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform); + $this->_em->getConnection()->setDatabasePlatform(new PostgreSqlPlatform()); $this->assertSqlGeneration( "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = true", @@ -1024,7 +1038,7 @@ public function testSubselectInSelect() */ public function testPessimisticWriteLockQueryHint() { - if ($this->_em->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) { + if ($this->_em->getConnection()->getDatabasePlatform() instanceof SqlitePlatform) { $this->markTestSkipped('SqLite does not support Row locking at all.'); } @@ -1032,7 +1046,7 @@ public function testPessimisticWriteLockQueryHint() "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'", "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ". "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR UPDATE", - array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE) + array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_WRITE) ); } @@ -1042,14 +1056,14 @@ public function testPessimisticWriteLockQueryHint() */ public function testPessimisticReadLockQueryHintPostgreSql() { - $this->_em->getConnection()->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform); + $this->_em->getConnection()->setDatabasePlatform(new PostgreSqlPlatform()); $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'", "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ". "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR SHARE", - array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) - ); + array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) + ); } /** @@ -1062,8 +1076,8 @@ public function testLockModeNoneQueryHint() "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'", "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ". "FROM cms_users c0_ WHERE c0_.username = 'gblanco'", - array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::NONE) - ); + array(ORMQuery::HINT_LOCK_MODE => LockMode::NONE) + ); } /** @@ -1083,13 +1097,13 @@ public function testSupportSelectWithMoreThan10InputParameters() */ public function testPessimisticReadLockQueryHintMySql() { - $this->_em->getConnection()->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform); + $this->_em->getConnection()->setDatabasePlatform(new MySqlPlatform()); $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'", "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 ". "FROM cms_users c0_ WHERE c0_.username = 'gblanco' LOCK IN SHARE MODE", - array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) + array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) ); } @@ -1099,13 +1113,13 @@ public function testPessimisticReadLockQueryHintMySql() */ public function testPessimisticReadLockQueryHintOracle() { - $this->_em->getConnection()->setDatabasePlatform(new \Doctrine\DBAL\Platforms\OraclePlatform); + $this->_em->getConnection()->setDatabasePlatform(new OraclePlatform()); $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'", "SELECT c0_.id AS ID_0, c0_.status AS STATUS_1, c0_.username AS USERNAME_2, c0_.name AS NAME_3 ". "FROM cms_users c0_ WHERE c0_.username = 'gblanco' FOR UPDATE", - array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::PESSIMISTIC_READ) + array(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) ); } @@ -1426,7 +1440,7 @@ public function testInheritanceTypeJoinInRootClassWithDisabledForcePartialLoad() $this->assertSqlGeneration( 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c1_.car_id AS car_id_8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id', - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1438,7 +1452,7 @@ public function testInheritanceTypeJoinInRootClassWithEnabledForcePartialLoad() $this->assertSqlGeneration( 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_', - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1450,7 +1464,7 @@ public function testInheritanceTypeJoinInChildClassWithDisabledForcePartialLoad( $this->assertSqlGeneration( 'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c2_.car_id AS car_id_8 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id', - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1462,7 +1476,7 @@ public function testInheritanceTypeJoinInChildClassWithEnabledForcePartialLoad() $this->assertSqlGeneration( 'SELECT e FROM Doctrine\Tests\Models\Company\CompanyEmployee e', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c0_.discr AS discr_5 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id', - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1474,7 +1488,7 @@ public function testInheritanceTypeJoinInLeafClassWithDisabledForcePartialLoad() $this->assertSqlGeneration( 'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c2_.car_id AS car_id_8 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id', - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1486,7 +1500,7 @@ public function testInheritanceTypeJoinInLeafClassWithEnabledForcePartialLoad() $this->assertSqlGeneration( 'SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m', 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.salary AS salary_2, c1_.department AS department_3, c1_.startDate AS startDate_4, c2_.title AS title_5, c0_.discr AS discr_6 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id', - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1498,7 +1512,7 @@ public function testInheritanceTypeSingleTableInRootClassWithDisabledForcePartia $this->assertSqlGeneration( 'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.fixPrice AS fixPrice_2, c0_.hoursWorked AS hoursWorked_3, c0_.pricePerHour AS pricePerHour_4, c0_.maxPrice AS maxPrice_5, c0_.discr AS discr_6, c0_.salesPerson_id AS salesPerson_id_7 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1510,7 +1524,7 @@ public function testInheritanceTypeSingleTableInRootClassWithEnabledForcePartial $this->assertSqlGeneration( 'SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.fixPrice AS fixPrice_2, c0_.hoursWorked AS hoursWorked_3, c0_.pricePerHour AS pricePerHour_4, c0_.maxPrice AS maxPrice_5, c0_.discr AS discr_6 FROM company_contracts c0_ WHERE c0_.discr IN ('fix', 'flexible', 'flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1522,7 +1536,7 @@ public function testInheritanceTypeSingleTableInChildClassWithDisabledForceParti $this->assertSqlGeneration( 'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5, c0_.salesPerson_id AS salesPerson_id_6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1534,7 +1548,7 @@ public function testInheritanceTypeSingleTableInChildClassWithEnabledForcePartia $this->assertSqlGeneration( 'SELECT fc FROM Doctrine\Tests\Models\Company\CompanyFlexContract fc', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexible', 'flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1546,7 +1560,7 @@ public function testInheritanceTypeSingleTableInLeafClassWithDisabledForcePartia $this->assertSqlGeneration( 'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5, c0_.salesPerson_id AS salesPerson_id_6 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -1558,7 +1572,7 @@ public function testInheritanceTypeSingleTableInLeafClassWithEnabledForcePartial $this->assertSqlGeneration( 'SELECT fuc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract fuc', "SELECT c0_.id AS id_0, c0_.completed AS completed_1, c0_.hoursWorked AS hoursWorked_2, c0_.pricePerHour AS pricePerHour_3, c0_.maxPrice AS maxPrice_4, c0_.discr AS discr_5 FROM company_contracts c0_ WHERE c0_.discr IN ('flexultra')", - array(Query::HINT_FORCE_PARTIAL_LOAD => true) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) ); } @@ -1570,7 +1584,7 @@ public function testSelfReferenceWithOneToOneDoesNotDuplicateAlias() $this->assertSqlGeneration( 'SELECT p, pp FROM Doctrine\Tests\Models\Company\CompanyPerson p JOIN p.spouse pp', "SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c3_.id AS id_6, c3_.name AS name_7, c4_.title AS title_8, c5_.salary AS salary_9, c5_.department AS department_10, c5_.startDate AS startDate_11, c0_.discr AS discr_12, c0_.spouse_id AS spouse_id_13, c1_.car_id AS car_id_14, c3_.discr AS discr_15, c3_.spouse_id AS spouse_id_16, c4_.car_id AS car_id_17 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id INNER JOIN company_persons c3_ ON c0_.spouse_id = c3_.id LEFT JOIN company_managers c4_ ON c3_.id = c4_.id LEFT JOIN company_employees c5_ ON c3_.id = c5_.id", - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -2051,7 +2065,7 @@ public function testSupportsMoreThanTwoParametersInConcatFunction() $connMock = $this->_em->getConnection(); $orgPlatform = $connMock->getDatabasePlatform(); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform); + $connMock->setDatabasePlatform(new MySqlPlatform()); $this->assertSqlGeneration( "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1", "SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE CONCAT(c0_.name, c0_.status, 's') = ?" @@ -2061,7 +2075,7 @@ public function testSupportsMoreThanTwoParametersInConcatFunction() "SELECT CONCAT(c0_.id, c0_.name, c0_.status) AS sclr_0 FROM cms_users c0_ WHERE c0_.id = ?" ); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform); + $connMock->setDatabasePlatform(new PostgreSqlPlatform()); $this->assertSqlGeneration( "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1", "SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE c0_.name || c0_.status || 's' = ?" @@ -2071,7 +2085,7 @@ public function testSupportsMoreThanTwoParametersInConcatFunction() "SELECT c0_.id || c0_.name || c0_.status AS sclr_0 FROM cms_users c0_ WHERE c0_.id = ?" ); - $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\SQLServerPlatform()); + $connMock->setDatabasePlatform(new SQLServerPlatform()); $this->assertSqlGeneration( "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1", "SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE (c0_.name + c0_.status + 's') = ?" @@ -2145,7 +2159,7 @@ public function testClassTableInheritanceJoinWithConditionAppliesToBaseTable() $this->assertSqlGeneration( 'SELECT e.id FROM Doctrine\Tests\Models\Company\CompanyOrganization o JOIN o.events e WITH e.id = ?1', 'SELECT c0_.id AS id_0 FROM company_organizations c1_ INNER JOIN (company_events c0_ LEFT JOIN company_auctions c2_ ON c0_.id = c2_.id LEFT JOIN company_raffles c3_ ON c0_.id = c3_.id) ON c1_.id = c0_.org_id AND (c0_.id = ?)', - array(Query::HINT_FORCE_PARTIAL_LOAD => false) + array(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) ); } @@ -2294,14 +2308,14 @@ public function mathematicOperatorsProvider() } } -class MyAbsFunction extends \Doctrine\ORM\Query\AST\Functions\FunctionNode +class MyAbsFunction extends FunctionNode { public $simpleArithmeticExpression; /** * @override */ - public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker) { return 'ABS(' . $sqlWalker->walkSimpleArithmeticExpression($this->simpleArithmeticExpression) . ')'; } @@ -2309,16 +2323,16 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) /** * @override */ - public function parse(\Doctrine\ORM\Query\Parser $parser) + public function parse(Parser $parser) { $lexer = $parser->getLexer(); - $parser->match(\Doctrine\ORM\Query\Lexer::T_IDENTIFIER); - $parser->match(\Doctrine\ORM\Query\Lexer::T_OPEN_PARENTHESIS); + $parser->match(Lexer::T_IDENTIFIER); + $parser->match(Lexer::T_OPEN_PARENTHESIS); $this->simpleArithmeticExpression = $parser->SimpleArithmeticExpression(); - $parser->match(\Doctrine\ORM\Query\Lexer::T_CLOSE_PARENTHESIS); + $parser->match(Lexer::T_CLOSE_PARENTHESIS); } } /** diff --git a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php index de71ba9b7fd..5dae79b3d57 100644 --- a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php @@ -22,6 +22,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\Tests\OrmTestCase; /** * Test case for testing the saving and referencing of query identifiers. @@ -37,7 +38,7 @@ * testcases later since we'll have a lot of them and we might want to have special SQL * generation tests for some dbms specific SQL syntaxes. */ -class UpdateSqlGenerationTest extends \Doctrine\Tests\OrmTestCase +class UpdateSqlGenerationTest extends OrmTestCase { private $_em; diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index abe602a53be..318eb2a2f96 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -27,6 +27,7 @@ use Doctrine\ORM\Query\Expr; use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Query\ParameterTypeInferer; +use Doctrine\Tests\OrmTestCase; /** * Test case for the QueryBuilder class used to build DQL query string in a @@ -36,7 +37,7 @@ * @author Roman Borschel setProxyDir(__DIR__ . '/../../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager); - $mockDriver = new MetadataDriverMock(); $config->setMetadataDriverImpl($metadataDriver); return EntityManagerMock::create($conn, $config, $eventManager); @@ -74,7 +75,7 @@ public function testTest() $this->assertTrue(file_exists(__DIR__ . '/convert/User.dcm.yml')); $this->assertTrue(file_exists(__DIR__ . '/convert/Profile.dcm.yml')); - $metadataDriver = new \Doctrine\ORM\Mapping\Driver\YamlDriver(__DIR__ . '/convert'); + $metadataDriver = new YamlDriver(__DIR__ . '/convert'); $em = $this->_createEntityManager($metadataDriver); $cmf = new DisconnectedClassMetadataFactory(); $cmf->setEntityManager($em); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 9fdf3b88a32..7c09cdf86f2 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Tools; use Doctrine\Common\Annotations\AnnotationReader; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; @@ -264,9 +265,9 @@ public function testGeneratedEntityClass() $comment = new EntityGeneratorComment(); $this->assertInstanceOf($metadata->name, $book->addComment($comment)); $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $book->getComments()); - $this->assertEquals(new \Doctrine\Common\Collections\ArrayCollection(array($comment)), $book->getComments()); + $this->assertEquals(new ArrayCollection(array($comment)), $book->getComments()); $this->assertInternalType('boolean', $book->removeComment($comment)); - $this->assertEquals(new \Doctrine\Common\Collections\ArrayCollection(array()), $book->getComments()); + $this->assertEquals(new ArrayCollection(array()), $book->getComments()); $this->newInstance($isbnMetadata); $isbn = new $isbnMetadata->name(); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php index 02d6ed5a13a..8a4b6ad5fc6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php @@ -5,8 +5,9 @@ use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\ORM\Tools\EntityRepositoryGenerator; use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\Tests\OrmTestCase; -class EntityRepositoryGeneratorTest extends \Doctrine\Tests\OrmTestCase +class EntityRepositoryGeneratorTest extends OrmTestCase { /** * @var EntityGenerator diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 0743a89d6fd..d712730ff00 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -21,17 +21,19 @@ namespace Doctrine\Tests\ORM\Tools\Export; +use Doctrine\ORM\Configuration; use Doctrine\ORM\Tools\Export\ClassMetadataExporter; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\Tests\Mocks\MetadataDriverMock; -use Doctrine\Tests\Mocks\DatabasePlatformMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Common\EventManager; use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\Tests\OrmTestCase; +use Symfony\Component\Yaml\Parser; /** * Test case for ClassMetadataExporter @@ -43,7 +45,7 @@ * @since 2.0 * @version $Revision$ */ -abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTestCase +abstract class AbstractClassMetadataExporterTest extends OrmTestCase { protected $_extension; @@ -52,12 +54,11 @@ abstract protected function _getType(); protected function _createEntityManager($metadataDriver) { $driverMock = new DriverMock(); - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setProxyDir(__DIR__ . '/../../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager); - $mockDriver = new MetadataDriverMock(); $config->setMetadataDriverImpl($metadataDriver); return EntityManagerMock::create($conn, $config, $eventManager); @@ -376,7 +377,7 @@ public function testCascadeAllCollapsed() $this->assertEquals('cascade-all', $nodes[0]->getName()); } else if ($type == 'yaml') { - $yaml = new \Symfony\Component\Yaml\Parser(); + $yaml = new Parser(); $value = $yaml->parse(file_get_contents(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml')); $this->assertTrue(isset($value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade'])); diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php index a9bb02da401..f6c63f7528c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php @@ -14,7 +14,7 @@ public function testCountQuery() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, c1_.id AS id_1, a2_.id AS id_2, a2_.name AS name_3, b0_.author_id AS author_id_4, b0_.category_id AS category_id_5 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id) dctrn_result) dctrn_table", $query->getSql() + "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, c1_.id AS id_1, a2_.id AS id_2, a2_.name AS name_3, b0_.author_id AS author_id_4, b0_.category_id AS category_id_5 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id) dctrn_result) dctrn_table", $query->getSQL() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php index e442489269a..b8d1b41a63f 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php @@ -19,7 +19,7 @@ public function testCountQuery() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSql() + "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSQL() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php index 897e3531e8d..b30ef51fc9c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php @@ -5,7 +5,6 @@ use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\PostgreSqlPlatform; -use Doctrine\DBAL\Platforms\SQLServerPlatform; use Doctrine\ORM\Query; class LimitSubqueryOutputWalkerTest extends PaginationTestCase @@ -19,7 +18,7 @@ public function testLimitSubquery() $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $this->assertEquals( - "SELECT DISTINCT id_0 FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, m0_.author_id AS author_id_5, m0_.category_id AS category_id_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSql() + "SELECT DISTINCT id_0 FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, m0_.author_id AS author_id_5, m0_.category_id AS category_id_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSQL() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php index 597ec13504c..fb11feb7aaf 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php @@ -19,7 +19,7 @@ public function testLimitSubquery() $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id", - $limitQuery->getSql() + $limitQuery->getSQL() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php index 41152dc5def..5f9a3430fe8 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php @@ -20,7 +20,7 @@ public function testWhereInQuery_NoWhere() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE u0_.id IN (?)", $whereInQuery->getSQL() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php index 2934693f8c1..28753078d48 100644 --- a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php @@ -5,8 +5,9 @@ use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Tools\ResolveTargetEntityListener; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmTestCase; -class ResolveTargetEntityListenerTest extends \Doctrine\Tests\OrmTestCase +class ResolveTargetEntityListenerTest extends OrmTestCase { /** * @var \Doctrine\ORM\EntityManager diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index fd2cd20f703..bc54744b9c3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php @@ -6,8 +6,9 @@ use Doctrine\ORM\Tools\ToolEvents; use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Doctrine\Tests\OrmTestCase; -class SchemaToolTest extends \Doctrine\Tests\OrmTestCase +class SchemaToolTest extends OrmTestCase { public function testAddUniqueIndexForUniqueFieldAnnotation() { diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index 57305818b6d..a17d92e7f98 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -2,9 +2,11 @@ namespace Doctrine\Tests\ORM\Tools; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Tools\SchemaValidator; +use Doctrine\Tests\OrmTestCase; -class SchemaValidatorTest extends \Doctrine\Tests\OrmTestCase +class SchemaValidatorTest extends OrmTestCase { /** * @var EntityManager diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index 20ad5ee0a92..407baab3ef8 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -4,15 +4,17 @@ use Doctrine\ORM\Tools\Setup; use Doctrine\Common\Cache\ArrayCache; +use Doctrine\ORM\Version; +use Doctrine\Tests\OrmTestCase; -class SetupTest extends \Doctrine\Tests\OrmTestCase +class SetupTest extends OrmTestCase { private $originalAutoloaderCount; private $originalIncludePath; public function setUp() { - if (strpos(\Doctrine\ORM\Version::VERSION, "DEV") === false) { + if (strpos(Version::VERSION, "DEV") === false) { $this->markTestSkipped("Test only runs in a dev-installation from Github"); } diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index d855c7817b0..eb8bf3a5c63 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -12,14 +12,16 @@ use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\EntityPersisterMock; use Doctrine\Tests\Mocks\UnitOfWorkMock; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\Forum\ForumAvatar; use Doctrine\Tests\Models\Forum\ForumUser; +use Doctrine\Tests\OrmTestCase; use stdClass; /** * UnitOfWork tests. */ -class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase +class UnitOfWorkTest extends OrmTestCase { /** * SUT @@ -198,7 +200,7 @@ public function testGetEntityStateWithAssignedIdentity() $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber')); $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\CMS\CmsPhonenumber', $persister); - $ph = new \Doctrine\Tests\Models\CMS\CmsPhonenumber(); + $ph = new CmsPhonenumber(); $ph->phonenumber = '12345'; $this->assertEquals(UnitOfWork::STATE_NEW, $this->_unitOfWork->getEntityState($ph)); @@ -210,7 +212,7 @@ public function testGetEntityStateWithAssignedIdentity() $this->_unitOfWork->registerManaged($ph, array('phonenumber' => '12345'), array()); $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_unitOfWork->getEntityState($ph)); $this->assertFalse($persister->isExistsCalled()); - $ph2 = new \Doctrine\Tests\Models\CMS\CmsPhonenumber(); + $ph2 = new CmsPhonenumber(); $ph2->phonenumber = '12345'; $this->assertEquals(UnitOfWork::STATE_DETACHED, $this->_unitOfWork->getEntityState($ph2)); $this->assertFalse($persister->isExistsCalled()); diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index d40b3108277..a03031a1671 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -2,7 +2,15 @@ namespace Doctrine\Tests; +use Doctrine\Common\Cache\ArrayCache; +use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver; +use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Cache\CacheConfiguration; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Tools\DebugUnitOfWorkListener; +use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\EventListener\CacheMetadataListener; use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger; use Doctrine\ORM\Cache\DefaultCacheFactory; @@ -599,7 +607,7 @@ protected function setUp() if ( ! isset(static::$_sharedConn)) { static::$_sharedConn = TestUtil::getConnection(); - if (static::$_sharedConn->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) { + if (static::$_sharedConn->getDriver() instanceof SqliteDriver) { $forceCreateTables = true; } } @@ -614,7 +622,7 @@ protected function setUp() if ( ! $this->_em) { $this->_em = $this->_getEntityManager(); - $this->_schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em); + $this->_schemaTool = new SchemaTool($this->_em); } $classes = array(); @@ -652,20 +660,20 @@ protected function _getEntityManager($config = null, $eventManager = null) { if (isset($GLOBALS['DOCTRINE_CACHE_IMPL'])) { self::$_metadataCacheImpl = new $GLOBALS['DOCTRINE_CACHE_IMPL']; } else { - self::$_metadataCacheImpl = new \Doctrine\Common\Cache\ArrayCache; + self::$_metadataCacheImpl = new ArrayCache(); } } if (is_null(self::$_queryCacheImpl)) { - self::$_queryCacheImpl = new \Doctrine\Common\Cache\ArrayCache; + self::$_queryCacheImpl = new ArrayCache(); } - $this->_sqlLoggerStack = new \Doctrine\DBAL\Logging\DebugStack(); + $this->_sqlLoggerStack = new DebugStack(); $this->_sqlLoggerStack->enabled = false; //FIXME: two different configs! $conn and the created entity manager have // different configs. - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setMetadataCacheImpl(self::$_metadataCacheImpl); $config->setQueryCacheImpl(self::$_queryCacheImpl); $config->setProxyDir(__DIR__ . '/Proxies'); @@ -675,7 +683,7 @@ protected function _getEntityManager($config = null, $eventManager = null) { if ($this->isSecondLevelCacheEnabled || $enableSecondLevelCache) { - $cacheConfig = new \Doctrine\ORM\Cache\CacheConfiguration(); + $cacheConfig = new CacheConfiguration(); $cache = $this->getSharedSecondLevelCacheDriverImpl(); $factory = new DefaultCacheFactory($cacheConfig->getRegionsConfiguration(), $cache); @@ -721,10 +729,10 @@ protected function _getEntityManager($config = null, $eventManager = null) { } if (isset($GLOBALS['debug_uow_listener'])) { - $evm->addEventListener(array('onFlush'), new \Doctrine\ORM\Tools\DebugUnitOfWorkListener()); + $evm->addEventListener(array('onFlush'), new DebugUnitOfWorkListener()); } - return \Doctrine\ORM\EntityManager::create($conn, $config); + return EntityManager::create($conn, $config); } /** diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 7cc9c05803b..200f5345011 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -5,7 +5,12 @@ use Doctrine\Common\Annotations; use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Version; +use Doctrine\DBAL\DriverManager; +use Doctrine\ORM\Cache\CacheConfiguration; use Doctrine\ORM\Cache\DefaultCacheFactory; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\Tests\Mocks\EntityManagerMock; /** * Base testcase class for all ORM testcases. @@ -93,7 +98,7 @@ protected function createAnnotationDriver($paths = array(), $alias = null) Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php"); - return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array) $paths); + return new AnnotationDriver($reader, (array) $paths); } /** @@ -117,7 +122,7 @@ protected function _getTestEntityManager($conn = null, $conf = null, $eventManag ? self::getSharedMetadataCacheImpl() : new ArrayCache(); - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setMetadataCacheImpl($metadataCache); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); @@ -130,7 +135,7 @@ protected function _getTestEntityManager($conn = null, $conf = null, $eventManag if ($this->isSecondLevelCacheEnabled) { - $cacheConfig = new \Doctrine\ORM\Cache\CacheConfiguration(); + $cacheConfig = new CacheConfiguration(); $cache = $this->getSharedSecondLevelCacheDriverImpl(); $factory = new DefaultCacheFactory($cacheConfig->getRegionsConfiguration(), $cache); @@ -151,10 +156,10 @@ protected function _getTestEntityManager($conn = null, $conf = null, $eventManag } if (is_array($conn)) { - $conn = \Doctrine\DBAL\DriverManager::getConnection($conn, $config, $eventManager); + $conn = DriverManager::getConnection($conn, $config, $eventManager); } - return \Doctrine\Tests\Mocks\EntityManagerMock::create($conn, $config, $eventManager); + return EntityManagerMock::create($conn, $config, $eventManager); } protected function enableSecondLevelCache($log = true) From b173763bbb9b55d9de33e6ae8d22eb222b36d5b5 Mon Sep 17 00:00:00 2001 From: Mikhail Shamin Date: Wed, 11 May 2016 02:41:26 +0700 Subject: [PATCH 2/2] Remove full qualified class names in tests --- .../EventListener/CacheMetadataListener.php | 4 +- .../Tests/Models/DDC2504/DDC2504RootClass.php | 2 +- .../Tests/Models/DDC3293/DDC3293User.php | 2 +- .../Models/DDC3293/DDC3293UserPrefixed.php | 2 +- .../AbstractManyToManyAssociationTestCase.php | 3 +- .../Functional/AdvancedAssociationTest.php | 12 +++-- .../ORM/Functional/AdvancedDqlQueryTest.php | 3 +- .../ORM/Functional/BasicFunctionalTest.php | 43 ++++++++------- .../ORM/Functional/CascadeRemoveOrderTest.php | 3 +- .../Functional/ClassTableInheritanceTest.php | 8 +-- .../Functional/ClassTableInheritanceTest2.php | 21 +++++--- .../Tests/ORM/Functional/ClearEventTest.php | 7 +-- .../Functional/CompositePrimaryKeyTest.php | 3 +- ...ompositePrimaryKeyWithAssociationsTest.php | 3 +- .../ORM/Functional/DatabaseDriverTest.php | 19 +++---- .../ORM/Functional/DatabaseDriverTestCase.php | 5 +- .../ORM/Functional/DefaultValuesTest.php | 6 ++- .../ORM/Functional/DetachedEntityTest.php | 6 ++- .../ORM/Functional/EntityListenersTest.php | 3 +- .../EntityRepositoryCriteriaTest.php | 3 +- .../ORM/Functional/EntityRepositoryTest.php | 18 ++++--- .../Functional/ExtraLazyCollectionTest.php | 52 ++++++++++--------- .../Tests/ORM/Functional/FlushEventTest.php | 6 ++- .../Tests/ORM/Functional/IdentityMapTest.php | 14 ++--- .../ORM/Functional/IndexByAssociationTest.php | 5 +- .../ORM/Functional/LifecycleCallbackTest.php | 28 ++++++---- .../Functional/Locking/LockAgentWorker.php | 13 +++-- .../Tests/ORM/Functional/Locking/LockTest.php | 26 ++++++---- .../ManyToManyBasicAssociationTest.php | 8 +-- .../ORM/Functional/ManyToManyEventTest.php | 3 +- .../ORM/Functional/MappedSuperclassTest.php | 11 ++-- .../Functional/MergeCompositeToOneKeyTest.php | 3 +- .../Tests/ORM/Functional/NativeQueryTest.php | 8 +-- .../Tests/ORM/Functional/NewOperatorTest.php | 3 +- .../Tests/ORM/Functional/NotifyPolicyTest.php | 13 +++-- .../OneToManyBidirectionalAssociationTest.php | 3 +- .../Functional/OneToManyOrphanRemovalTest.php | 3 +- ...neToManySelfReferentialAssociationTest.php | 3 +- ...OneToManyUnidirectionalAssociationTest.php | 3 +- .../OneToOneBidirectionalAssociationTest.php | 5 +- .../Functional/OneToOneEagerLoadingTest.php | 9 ++-- .../Functional/OneToOneOrphanRemovalTest.php | 3 +- ...OneToOneSelfReferentialAssociationTest.php | 3 +- .../OneToOneUnidirectionalAssociationTest.php | 3 +- .../ORM/Functional/OrderedCollectionTest.php | 3 +- ...edJoinedTableInheritanceCollectionTest.php | 6 ++- .../Tests/ORM/Functional/PaginationTest.php | 3 +- .../PersistentCollectionCriteriaTest.php | 3 +- .../Functional/PersistentCollectionTest.php | 6 ++- .../ORM/Functional/PersistentObjectTest.php | 3 +- .../ORM/Functional/PostFlushEventTest.php | 3 +- .../ORM/Functional/PostLoadEventTest.php | 3 +- .../Tests/ORM/Functional/QueryCacheTest.php | 3 +- .../ORM/Functional/QueryDqlFunctionTest.php | 3 +- .../Tests/ORM/Functional/QueryTest.php | 10 ++-- .../Tests/ORM/Functional/ReadOnlyTest.php | 3 +- .../ORM/Functional/ReferenceProxyTest.php | 8 +-- .../Tests/ORM/Functional/ResultCacheTest.php | 9 ++-- .../Tests/ORM/Functional/SQLFilterTest.php | 14 ++--- .../SchemaTool/CompanySchemaTest.php | 3 +- .../ORM/Functional/SchemaTool/DBAL483Test.php | 3 +- .../ORM/Functional/SchemaTool/DDC214Test.php | 6 ++- .../SchemaTool/PostgreSqlSchemaToolTest.php | 3 +- .../ORM/Functional/SchemaValidatorTest.php | 3 +- .../SecondLevelCacheConcurrentTest.php | 6 ++- .../SecondLevelCacheQueryCacheTest.php | 3 +- .../SequenceEmulatedIdentityStrategyTest.php | 3 +- .../ORM/Functional/SequenceGeneratorTest.php | 3 +- .../Functional/SingleTableInheritanceTest.php | 27 ++++++---- .../StandardEntityPersisterTest.php | 5 +- .../ORM/Functional/Ticket/DDC1050Test.php | 2 +- .../ORM/Functional/Ticket/DDC1080Test.php | 2 +- .../ORM/Functional/Ticket/DDC1643Test.php | 2 +- .../ORM/Functional/Ticket/DDC1707Test.php | 8 +-- .../ORM/Functional/Ticket/DDC1778Test.php | 4 +- .../ORM/Functional/Ticket/DDC331Test.php | 2 +- .../ORM/Functional/Ticket/DDC656Test.php | 4 +- .../ORM/Functional/Ticket/DDC758Test.php | 2 +- .../Tests/ORM/Functional/TypeTest.php | 3 +- .../Tests/ORM/Functional/TypeValueSqlTest.php | 3 +- .../ORM/Functional/UUIDGeneratorTest.php | 3 +- .../Functional/UnitOfWorkLifecycleTest.php | 3 +- .../Tests/ORM/Functional/ValueObjectsTest.php | 3 +- .../ORM/Functional/VersionedOneToOneTest.php | 3 +- tests/Doctrine/Tests/ORM/Query/ExprTest.php | 26 +++++----- .../ORM/Query/LanguageRecognitionTest.php | 2 +- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 4 +- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 10 ++-- .../GenerateRepositoriesCommandTest.php | 2 +- .../Tools/EntityRepositoryGeneratorTest.php | 2 +- .../Pagination/CountOutputWalkerTest.php | 6 +-- .../ORM/Tools/Pagination/CountWalkerTest.php | 12 ++--- .../LimitSubqueryOutputWalkerTest.php | 22 ++++---- .../Pagination/LimitSubqueryWalkerTest.php | 10 ++-- .../Tools/Pagination/WhereInWalkerTest.php | 18 +++---- 95 files changed, 417 insertions(+), 290 deletions(-) diff --git a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php index 7a7caf18edc..f27e38c4779 100644 --- a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php +++ b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php @@ -40,7 +40,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event) * * @return bool */ - private function isVisited(ClassMetaData $metadata) + private function isVisited(ClassMetadata $metadata) { return isset($this->enabledItems[$metadata->getName()]); } @@ -48,7 +48,7 @@ private function isVisited(ClassMetaData $metadata) /** * @param ClassMetadata $metadata */ - private function recordVisit(ClassMetaData $metadata) + private function recordVisit(ClassMetadata $metadata) { $this->enabledItems[$metadata->getName()] = true; } diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php index 18edd75a306..22828b0164b 100644 --- a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php +++ b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php @@ -20,7 +20,7 @@ class DDC2504RootClass public $id; /** - * @var Doctrine\Tests\Models\DDC\DDC2504OtherClass + * @var \Doctrine\Tests\Models\DDC2504\DDC2504OtherClass * * @ManyToOne(targetEntity="DDC2504OtherClass", inversedBy="childClasses") */ diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php index 25ed140eab1..4df5f9b68c8 100644 --- a/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php +++ b/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php @@ -10,7 +10,7 @@ class DDC3293User protected $id; /** - * @var Doctrine\Tests\Models\DDC3293\DDC3293Address + * @var \Doctrine\Tests\Models\DDC3293\DDC3293Address */ protected $address; } diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php index a70b26756a6..d83da15afad 100644 --- a/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php +++ b/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php @@ -10,7 +10,7 @@ class DDC3293UserPrefixed protected $id; /** - * @var Doctrine\Tests\Models\DDC3293\DDC3293Address + * @var \Doctrine\Tests\Models\DDC3293\DDC3293Address */ protected $address; } diff --git a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php index d6dd12e8b95..37f0fcd2982 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php +++ b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\Collection; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Base class for testing a many-to-many association mapping (without inheritance). */ -class AbstractManyToManyAssociationTestCase extends \Doctrine\Tests\OrmFunctionalTestCase +class AbstractManyToManyAssociationTestCase extends OrmFunctionalTestCase { protected $_firstField; protected $_secondField; diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php index 6847d01c356..5546b285e86 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php @@ -2,14 +2,16 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional tests for the Single Table Inheritance mapping strategy. * * @author robo */ -class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class AdvancedAssociationTest extends OrmFunctionalTestCase { protected function setUp() { parent::setUp(); @@ -151,7 +153,7 @@ class Lemma { private $types; public function __construct() { - $this->types = new \Doctrine\Common\Collections\ArrayCollection(); + $this->types = new ArrayCollection(); } @@ -257,7 +259,7 @@ class Type { private $lemmas; public function __construct(){ - $this->lemmas = new \Doctrine\Common\Collections\ArrayCollection(); + $this->lemmas = new ArrayCollection(); } /** @@ -372,7 +374,7 @@ class Phrase { private $definitions; public function __construct() { - $this->definitions = new \Doctrine\Common\Collections\ArrayCollection; + $this->definitions = new ArrayCollection; } /** @@ -464,7 +466,7 @@ class PhraseType { private $phrases; public function __construct() { - $this->phrases = new \Doctrine\Common\Collections\ArrayCollection; + $this->phrases = new ArrayCollection; } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php index 67038a7818f..a7c35412b52 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php @@ -5,13 +5,14 @@ use Doctrine\Tests\Models\Company\CompanyEmployee, Doctrine\Tests\Models\Company\CompanyManager, Doctrine\Tests\Models\Company\CompanyCar; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional Query tests. * * @author Benjamin */ -class AdvancedDqlQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase +class AdvancedDqlQueryTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index 42a75be140b..2046d59a03b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -2,14 +2,19 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\DBAL\Logging\DebugStack; +use Doctrine\ORM\EntityNotFoundException; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; +use Doctrine\ORM\UnitOfWork; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Tests\Models\CMS\CmsComment; +use Doctrine\Tests\OrmFunctionalTestCase; -class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase +class BasicFunctionalTest extends OrmFunctionalTestCase { protected function setUp() { @@ -65,9 +70,9 @@ public function testBasicUnitsOfWorkWithOneToManyAssociation() $this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($user)); $this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($ph)); $this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($ph2)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph2)); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user)); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph)); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph2)); } public function testOneToManyAssociationModification() @@ -146,15 +151,15 @@ public function testRemove() $user->username = 'gblanco'; $user->status = 'developer'; - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); $this->_em->persist($user); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_MANAGED"); + $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_MANAGED"); $this->_em->remove($user); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); $this->_em->persist($user); $this->_em->flush(); @@ -162,10 +167,10 @@ public function testRemove() $this->_em->remove($user); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_REMOVED"); + $this->assertEquals(UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_REMOVED"); $this->_em->flush(); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); + $this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW"); $this->assertNull($this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $id)); } @@ -565,7 +570,7 @@ public function testTextColumnSaveAndRetrieve() $this->_em->persist($user); - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->text = "Lorem ipsum dolor sunt."; $article->topic = "A Test Article!"; $article->setAuthor($user); @@ -608,7 +613,7 @@ public function testFlushDoesNotIssueUnnecessaryUpdates() $address->user = $user; $user->address = $address; - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->text = "Lorem ipsum dolor sunt."; $article->topic = "A Test Article!"; $article->setAuthor($user); @@ -628,7 +633,7 @@ public function testFlushDoesNotIssueUnnecessaryUpdates() $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address); $oldLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); - $debugStack = new \Doctrine\DBAL\Logging\DebugStack; + $debugStack = new DebugStack(); $this->_em->getConnection()->getConfiguration()->setSQLLogger($debugStack); $this->_em->flush(); @@ -938,7 +943,7 @@ public function testMergeThrowsExceptionIfEntityWithGeneratedIdentifierDoesNotEx try { $this->_em->merge($user); $this->fail(); - } catch (\Doctrine\ORM\EntityNotFoundException $enfe) {} + } catch (EntityNotFoundException $enfe) {} } /** @@ -995,7 +1000,7 @@ public function testManyToOneFetchModeQuery() $dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.id = ?1"; $article = $this->_em->createQuery($dql) ->setParameter(1, $article->id) - ->setFetchMode('Doctrine\Tests\Models\CMS\CmsArticle', 'user', \Doctrine\ORM\Mapping\ClassMetadata::FETCH_EAGER) + ->setFetchMode('Doctrine\Tests\Models\CMS\CmsArticle', 'user', ClassMetadata::FETCH_EAGER) ->getSingleResult(); $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $article->user, "It IS a proxy, ..."); $this->assertTrue($article->user->__isInitialized__, "...but its initialized!"); @@ -1041,14 +1046,14 @@ public function testClearWithEntityName() $this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser'); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article2)); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address)); + $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user)); + $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1)); + $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article2)); + $this->assertEquals(UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address)); $this->_em->clear(); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address)); + $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address)); } public function testFlushManyExplicitEntities() diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index 9fd1648e083..a2392a3e86d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group CascadeRemoveOrderTest */ -class CascadeRemoveOrderTest extends \Doctrine\Tests\OrmFunctionalTestCase +class CascadeRemoveOrderTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index f8dd3b7a582..697f568ffb5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -10,15 +10,17 @@ Doctrine\Tests\Models\Company\CompanyRaffle; use Doctrine\Common\Collections\Criteria; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional tests for the Class Table Inheritance mapping strategy. * * @author robo */ -class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ClassTableInheritanceTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('company'); parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); @@ -80,7 +82,7 @@ public function testCRUD() $query->setParameter(1, 'NewName', 'string'); $query->setParameter(2, 'NewDepartment'); $query->setParameter(3, 100000); - $query->getSql(); + $query->getSQL(); $numUpdated = $query->execute(); $this->assertEquals(1, $numUpdated); diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php index 9c50a1496da..5682bffe108 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php @@ -1,15 +1,18 @@ _schemaTool->createSchema(array( @@ -156,19 +159,23 @@ class CTIRelated2 private $ctiChildren; - public function __construct() { - $this->ctiChildren = new \Doctrine\Common\Collections\ArrayCollection; + public function __construct() + { + $this->ctiChildren = new ArrayCollection(); } - public function getId() { + public function getId() + { return $this->id; } - public function addCTIChild(CTIChild $child) { + public function addCTIChild(CTIChild $child) + { $this->ctiChildren->add($child); } - public function getCTIChildren() { + public function getCTIChildren() + { return $this->ctiChildren; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php b/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php index 389b09a54bb..8c234c0f3f3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php @@ -4,18 +4,15 @@ use Doctrine\ORM\Event\OnClearEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * ClearEventTest * * @author Michael Ridgway */ -class ClearEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ClearEventTest extends OrmFunctionalTestCase { - protected function setUp() { - parent::setUp(); - } - public function testEventIsCalledOnClear() { $listener = new OnClearListener; diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php index 2e1cedb3917..835328d7503 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php @@ -6,8 +6,9 @@ use Doctrine\Tests\Models\Navigation\NavTour; use Doctrine\Tests\Models\Navigation\NavPhotos; use Doctrine\Tests\Models\Navigation\NavUser; +use Doctrine\Tests\OrmFunctionalTestCase; -class CompositePrimaryKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase +class CompositePrimaryKeyTest extends OrmFunctionalTestCase { public function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php index 6ded5bb494e..b735925e63f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php @@ -5,8 +5,9 @@ use Doctrine\Tests\Models\GeoNames\Country; use Doctrine\Tests\Models\GeoNames\Admin1; use Doctrine\Tests\Models\GeoNames\Admin1AlternateName; +use Doctrine\Tests\OrmFunctionalTestCase; -class CompositePrimaryKeyWithAssociationsTest extends \Doctrine\Tests\OrmFunctionalTestCase +class CompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase { public function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php index 29d71856016..37149abfd3a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\DBAL\Platforms\SQLServerPlatform; +use Doctrine\DBAL\Schema\Table; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\DBAL\Platforms\PostgreSqlPlatform; @@ -30,10 +31,10 @@ public function testIssue2059() $this->markTestSkipped('Platform does not support foreign keys.'); } - $user = new \Doctrine\DBAL\Schema\Table("ddc2059_user"); + $user = new Table("ddc2059_user"); $user->addColumn('id', 'integer'); $user->setPrimaryKey(array('id')); - $project = new \Doctrine\DBAL\Schema\Table("ddc2059_project"); + $project = new Table("ddc2059_project"); $project->addColumn('id', 'integer'); $project->addColumn('user_id', 'integer'); $project->addColumn('user', 'string'); @@ -52,7 +53,7 @@ public function testLoadMetadataFromDatabase() $this->markTestSkipped('Platform does not support foreign keys.'); } - $table = new \Doctrine\DBAL\Schema\Table("dbdriver_foo"); + $table = new Table("dbdriver_foo"); $table->addColumn('id', 'integer'); $table->setPrimaryKey(array('id')); $table->addColumn('bar', 'string', array('notnull' => false, 'length' => 200)); @@ -83,13 +84,13 @@ public function testLoadMetadataWithForeignKeyFromDatabase() $this->markTestSkipped('Platform does not support foreign keys.'); } - $tableB = new \Doctrine\DBAL\Schema\Table("dbdriver_bar"); + $tableB = new Table("dbdriver_bar"); $tableB->addColumn('id', 'integer'); $tableB->setPrimaryKey(array('id')); $this->_sm->dropAndCreateTable($tableB); - $tableA = new \Doctrine\DBAL\Schema\Table("dbdriver_baz"); + $tableA = new Table("dbdriver_baz"); $tableA->addColumn('id', 'integer'); $tableA->setPrimaryKey(array('id')); $tableA->addColumn('bar_id', 'integer'); @@ -133,15 +134,15 @@ public function testDetectManyToManyTables() public function testIgnoreManyToManyTableWithoutFurtherForeignKeyDetails() { - $tableB = new \Doctrine\DBAL\Schema\Table("dbdriver_bar"); + $tableB = new Table("dbdriver_bar"); $tableB->addColumn('id', 'integer'); $tableB->setPrimaryKey(array('id')); - $tableA = new \Doctrine\DBAL\Schema\Table("dbdriver_baz"); + $tableA = new Table("dbdriver_baz"); $tableA->addColumn('id', 'integer'); $tableA->setPrimaryKey(array('id')); - $tableMany = new \Doctrine\DBAL\Schema\Table("dbdriver_bar_baz"); + $tableMany = new Table("dbdriver_bar_baz"); $tableMany->addColumn('bar_id', 'integer'); $tableMany->addColumn('baz_id', 'integer'); $tableMany->addForeignKeyConstraint('dbdriver_bar', array('bar_id'), array('id')); @@ -157,7 +158,7 @@ public function testLoadMetadataFromDatabaseDetail() $this->markTestSkipped('Platform does not support foreign keys.'); } - $table = new \Doctrine\DBAL\Schema\Table("dbdriver_foo"); + $table = new Table("dbdriver_foo"); $table->addColumn('id', 'integer', array('unsigned' => true)); $table->setPrimaryKey(array('id')); diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php index 35fd8b20c5c..03902c40ca9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php +++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Mapping\Driver\DatabaseDriver; use Doctrine\Tests\OrmFunctionalTestCase; use Doctrine\ORM\Mapping\ClassMetadataInfo; @@ -13,7 +14,7 @@ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase protected function convertToClassMetadata(array $entityTables, array $manyTables = array()) { $sm = $this->_em->getConnection()->getSchemaManager(); - $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm); + $driver = new DatabaseDriver($sm); $driver->setTables($entityTables, $manyTables); $metadatas = array(); @@ -36,7 +37,7 @@ protected function extractClassMetadata(array $classNames) $metadatas = array(); $sm = $this->_em->getConnection()->getSchemaManager(); - $driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm); + $driver = new DatabaseDriver($sm); foreach ($driver->getAllClassNames() as $className) { if (!in_array(strtolower($className), $classNames)) { diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php index b1f7cda9c73..e81bd7f8ac1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php @@ -1,15 +1,17 @@ _schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index bc6c0cdd7f2..c78d258597a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -6,15 +6,17 @@ use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Description of DetachedEntityTest * * @author robo */ -class DetachedEntityTest extends \Doctrine\Tests\OrmFunctionalTestCase +class DetachedEntityTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php index 58479526322..89901be1969 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php @@ -3,11 +3,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1955 */ -class EntityListenersTest extends \Doctrine\Tests\OrmFunctionalTestCase +class EntityListenersTest extends OrmFunctionalTestCase { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php index 6a626b3f44e..45f552d5949 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php @@ -23,11 +23,12 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\Tests\Models\Tweet\Tweet; use Doctrine\Tests\Models\Tweet\User; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @author Josiah */ -class EntityRepositoryCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase +class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index 8e20d570a7b..685478f35f6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -2,18 +2,22 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\DBAL\Connection; +use Doctrine\DBAL\LockMode; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @author robo */ -class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase +class EntityRepositoryTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); } @@ -290,7 +294,7 @@ public function testPessimisticReadLockWithoutTransaction_ThrowsException() $this->setExpectedException('Doctrine\ORM\TransactionRequiredException'); $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->find(1, \Doctrine\DBAL\LockMode::PESSIMISTIC_READ); + ->find(1, LockMode::PESSIMISTIC_READ); } /** @@ -302,7 +306,7 @@ public function testPessimisticWriteLockWithoutTransaction_ThrowsException() $this->setExpectedException('Doctrine\ORM\TransactionRequiredException'); $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->find(1, \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE); + ->find(1, LockMode::PESSIMISTIC_WRITE); } /** @@ -314,7 +318,7 @@ public function testOptimisticLockUnversionedEntity_ThrowsException() $this->setExpectedException('Doctrine\ORM\OptimisticLockException'); $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->find(1, \Doctrine\DBAL\LockMode::OPTIMISTIC); + ->find(1, LockMode::OPTIMISTIC); } /** @@ -335,7 +339,7 @@ public function testIdentityMappedOptimisticLockUnversionedEntity_ThrowsExceptio $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); $this->setExpectedException('Doctrine\ORM\OptimisticLockException'); - $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, \Doctrine\DBAL\LockMode::OPTIMISTIC); + $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, LockMode::OPTIMISTIC); } /** @@ -670,7 +674,7 @@ public function testFindByAssociationArray() $query = array_pop($this->_sqlLoggerStack->queries); $this->assertEquals(array(1,2,3), $query['params'][0]); - $this->assertEquals(\Doctrine\DBAL\Connection::PARAM_INT_ARRAY, $query['types'][0]); + $this->assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php index 731a0826d60..c8af5bd8546 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php @@ -3,6 +3,10 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\DDC2504\DDC2504ChildClass; use Doctrine\Tests\Models\DDC2504\DDC2504OtherClass; use Doctrine\Tests\Models\Tweet\Tweet; @@ -99,7 +103,7 @@ public function testCountWhenNewEntityPresent() { $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); - $newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $newGroup = new CmsGroup(); $newGroup->name = "Test4"; $user->addGroup($newGroup); @@ -277,7 +281,7 @@ public function testContainsOneToMany() $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); // Test One to Many existence with state new - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->topic = "Testnew"; $article->text = "blub"; @@ -295,7 +299,7 @@ public function testContainsOneToMany() $this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized."); // Test One to Many existence with state managed - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->topic = "How to not fail anymore on tests"; $article->text = "That is simple! Just write more tests!"; @@ -414,7 +418,7 @@ public function testContainsManyToMany() $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); // Test Many to Many existence with state new - $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group = new CmsGroup(); $group->name = "A New group!"; $queryCount = $this->getCurrentQueryCount(); @@ -434,7 +438,7 @@ public function testContainsManyToMany() $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); // Test Many to Many existence with state managed - $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group = new CmsGroup(); $group->name = "My managed group"; $this->_em->persist($group); @@ -461,7 +465,7 @@ public function testContainsManyToManyInverse() $this->assertEquals($queryCount+1, $this->getCurrentQueryCount(), "Checking for contains of managed entity should cause one query to be executed."); $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); - $newUser = new \Doctrine\Tests\Models\CMS\CmsUser(); + $newUser = new CmsUser(); $newUser->name = "A New group!"; $queryCount = $this->getCurrentQueryCount(); @@ -488,7 +492,7 @@ public function testRemoveElementOneToMany() $this->assertEquals($queryCount, $this->getCurrentQueryCount()); // Test One to Many removal with Entity state as new - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->topic = "Testnew"; $article->text = "blub"; @@ -510,7 +514,7 @@ public function testRemoveElementOneToMany() $this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized."); // Test One to Many removal with Entity state as managed - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->topic = "How to not fail anymore on tests"; $article->text = "That is simple! Just write more tests!"; @@ -642,7 +646,7 @@ public function testRemoveElementManyToMany() $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); // Test Many to Many removal with Entity state as new - $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group = new CmsGroup(); $group->name = "A New group!"; $queryCount = $this->getCurrentQueryCount(); @@ -664,7 +668,7 @@ public function testRemoveElementManyToMany() $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); // Test Many to Many removal with Entity state as managed - $group = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group = new CmsGroup(); $group->name = "A New group!"; $this->_em->persist($group); @@ -693,7 +697,7 @@ public function testRemoveElementManyToManyInverse() $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), "Removing a managed entity should cause one query to be executed."); $this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized."); - $newUser = new \Doctrine\Tests\Models\CMS\CmsUser(); + $newUser = new CmsUser(); $newUser->name = "A New group!"; $queryCount = $this->getCurrentQueryCount(); @@ -711,7 +715,7 @@ public function testCountAfterAddThenFlush() { $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); - $newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $newGroup = new CmsGroup(); $newGroup->name = "Test4"; $user->addGroup($newGroup); @@ -735,7 +739,7 @@ public function testSliceOnDirtyCollection() $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); /* @var $user CmsUser */ - $newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $newGroup = new CmsGroup(); $newGroup->name = "Test4"; $user->addGroup($newGroup); @@ -947,22 +951,22 @@ public function testContainsKeyNonExistentIndexByManyToMany() private function loadFixture() { - $user1 = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user1 = new CmsUser(); $user1->username = "beberlei"; $user1->name = "Benjamin"; $user1->status = "active"; - $user2 = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user2 = new CmsUser(); $user2->username = "jwage"; $user2->name = "Jonathan"; $user2->status = "active"; - $user3 = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user3 = new CmsUser(); $user3->username = "romanb"; $user3->name = "Roman"; $user3->status = "active"; - $user4 = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user4 = new CmsUser(); $user4->username = "gblanco"; $user4->name = "Guilherme"; $user4->status = "active"; @@ -972,13 +976,13 @@ private function loadFixture() $this->_em->persist($user3); $this->_em->persist($user4); - $group1 = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group1 = new CmsGroup(); $group1->name = "Test1"; - $group2 = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group2 = new CmsGroup(); $group2->name = "Test2"; - $group3 = new \Doctrine\Tests\Models\CMS\CmsGroup(); + $group3 = new CmsGroup(); $group3->name = "Test3"; $user1->addGroup($group1); @@ -993,12 +997,12 @@ private function loadFixture() $this->_em->persist($group2); $this->_em->persist($group3); - $article1 = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article1 = new CmsArticle(); $article1->topic = "Test1"; $article1->text = "Test1"; $article1->setAuthor($user1); - $article2 = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article2 = new CmsArticle(); $article2->topic = "Test2"; $article2->text = "Test2"; $article2->setAuthor($user1); @@ -1006,10 +1010,10 @@ private function loadFixture() $this->_em->persist($article1); $this->_em->persist($article2); - $phonenumber1 = new \Doctrine\Tests\Models\CMS\CmsPhonenumber(); + $phonenumber1 = new CmsPhonenumber(); $phonenumber1->phonenumber = '12345'; - $phonenumber2 = new \Doctrine\Tests\Models\CMS\CmsPhonenumber(); + $phonenumber2 = new CmsPhonenumber(); $phonenumber2->phonenumber = '67890'; $this->_em->persist($phonenumber1); diff --git a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php index bd3a33002cf..b9298e3dc09 100644 --- a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php @@ -6,15 +6,17 @@ use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * FlushEventTest * * @author robo */ -class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class FlushEventTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php index b79f9f3cbc6..94a11dab490 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php @@ -2,10 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\Tests\Models\CMS\CmsAddress, - Doctrine\Tests\Models\CMS\CmsPhonenumber, - Doctrine\ORM\Query; +use Doctrine\ORM\Query; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * IdentityMapTest @@ -15,9 +16,10 @@ * * @author Roman Borschel */ -class IdentityMapTest extends \Doctrine\Tests\OrmFunctionalTestCase +class IdentityMapTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php index e5a4d1d9e9d..9dac4155ded 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php @@ -5,14 +5,15 @@ use Doctrine\Tests\Models\StockExchange\Stock; use Doctrine\Tests\Models\StockExchange\Market; use Doctrine\Tests\Models\StockExchange\Bond; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-250 */ -class IndexByAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class IndexByAssociationTest extends OrmFunctionalTestCase { /** - * @var Doctrine\Tests\Models\StockExchange\Market + * @var Market */ private $market; diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 9b60c43b2b7..50864592751 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -1,12 +1,18 @@ _schemaTool->createSchema(array( @@ -470,7 +476,7 @@ class LifecycleCallbackCascader public function __construct() { - $this->entities = new \Doctrine\Common\Collections\ArrayCollection(); + $this->entities = new ArrayCollection(); } /** @PostLoad */ @@ -516,7 +522,7 @@ class LifecycleCallbackEventArgEntity /** * @PostPersist */ - public function postPersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function postPersistHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -524,7 +530,7 @@ public function postPersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event /** * @PrePersist */ - public function prePersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function prePersistHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -532,7 +538,7 @@ public function prePersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) /** * @PostUpdate */ - public function postUpdateHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function postUpdateHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -540,7 +546,7 @@ public function postUpdateHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) /** * @PreUpdate */ - public function preUpdateHandler(\Doctrine\ORM\Event\PreUpdateEventArgs $event) + public function preUpdateHandler(PreUpdateEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -548,7 +554,7 @@ public function preUpdateHandler(\Doctrine\ORM\Event\PreUpdateEventArgs $event) /** * @PostRemove */ - public function postRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function postRemoveHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -556,7 +562,7 @@ public function postRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) /** * @PreRemove */ - public function preRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function preRemoveHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -564,7 +570,7 @@ public function preRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) /** * @PreFlush */ - public function preFlushHandler(\Doctrine\ORM\Event\PreFlushEventArgs $event) + public function preFlushHandler(PreFlushEventArgs $event) { $this->calls[__FUNCTION__] = $event; } @@ -572,7 +578,7 @@ public function preFlushHandler(\Doctrine\ORM\Event\PreFlushEventArgs $event) /** * @PostLoad */ - public function postLoadHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event) + public function postLoadHandler(LifecycleEventArgs $event) { $this->calls[__FUNCTION__] = $event; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php index 4cd8dfec0e7..0ca10460f80 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php @@ -2,6 +2,11 @@ namespace Doctrine\Tests\ORM\Functional\Locking; +use Doctrine\Common\Cache\ArrayCache; +use Doctrine\DBAL\Logging\EchoSQLLogger; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\EntityManager; + class LockAgentWorker { private $em; @@ -88,7 +93,7 @@ protected function processWorkload($job) protected function createEntityManager($conn) { - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->setProxyDir(__DIR__ . '/../../../Proxies'); $config->setProxyNamespace('MyProject\Proxies'); $config->setAutoGenerateProxyClasses(true); @@ -96,12 +101,12 @@ protected function createEntityManager($conn) $annotDriver = $config->newDefaultAnnotationDriver(array(__DIR__ . '/../../../Models/'), true); $config->setMetadataDriverImpl($annotDriver); - $cache = new \Doctrine\Common\Cache\ArrayCache(); + $cache = new ArrayCache(); $config->setMetadataCacheImpl($cache); $config->setQueryCacheImpl($cache); - $config->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger()); + $config->setSQLLogger(new EchoSQLLogger()); - $em = \Doctrine\ORM\EntityManager::create($conn, $config); + $em = EntityManager::create($conn, $config); return $em; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index 1face5f3115..e3c3b5b5c93 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php @@ -2,15 +2,19 @@ namespace Doctrine\Tests\ORM\Functional\Locking; -use Doctrine\Tests\Models\CMS\CmsArticle, - Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\DBAL\LockMode; +use Doctrine\DBAL\LockMode; +use Doctrine\ORM\Query; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group locking */ -class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase { - protected function setUp() { +class LockTest extends OrmFunctionalTestCase +{ + protected function setUp() + { $this->useModelSet('cms'); parent::setUp(); $this->handles = array(); @@ -111,8 +115,9 @@ public function testLockPessimisticWrite_NoTransaction_ThrowsException() { * @group DDC-178 * @group locking */ - public function testLockPessimisticWrite() { - $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSql(); + public function testLockPessimisticWrite() + { + $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL(); if (strlen($writeLockSql) == 0) { $this->markTestSkipped('Database Driver has no Write Lock support.'); } @@ -141,8 +146,9 @@ public function testLockPessimisticWrite() { /** * @group DDC-178 */ - public function testLockPessimisticRead() { - $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSql(); + public function testLockPessimisticRead() + { + $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSQL(); if (strlen($readLockSql) == 0) { $this->markTestSkipped('Database Driver has no Write Lock support.'); } @@ -177,7 +183,7 @@ public function testLockOptimisticNonVersionedThrowsExceptionInDQL() $this->setExpectedException('Doctrine\ORM\OptimisticLockException', 'The optimistic lock on an entity failed.'); $sql = $this->_em->createQuery($dql)->setHint( - \Doctrine\ORM\Query::HINT_LOCK_MODE, \Doctrine\DBAL\LockMode::OPTIMISTIC + Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC )->getSQL(); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index da4d3007739..2d051b68831 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -3,10 +3,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\UnitOfWork; use Doctrine\Tests\Models\CMS\CmsTag; use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsGroup, Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Basic many-to-many association tests. @@ -14,7 +16,7 @@ * * @author robo */ -class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase { protected function setUp() { @@ -53,8 +55,8 @@ public function testBasicManyToManyJoin() $groups = $result[0]->getGroups(); $this->assertEquals('Developers_0', $groups[0]->getName()); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($result[0])); - $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($groups[0])); + $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($result[0])); + $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($groups[0])); $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups); $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups[0]->getUsers()); diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php index 105ba095c03..87283ec4bf1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php @@ -5,13 +5,14 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * ManyToManyEventTest * * @author Francisco Facioni */ -class ManyToManyEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ManyToManyEventTest extends OrmFunctionalTestCase { /** * @var PostUpdateListener diff --git a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php index 70034076611..fb7f0a7249d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php @@ -1,13 +1,16 @@ useModelSet('directorytree'); @@ -16,15 +19,15 @@ protected function setUp() { public function testCRUD() { - $root = new \Doctrine\Tests\Models\DirectoryTree\Directory(); + $root = new Directory(); $root->setName('Root'); $root->setPath('/root'); - $directory = new \Doctrine\Tests\Models\DirectoryTree\Directory($root); + $directory = new Directory($root); $directory->setName('TestA'); $directory->setPath('/root/dir'); - $file = new \Doctrine\Tests\Models\DirectoryTree\File($directory); + $file = new File($directory); $file->setName('test-b.html'); $this->_em->persist($root); diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php index 6c619852016..9b3b338a083 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php @@ -4,8 +4,9 @@ use Doctrine\Tests\Models\MixedToOneIdentity\CompositeToOneKeyState; use Doctrine\Tests\Models\MixedToOneIdentity\Country; +use Doctrine\Tests\OrmFunctionalTestCase; -class MergeCompositeToOneKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase +class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase { /** * {@inheritDoc} diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 28184650357..6c460684dd2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -13,17 +13,19 @@ use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\Tests\Models\Company\CompanyEmployee; use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\OrmFunctionalTestCase; /** * NativeQueryTest * * @author robo */ -class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase +class NativeQueryTest extends OrmFunctionalTestCase { private $platform = null; - protected function setUp() { + protected function setUp() + { $this->useModelSet('cms'); $this->useModelSet('company'); parent::setUp(); @@ -197,7 +199,7 @@ public function testFluentInterface() $rsm = new ResultSetMapping; $q = $this->_em->createNativeQuery('SELECT id, name, status, phonenumber FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', $rsm); - $q2 = $q->setSql('foo', $rsm) + $q2 = $q->setSQL('foo') ->setResultSetMapping($rsm) ->expireResultCache(true) ->setHint('foo', 'bar') diff --git a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php index e8c0e300fa9..37067aec075 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php @@ -7,11 +7,12 @@ use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1574 */ -class NewOperatorTest extends \Doctrine\Tests\OrmFunctionalTestCase +class NewOperatorTest extends OrmFunctionalTestCase { /** * @var array diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php index ab6aa61cfba..ecebc28d9e3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php @@ -1,18 +1,21 @@ _schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index c904a147400..8327142fda6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -5,11 +5,12 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\Models\ECommerce\ECommerceFeature; use Doctrine\Common\Collections\Criteria; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ -class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase { private $product; private $firstFeature; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php index 345d6190cba..d22dbd4e2c3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php @@ -4,11 +4,12 @@ use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-many association mapping with orphan removal. */ -class OneToManyOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase { protected $userId; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php index ab077fe4a45..3d6c688bd2e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php @@ -5,11 +5,12 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCategory; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ -class OneToManySelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase { private $parent; private $firstChild; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php index b4db3b90ed7..e2c66311817 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php @@ -5,11 +5,12 @@ use Doctrine\Tests\Models\Routing\RoutingRoute; use Doctrine\Tests\Models\Routing\RoutingLocation; use Doctrine\Tests\Models\Routing\RoutingLeg; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ -class OneToManyUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToManyUnidirectionalAssociationTest extends OrmFunctionalTestCase { protected $locations = array(); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php index 4ecfd5f9018..6d42e76348d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php @@ -6,11 +6,12 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ -class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase { private $customer; private $cart; @@ -88,7 +89,7 @@ public function testInverseSideIsNeverLazy() $customer = $result[0]; $this->assertNull($customer->getMentor()); - $this->assertInstanceOF('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getCart()); $this->assertEquals('paypal', $customer->getCart()->getPayment()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php index fb6ed5ab76d..522a009eba8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php @@ -1,16 +1,19 @@ _em); + $schemaTool = new SchemaTool($this->_em); try { $schemaTool->createSchema(array( $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Train'), @@ -248,7 +251,7 @@ class Train public function __construct(TrainOwner $owner) { - $this->waggons = new \Doctrine\Common\Collections\ArrayCollection(); + $this->waggons = new ArrayCollection(); $this->setOwner($owner); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php index 528bf56b3c6..34bbc8c55b9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php @@ -5,11 +5,12 @@ use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsEmail, Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a bidirectional one-to-one association mapping with orphan removal. */ -class OneToOneOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToOneOrphanRemovalTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index 4d173f3dce6..cad28d4c3c1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -5,6 +5,7 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a self referential one-to-one association mapping (without inheritance). @@ -13,7 +14,7 @@ * for receiving support. * Inverse side is not present. */ -class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase { private $customer; private $mentor; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php index 61bb8c611a2..60b5b36567b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php @@ -7,12 +7,13 @@ use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests a unidirectional one-to-one association mapping (without inheritance). * Inverse side is not present. */ -class OneToOneUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OneToOneUnidirectionalAssociationTest extends OrmFunctionalTestCase { private $product; private $shipping; diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php index d85357bac58..c4e5dca7018 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php @@ -6,8 +6,9 @@ use Doctrine\Tests\Models\Routing\RoutingLocation; use Doctrine\Tests\Models\Routing\RoutingLeg; use Doctrine\Tests\Models\Routing\RoutingRouteBooking; +use Doctrine\Tests\OrmFunctionalTestCase; -class OrderedCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OrderedCollectionTest extends OrmFunctionalTestCase { protected $locations = array(); diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php index cef4645744e..b3d85340e97 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php @@ -3,15 +3,17 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Query; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional tests for the Single Table Inheritance mapping strategy. * * @author Benjamin Eberlei */ -class OrderedJoinedTableInheritanceCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase +class OrderedJoinedTableInheritanceCollectionTest extends OrmFunctionalTestCase { - protected function setUp() { + protected function setUp() + { parent::setUp(); try { $this->_schemaTool->createSchema(array( diff --git a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php index eea2e8375cd..07c3d664a89 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php @@ -13,12 +13,13 @@ use Doctrine\Tests\Models\Pagination\Department; use Doctrine\Tests\Models\Pagination\Logo; use Doctrine\Tests\Models\Pagination\User1; +use Doctrine\Tests\OrmFunctionalTestCase; use ReflectionMethod; /** * @group DDC-1613 */ -class PaginationTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PaginationTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php index b6e58246f85..e38574b7c80 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php @@ -23,11 +23,12 @@ use Doctrine\Tests\Models\Quote\User as QuoteUser; use Doctrine\Tests\Models\Tweet\Tweet; use Doctrine\Tests\Models\Tweet\User as TweetUser; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @author Michaël Gallego */ -class PersistentCollectionCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php index c2181b8b119..c6cb20e236d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php @@ -2,12 +2,14 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Persistence\PersistentObject; +use Doctrine\Tests\OrmFunctionalTestCase; /** */ -class PersistentCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PersistentCollectionTest extends OrmFunctionalTestCase { protected function setUp() { @@ -114,7 +116,7 @@ class PersistentCollectionHolder extends PersistentObject public function __construct() { - $this->collection = new \Doctrine\Common\Collections\ArrayCollection(); + $this->collection = new ArrayCollection(); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index 88e54ae2e5d..861b2922510 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Persistence\PersistentObject; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Test that Doctrine ORM correctly works with the ObjectManagerAware and PersistentObject @@ -10,7 +11,7 @@ * * @group DDC-1448 */ -class PersistentObjectTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PersistentObjectTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php index e23038e6978..12e2c40809d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php @@ -5,13 +5,14 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\ORM\Event\PostFlushEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * PostFlushEventTest * * @author Daniel Freudenberger */ -class PostFlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PostFlushEventTest extends OrmFunctionalTestCase { /** * @var PostFlushListener diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php index 9dcff9cb65b..7a5adbe7add 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php @@ -8,13 +8,14 @@ use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * PostLoadEventTest * * @author Guilherme Blanco */ -class PostLoadEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PostLoadEventTest extends OrmFunctionalTestCase { /** * @var integer diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php index f84147374c5..c6d3ebe1028 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php @@ -3,13 +3,14 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Cache\ArrayCache; +use Doctrine\Tests\OrmFunctionalTestCase; /** * QueryCacheTest * * @author robo */ -class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase +class QueryCacheTest extends OrmFunctionalTestCase { /** * @var \ReflectionProperty diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php index b0a4905ac33..764b213dde2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php @@ -3,13 +3,14 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Tests\Models\Company\CompanyManager; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional Query tests. * * @author robo */ -class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase +class QueryDqlFunctionTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 922c463a90b..ea150e7b2b7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -4,19 +4,21 @@ use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\UnexpectedResultException; use Doctrine\Tests\Models\CMS\CmsUser, Doctrine\Tests\Models\CMS\CmsArticle, Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; use Doctrine\ORM\Query\Parameter; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional Query tests. * * @author robo */ -class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase +class QueryTest extends OrmFunctionalTestCase { protected function setUp() { @@ -390,7 +392,7 @@ public function testSupportsQueriesWithEntityNamespaces() try { $query = $this->_em->createQuery('UPDATE CMS:CmsUser u SET u.name = ?1'); - $this->assertEquals('UPDATE cms_users SET name = ?', $query->getSql()); + $this->assertEquals('UPDATE cms_users SET name = ?', $query->getSQL()); $query->free(); } catch (\Exception $e) { $this->fail($e->getMessage()); @@ -753,7 +755,7 @@ public function testUnexpectedResultException() try { $this->_em->createQuery($dql)->getSingleResult(); $this->fail('Expected exception "\Doctrine\ORM\NoResultException".'); - } catch (\Doctrine\ORM\UnexpectedResultException $exc) { + } catch (UnexpectedResultException $exc) { $this->assertInstanceOf('\Doctrine\ORM\NoResultException', $exc); } @@ -766,7 +768,7 @@ public function testUnexpectedResultException() try { $this->_em->createQuery($dql)->getSingleResult(); $this->fail('Expected exception "\Doctrine\ORM\NonUniqueResultException".'); - } catch (\Doctrine\ORM\UnexpectedResultException $exc) { + } catch (UnexpectedResultException $exc) { $this->assertInstanceOf('\Doctrine\ORM\NonUniqueResultException', $exc); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php index 0cfbdc16ef3..dd8a23ff374 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php @@ -1,13 +1,14 @@ * @author Benjamin Eberlei */ -class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ReferenceProxyTest extends OrmFunctionalTestCase { protected function setUp() { @@ -230,9 +232,9 @@ public function testCommonPersistenceProxy() { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ + /* @var $entity ECommerceProduct */ $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); - $className = \Doctrine\Common\Util\ClassUtils::getClass($entity); + $className = ClassUtils::getClass($entity); $this->assertInstanceOf('Doctrine\Common\Persistence\Proxy', $entity); $this->assertFalse($entity->__isInitialized()); diff --git a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php index 5804734766c..e1bd93ed792 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php @@ -2,16 +2,19 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Query; +use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Common\Cache\ArrayCache; +use Doctrine\Tests\OrmFunctionalTestCase; /** * ResultCacheTest * * @author robo */ -class ResultCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase +class ResultCacheTest extends OrmFunctionalTestCase { /** * @var \ReflectionProperty @@ -133,7 +136,7 @@ public function testUseResultCacheParams() public function testNativeQueryResultCaching() { $cache = new ArrayCache(); - $rsm = new \Doctrine\ORM\Query\ResultSetMapping(); + $rsm = new ResultSetMapping(); $rsm->addScalarResult('id', 'u', 'integer'); @@ -190,7 +193,7 @@ public function testResultCacheNotDependsOnHydrationMode($query) $cache = $query->getResultCacheDriver(); $cacheCount = $this->getCacheSize($cache); - $this->assertNotEquals(\Doctrine\ORM\Query::HYDRATE_ARRAY, $query->getHydrationMode()); + $this->assertNotEquals(Query::HYDRATE_ARRAY, $query->getHydrationMode()); $query->getArrayResult(); $this->assertEquals($cacheCount, $this->getCacheSize($cache)); diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php index bbf688c46b3..5fccc0bdb81 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\ORM\Configuration; use Doctrine\ORM\Query\Filter\SQLFilter; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Common\Cache\ArrayCache; @@ -21,6 +22,7 @@ use Doctrine\Tests\Models\Company\CompanyFlexContract; use Doctrine\Tests\Models\Company\CompanyFlexUltraContract; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests SQLFilter functionality. @@ -29,7 +31,7 @@ * * @group non-cacheable */ -class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase +class SQLFilterTest extends OrmFunctionalTestCase { private $userId, $userId2, $articleId, $articleId2; private $groupId, $groupId2; @@ -54,7 +56,7 @@ public function tearDown() public function testConfigureFilter() { - $config = new \Doctrine\ORM\Configuration(); + $config = new Configuration(); $config->addFilter("locale", "\Doctrine\Tests\ORM\Functional\MyLocaleFilter"); @@ -69,7 +71,7 @@ public function testEntityManagerEnableFilter() // Enable an existing filter $filter = $em->getFilters()->enable("locale"); - $this->assertTrue($filter instanceof \Doctrine\Tests\ORM\Functional\MyLocaleFilter); + $this->assertTrue($filter instanceof MyLocaleFilter); // Enable the filter again $filter2 = $em->getFilters()->enable("locale"); @@ -223,7 +225,7 @@ public function testSQLFilterGetSetParameter() ->with($this->equalTo('en')) ->will($this->returnValue("'en'")); - $em = $this->getMockEntityManager($conn); + $em = $this->getMockEntityManager(); $em->expects($this->once()) ->method('getConnection') ->will($this->returnValue($conn)); @@ -249,7 +251,7 @@ public function testSQLFilterGetConnection() // Setup mock connection $conn = $this->getMockConnection(); - $em = $this->getMockEntityManager($conn); + $em = $this->getMockEntityManager(); $em->expects($this->once()) ->method('getConnection') ->will($this->returnValue($conn)); @@ -271,7 +273,7 @@ public function testSQLFilterSetParameterInfersType() ->with($this->equalTo('en')) ->will($this->returnValue("'en'")); - $em = $this->getMockEntityManager($conn); + $em = $this->getMockEntityManager(); $em->expects($this->once()) ->method('getConnection') ->will($this->returnValue($conn)); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php index 5e9fcda37ae..32c75d25de6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php @@ -3,13 +3,14 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Functional tests for the Class Table Inheritance mapping strategy. * * @author robo */ -class CompanySchemaTest extends \Doctrine\Tests\OrmFunctionalTestCase +class CompanySchemaTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php index 8887a0751c0..22debe96212 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php @@ -3,8 +3,9 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\ORM\Tools; +use Doctrine\Tests\OrmFunctionalTestCase; -class DBAL483Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DBAL483Test extends OrmFunctionalTestCase { public function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php index 22d2b1f8eed..4b4d0328d50 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php @@ -2,12 +2,14 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; +use Doctrine\DBAL\Schema\Comparator; use Doctrine\ORM\Tools; +use Doctrine\Tests\OrmFunctionalTestCase; /** * WARNING: This test should be run as last test! It can affect others very easily! */ -class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC214Test extends OrmFunctionalTestCase { private $classes = array(); private $schemaTool = null; @@ -78,7 +80,7 @@ public function assertCreatedSchemaNeedsNoUpdates($classes) $fromSchema = $sm->createSchema(); $toSchema = $this->schemaTool->getSchemaFromMetadata($classMetadata); - $comparator = new \Doctrine\DBAL\Schema\Comparator(); + $comparator = new Comparator(); $schemaDiff = $comparator->compare($fromSchema, $toSchema); $sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform()); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php index 66e9906883b..f98fe4bebd5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php @@ -3,8 +3,9 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\ORM\Tools\SchemaTool; +use Doctrine\Tests\OrmFunctionalTestCase; -class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase +class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php index c09f336c979..06eb67a2eb1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php @@ -3,13 +3,14 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Tools\SchemaValidator; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Test the validity of all modelsets * * @group DDC-1601 */ -class SchemaValidatorTest extends \Doctrine\Tests\OrmFunctionalTestCase +class SchemaValidatorTest extends OrmFunctionalTestCase { static public function dataValidateModelSets() { diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php index 6b177562fa2..f4d8e6b768d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php @@ -2,9 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Cache\DefaultCacheFactory; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\Mocks\ConcurrentRegionMock; use Doctrine\ORM\Cache\Region\DefaultRegion; +use Doctrine\Tests\Mocks\TimestampRegionMock; use Doctrine\Tests\Models\Cache\Country; use Doctrine\ORM\Cache\CollectionCacheKey; use Doctrine\ORM\Cache\EntityCacheKey; @@ -126,7 +128,7 @@ public function testBasicConcurrentCollectionReadLock() } } -class CacheFactorySecondLevelCacheConcurrentTest extends \Doctrine\ORM\Cache\DefaultCacheFactory +class CacheFactorySecondLevelCacheConcurrentTest extends DefaultCacheFactory { public function __construct(Cache $cache) { @@ -143,6 +145,6 @@ public function getRegion(array $cache) public function getTimestampRegion() { - return new \Doctrine\Tests\Mocks\TimestampRegionMock(); + return new TimestampRegionMock(); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php index 995c1d07f41..f5e1df0a8aa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\AbstractQuery; use Doctrine\Tests\Models\Cache\Country; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\Tests\Models\Cache\State; @@ -716,7 +717,7 @@ public function testQueryCacheLifetime() $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $getHash = function(\Doctrine\ORM\AbstractQuery $query){ + $getHash = function(AbstractQuery $query){ $method = new \ReflectionMethod($query, 'getHash'); $method->setAccessible(true); diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php index 38a6e4d2da0..02c891e7557 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php @@ -3,8 +3,9 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\DBAL\Schema\Sequence; +use Doctrine\Tests\OrmFunctionalTestCase; -class SequenceEmulatedIdentityStrategyTest extends \Doctrine\Tests\OrmFunctionalTestCase +class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase { /** * {@inheritdoc} diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index 6cb00f6869d..2fcd6a1b907 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -1,13 +1,14 @@ salesPerson = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $this->salesPerson = new CompanyEmployee(); $this->salesPerson->setName('Poor Sales Guy'); $this->salesPerson->setDepartment('Sales'); $this->salesPerson->setSalary(100); - $engineer1 = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $engineer1 = new CompanyEmployee(); $engineer1->setName('Roman B.'); $engineer1->setDepartment('IT'); $engineer1->setSalary(100); $this->engineers[] = $engineer1; - $engineer2 = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $engineer2 = new CompanyEmployee(); $engineer2->setName('Jonathan W.'); $engineer2->setDepartment('IT'); $engineer2->setSalary(100); $this->engineers[] = $engineer2; - $engineer3 = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $engineer3 = new CompanyEmployee(); $engineer3->setName('Benjamin E.'); $engineer3->setDepartment('IT'); $engineer3->setSalary(100); $this->engineers[] = $engineer3; - $engineer4 = new \Doctrine\Tests\Models\Company\CompanyEmployee(); + $engineer4 = new CompanyEmployee(); $engineer4->setName('Guilherme B.'); $engineer4->setDepartment('IT'); $engineer4->setSalary(100); @@ -61,14 +66,14 @@ public function loadFullFixture() { $this->persistRelatedEmployees(); - $this->fix = new \Doctrine\Tests\Models\Company\CompanyFixContract(); + $this->fix = new CompanyFixContract(); $this->fix->setFixPrice(1000); $this->fix->setSalesPerson($this->salesPerson); $this->fix->addEngineer($this->engineers[0]); $this->fix->addEngineer($this->engineers[1]); $this->fix->markCompleted(); - $this->flex = new \Doctrine\Tests\Models\Company\CompanyFlexContract(); + $this->flex = new CompanyFlexContract(); $this->flex->setSalesPerson($this->salesPerson); $this->flex->setHoursWorked(100); $this->flex->setPricePerHour(100); @@ -77,7 +82,7 @@ public function loadFullFixture() $this->flex->addEngineer($this->engineers[3]); $this->flex->markCompleted(); - $this->ultra = new \Doctrine\Tests\Models\Company\CompanyFlexUltraContract(); + $this->ultra = new CompanyFlexUltraContract(); $this->ultra->setSalesPerson($this->salesPerson); $this->ultra->setHoursWorked(150); $this->ultra->setPricePerHour(150); @@ -96,7 +101,7 @@ public function testPersistChildOfBaseClass() { $this->persistRelatedEmployees(); - $fixContract = new \Doctrine\Tests\Models\Company\CompanyFixContract(); + $fixContract = new CompanyFixContract(); $fixContract->setFixPrice(1000); $fixContract->setSalesPerson($this->salesPerson); @@ -115,7 +120,7 @@ public function testPersistDeepChildOfBaseClass() { $this->persistRelatedEmployees(); - $ultraContract = new \Doctrine\Tests\Models\Company\CompanyFlexUltraContract(); + $ultraContract = new CompanyFlexUltraContract(); $ultraContract->setSalesPerson($this->salesPerson); $ultraContract->setHoursWorked(100); $ultraContract->setPricePerHour(50); diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php index 31f28db3bc4..a335b234e08 100644 --- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php @@ -8,12 +8,13 @@ Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\ORM\Mapping\AssociationMapping; +use Doctrine\Tests\OrmFunctionalTestCase; /** * Tests capabilities of the persister. * @author Giorgio Sironi */ -class StandardEntityPersisterTest extends \Doctrine\Tests\OrmFunctionalTestCase +class StandardEntityPersisterTest extends OrmFunctionalTestCase { protected function setUp() { @@ -56,7 +57,7 @@ public function testAddPersistRetrieve() $p = new ECommerceProduct; $p->addFeature($f1); - $p->addfeature($f2); + $p->addFeature($f2); $this->_em->persist($p); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php index 98de7ee38aa..fccb0fd4cdf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php @@ -24,7 +24,7 @@ public function testPerformance() for ($i = 2; $i < 10000; ++$i) { $user = new CmsUser(); $user->status = 'developer'; - $user->username = 'jwage'+$i; + $user->username = 'jwage'.$i; $user->name = 'Jonathan'; $this->_em->persist($user); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php index cd678d5f1de..9369ca4c949 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php @@ -57,7 +57,7 @@ public function testHydration() $this->_em->flush(); $this->_em->clear(); - $foo = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC1080Foo', $foo1->getFooId()); + $foo = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC1080Foo', $foo1->getFooID()); $fooBars = $foo->getFooBars(); $this->assertEquals(3, count($fooBars), "Should return three foobars."); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php index 53d6bb6e259..fda16824621 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php @@ -105,7 +105,7 @@ public function testNotCloneAndPassAroundFlush() $user2->groups = $user1->groups; $user2->groups->add($group3); - $this->assertEQuals(1, count($user1->groups->getInsertDiff())); + $this->assertCount(1, $user1->groups->getInsertDiff()); $this->_em->persist($group3); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php index c6c23b9915a..5e587c4dfa8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-1707 */ -class DDC1707Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC1707Test extends OrmFunctionalTestCase { public function setUp() { @@ -27,9 +28,8 @@ public function testPostLoadOnChild() { $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1707Child'); $entity = new DDC1707Child(); - $event = new LifecycleEventArgs($entity, $this->_em); - $class->invokeLifecycleCallbacks(\Doctrine\ORM\Events::postLoad, $entity, $event); + $class->invokeLifecycleCallbacks(Events::postLoad, $entity); $this->assertTrue($entity->postLoad); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php index aebc6422c93..b2e02c26be1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php @@ -23,9 +23,9 @@ public function setUp() $this->user->name = "Benjamin"; $this->user->status = "active"; - $this->phone = new CmsPhoneNumber(); + $this->phone = new CmsPhonenumber(); $this->phone->phonenumber = '0123456789'; - $this->user->addPhoneNumber($this->phone); + $this->user->addPhonenumber($this->phone); $this->_em->persist($this->user); $this->_em->persist($this->phone); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php index 92df8d22fd0..5ec8ad730ae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php @@ -22,7 +22,7 @@ public function testSelectFieldOnRootEntity() $q = $this->_em->createQuery('SELECT e.name FROM Doctrine\Tests\Models\Company\CompanyEmployee e'); $this->assertEquals( strtolower('SELECT c0_.name AS name_0 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id'), - strtolower($q->getSql()) + strtolower($q->getSQL()) ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php index cb265dada23..eb368cd891d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php @@ -24,10 +24,10 @@ public function testRecomputeSingleEntityChangeSet_PreservesFieldOrder() $this->_em->persist($entity); $this->_em->getUnitOfWork()->computeChangeSet($this->_em->getClassMetadata(get_class($entity)), $entity); - $data1 = $this->_em->getUnitOfWork()->getEntityChangeset($entity); + $data1 = $this->_em->getUnitOfWork()->getEntityChangeSet($entity); $entity->setType('type2'); $this->_em->getUnitOfWork()->recomputeSingleEntityChangeSet($this->_em->getClassMetadata(get_class($entity)), $entity); - $data2 = $this->_em->getUnitOfWork()->getEntityChangeset($entity); + $data2 = $this->_em->getUnitOfWork()->getEntityChangeSet($entity); $this->assertEquals(array_keys($data1), array_keys($data2)); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php index 174726d5af4..295542aab1c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php @@ -22,7 +22,7 @@ public function setUp() */ private function setCascadeMergeFor($class) { - $metadata = $this->_em->getMetadataFactory()->getMetaDataFor($class); + $metadata = $this->_em->getMetadataFactory()->getMetadataFor($class); foreach ($metadata->associationMappings as $key => $associationMapping) { $metadata->associationMappings[$key]["isCascadePersist"] = false; $metadata->associationMappings[$key]["isCascadeMerge"] = true; diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index 47064d5e2f8..c27e0dee638 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -9,8 +9,9 @@ use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\Tests\OrmFunctionalTestCase; -class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase +class TypeTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php index aae0fbc715b..8e305d1f13c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php @@ -6,8 +6,9 @@ use Doctrine\Tests\Models\CustomType\CustomTypeParent; use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\Tests\OrmFunctionalTestCase; -class TypeValueSqlTest extends \Doctrine\Tests\OrmFunctionalTestCase +class TypeValueSqlTest extends OrmFunctionalTestCase { protected function setUp() { diff --git a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php index 5fa237ee4d9..d5d559a4ff1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php @@ -1,10 +1,11 @@ assertEquals('1 = 1 AND 2 = 2', (string) $this->_expr->andx((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2))); + $this->assertEquals('1 = 1 AND 2 = 2', (string) $this->_expr->andX((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2))); } public function testIntelligentParenthesisPreventionAndExpr() { $this->assertEquals( '1 = 1 AND 2 = 2', - (string) $this->_expr->andx($this->_expr->orx($this->_expr->andx($this->_expr->eq(1, 1))), (string) $this->_expr->eq(2, 2)) + (string) $this->_expr->andX($this->_expr->orX($this->_expr->andX($this->_expr->eq(1, 1))), (string) $this->_expr->eq(2, 2)) ); } public function testOrExpr() { - $this->assertEquals('1 = 1 OR 2 = 2', (string) $this->_expr->orx((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2))); + $this->assertEquals('1 = 1 OR 2 = 2', (string) $this->_expr->orX((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2))); } public function testAbsExpr() @@ -311,11 +311,11 @@ public function testNotInLiteralExpr() public function testAndxOrxExpr() { - $andExpr = $this->_expr->andx(); + $andExpr = $this->_expr->andX(); $andExpr->add($this->_expr->eq(1, 1)); $andExpr->add($this->_expr->lt(1, 5)); - $orExpr = $this->_expr->orx(); + $orExpr = $this->_expr->orX(); $orExpr->add($andExpr); $orExpr->add($this->_expr->eq(1, 1)); @@ -324,7 +324,7 @@ public function testAndxOrxExpr() public function testOrxExpr() { - $orExpr = $this->_expr->orx(); + $orExpr = $this->_expr->orX(); $orExpr->add($this->_expr->eq(1, 1)); $orExpr->add($this->_expr->lt(1, 5)); @@ -356,7 +356,7 @@ public function testOrderByAsc() */ public function testAddThrowsException() { - $orExpr = $this->_expr->orx(); + $orExpr = $this->_expr->orX(); $orExpr->add($this->_expr->quot(5, 2)); } @@ -433,15 +433,17 @@ public function testExpressionGetter() $this->assertEquals(array('foo', 'bar'), $select->getParts()); } - public function testAddEmpty() { - $andExpr = $this->_expr->andx(); - $andExpr->add($this->_expr->andx()); + public function testAddEmpty() + { + $andExpr = $this->_expr->andX(); + $andExpr->add($this->_expr->andX()); $this->assertEquals(0, $andExpr->count()); } - public function testAddNull() { - $andExpr = $this->_expr->andx(); + public function testAddNull() + { + $andExpr = $this->_expr->andX(); $andExpr->add(null); $this->assertEquals(0, $andExpr->count()); diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index daec446bbee..145b591e7a7 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -50,7 +50,7 @@ public function parseDql($dql, $hints = array()) { $query = $this->_em->createQuery($dql); $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); - $query->setDql($dql); + $query->setDQL($dql); foreach ($hints as $key => $value) { $query->setHint($key, $value); diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index d59c93b0741..7a3687c5216 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -74,7 +74,7 @@ public function testClone() $cloned = clone $query; - $this->assertEquals($dql, $cloned->getDql()); + $this->assertEquals($dql, $cloned->getDQL()); $this->assertEquals(0, count($cloned->getParameters())); $this->assertFalse($cloned->getHint('foo')); } @@ -92,7 +92,7 @@ public function testFluentQueryInterface() ->setParameters(new ArrayCollection(array(new Parameter(2, 'baz')))) ->setResultCacheDriver(null) ->setResultCacheId('foo') - ->setDql('foo') + ->setDQL('foo') ->setFirstResult(10) ->setMaxResults(10); diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 318eb2a2f96..655b86a6ad9 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -51,7 +51,7 @@ protected function setUp() protected function assertValidQueryBuilder(QueryBuilder $qb, $expectedDql) { - $dql = $qb->getDql(); + $dql = $qb->getDQL(); $q = $qb->getQuery(); $this->assertEquals($expectedDql, $dql); @@ -632,7 +632,7 @@ public function testSetParameters() $qb = $this->_em->createQueryBuilder(); $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->where($qb->expr()->orx('u.username = :username', 'u.username = :username2')); + ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2')); $parameters = new ArrayCollection(); $parameters->add(new Parameter('username', 'jwage')); @@ -788,7 +788,7 @@ public function testMultipleIsolatedQueryConstruction() $q1 = $qb->getQuery(); - $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name', $q1->getDql()); + $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name', $q1->getDQL()); $this->assertEquals(1, count($q1->getParameters())); // add another condition and construct a second query @@ -797,7 +797,7 @@ public function testMultipleIsolatedQueryConstruction() $q2 = $qb->getQuery(); - $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name AND u.id = :id', $q2->getDql()); + $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name AND u.id = :id', $q2->getDQL()); $this->assertTrue($q1 !== $q2); // two different, independent queries $this->assertEquals(2, count($q2->getParameters())); $this->assertEquals(1, count($q1->getParameters())); // $q1 unaffected @@ -843,7 +843,7 @@ public function testResetDQLPart() $this->assertEquals('u.username = ?1', (string)$qb->getDQLPart('where')); $this->assertEquals(1, count($qb->getDQLPart('orderBy'))); - $qb->resetDqlPart('where')->resetDqlPart('orderBy'); + $qb->resetDQLPart('where')->resetDQLPart('orderBy'); $this->assertNull($qb->getDQLPart('where')); $this->assertEquals(0, count($qb->getDQLPart('orderBy'))); diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php index 4dde0486271..08ade299929 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php @@ -62,7 +62,7 @@ public function tearDown() if ($file->isFile()) { \unlink($file->getPathname()); } elseif ($file->getBasename() === '.') { - $dirs[] = $file->getRealpath(); + $dirs[] = $file->getRealPath(); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php index 8a4b6ad5fc6..bcb16a3d6e2 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php @@ -55,7 +55,7 @@ public function tearDown() if ($file->isFile()) { \unlink($file->getPathname()); } elseif ($file->getBasename() === '.') { - $dirs[] = $file->getRealpath(); + $dirs[] = $file->getRealPath(); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php index f6c63f7528c..691b8ef2014 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php @@ -26,7 +26,7 @@ public function testCountQuery_MixedResultsWithName() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result) dctrn_table", $query->getSql() + "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result) dctrn_table", $query->getSQL() ); } @@ -38,7 +38,7 @@ public function testCountQuery_Having() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_1 FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_result) dctrn_table", $query->getSql() + "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_1 FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_result) dctrn_table", $query->getSQL() ); } @@ -55,7 +55,7 @@ public function testCountQueryOrderBySqlServer() $this->assertEquals( "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_) dctrn_result) dctrn_table", - $query->getSql() + $query->getSQL() ); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php index b8d1b41a63f..888861582ad 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php @@ -32,7 +32,7 @@ public function testCountQuery_MixedResultsWithName() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT a0_.id) AS sclr_0 FROM Author a0_", $query->getSql() + "SELECT count(DISTINCT a0_.id) AS sclr_0 FROM Author a0_", $query->getSQL() ); } @@ -45,7 +45,7 @@ public function testCountQuery_KeepsGroupBy() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ GROUP BY b0_.id", $query->getSql() + "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ GROUP BY b0_.id", $query->getSQL() ); } @@ -58,7 +58,7 @@ public function testCountQuery_RemovesOrderBy() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSql() + "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSQL() ); } @@ -71,7 +71,7 @@ public function testCountQuery_RemovesLimits() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSql() + "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSQL() ); } @@ -88,7 +88,7 @@ public function testCountQuery_HavingException() 'Cannot count query that uses a HAVING clause. Use the output walkers for pagination' ); - $query->getSql(); + $query->getSQL(); } /** @@ -103,7 +103,7 @@ public function testCountQueryWithArbitraryJoin() $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( - "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ LEFT JOIN Category c1_ ON (b0_.category_id = c1_.id)", $query->getSql() + "SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ LEFT JOIN Category c1_ ON (b0_.category_id = c1_.id)", $query->getSQL() ); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php index b30ef51fc9c..78fd38e9a39 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php @@ -33,7 +33,7 @@ public function testLimitSubqueryWithSortPg() $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $this->assertEquals( - "SELECT DISTINCT id_0, MIN(sclr_5) AS dctrn_minrownum FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS sclr_5, m0_.author_id AS author_id_6, m0_.category_id AS category_id_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSql() + "SELECT DISTINCT id_0, MIN(sclr_5) AS dctrn_minrownum FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS sclr_5, m0_.author_id AS author_id_6, m0_.category_id AS category_id_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -52,7 +52,7 @@ public function testLimitSubqueryWithScalarSortPg() $this->assertEquals( "SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -71,7 +71,7 @@ public function testLimitSubqueryWithMixedSortPg() $this->assertEquals( "SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -90,7 +90,7 @@ public function testLimitSubqueryWithHiddenScalarSortPg() $this->assertEquals( "SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -118,7 +118,7 @@ public function testLimitSubqueryWithSortOracle() $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $this->assertEquals( - "SELECT DISTINCT ID_0, MIN(SCLR_5) AS dctrn_minrownum FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS SCLR_5, m0_.author_id AS AUTHOR_ID_6, m0_.category_id AS CATEGORY_ID_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSql() + "SELECT DISTINCT ID_0, MIN(SCLR_5) AS dctrn_minrownum FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS SCLR_5, m0_.author_id AS AUTHOR_ID_6, m0_.category_id AS CATEGORY_ID_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -138,7 +138,7 @@ public function testLimitSubqueryWithScalarSortOracle() $this->assertEquals( "SELECT DISTINCT ID_1, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS SCLR_0, u1_.id AS ID_1, g0_.id AS ID_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC) AS SCLR_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY ID_1 ORDER BY dctrn_minrownum ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -158,7 +158,7 @@ public function testLimitSubqueryWithMixedSortOracle() $this->assertEquals( "SELECT DISTINCT ID_1, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS SCLR_0, u1_.id AS ID_1, g0_.id AS ID_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS SCLR_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY ID_1 ORDER BY dctrn_minrownum ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -176,7 +176,7 @@ public function testLimitSubqueryOracle() $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $this->assertEquals( - "SELECT DISTINCT ID_0 FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, m0_.author_id AS AUTHOR_ID_5, m0_.category_id AS CATEGORY_ID_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSql() + "SELECT DISTINCT ID_0 FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, m0_.author_id AS AUTHOR_ID_5, m0_.category_id AS CATEGORY_ID_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSQL() ); $this->entityManager->getConnection()->setDatabasePlatform($odp); @@ -190,7 +190,7 @@ public function testCountQueryMixedResultsWithName() $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); $this->assertEquals( - "SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result", $limitQuery->getSql() + "SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result", $limitQuery->getSQL() ); } @@ -285,7 +285,7 @@ public function testLimitSubqueryWithHiddenSelectionInOrderBy() $this->assertEquals( 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, a0_.name AS name_2 FROM Author a0_) dctrn_result ORDER BY name_2 DESC', - $query->getSql() + $query->getSQL() ); } @@ -374,7 +374,7 @@ public function testLimitSubqueryOrderByFieldFromMappedSuperclass() */ public function testLimitSubqueryOrderBySubSelectOrderByExpression() { - $this->entityManager->getConnection()->setDatabasePlatform(new MysqlPlatform()); + $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); $query = $this->entityManager->createQuery( 'SELECT a, diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php index fb11feb7aaf..30da257891c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php @@ -33,7 +33,7 @@ public function testLimitSubqueryWithSort() $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id ORDER BY m0_.title ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); } @@ -47,7 +47,7 @@ public function testCountQuery_MixedResultsWithName() $this->assertEquals( "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", - $limitQuery->getSql() + $limitQuery->getSQL() ); } @@ -64,7 +64,7 @@ public function testLimitSubqueryWithSortOnAssociation() $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); } @@ -81,7 +81,7 @@ public function testLimitSubqueryWithArbitraryJoin() $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)", - $limitQuery->getSql() + $limitQuery->getSQL() ); } @@ -95,7 +95,7 @@ public function testLimitSubqueryWithSortWithArbitraryJoin() $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id) ORDER BY m0_.title ASC", - $limitQuery->getSql() + $limitQuery->getSQL() ); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php index 5f9a3430fe8..f89ea5704d1 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php @@ -34,7 +34,7 @@ public function testCountQuery_MixedResultsWithName() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_ WHERE a0_.id IN (?)", $whereInQuery->getSql() + "SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_ WHERE a0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -48,7 +48,7 @@ public function testWhereInQuery_SingleWhere() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -62,7 +62,7 @@ public function testWhereInQuery_MultipleWhereWithAnd() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND 2 = 2 AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND 2 = 2 AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -76,7 +76,7 @@ public function testWhereInQuery_MultipleWhereWithOr() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -90,7 +90,7 @@ public function testWhereInQuery_MultipleWhereWithMixed_1() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND 3 = 3 AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND 3 = 3 AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -104,7 +104,7 @@ public function testWhereInQuery_MultipleWhereWithMixed_2() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 AND 2 = 2 OR 3 = 3) AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 AND 2 = 2 OR 3 = 3) AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -118,7 +118,7 @@ public function testWhereInQuery_WhereNot() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSql() + "SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -134,7 +134,7 @@ public function testWhereInQueryWithArbitraryJoin_NoWhere() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSql() + "SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSQL() ); } @@ -147,7 +147,7 @@ public function testWhereInQueryWithArbitraryJoin_SingleWhere() $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( - "SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE 1 = 1 AND b0_.id IN (?)", $whereInQuery->getSql() + "SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE 1 = 1 AND b0_.id IN (?)", $whereInQuery->getSQL() ); } }