From 1d5e16e9d9f6135fd558adef777e9da0d46a5622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 7 Dec 2016 23:32:17 +0100 Subject: [PATCH 1/8] Use short-array syntax on "tools" directory --- tools/sandbox/bootstrap.php | 8 ++++---- tools/sandbox/doctrine.php | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/sandbox/bootstrap.php b/tools/sandbox/bootstrap.php index 1e7d8ba00..410ea7f72 100644 --- a/tools/sandbox/bootstrap.php +++ b/tools/sandbox/bootstrap.php @@ -19,7 +19,7 @@ $debug = true; $config = new \Doctrine\ORM\Configuration(); // Set up Metadata Drivers -$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__ . "/Entities")); +$driverImpl = $config->newDefaultAnnotationDriver([__DIR__ . "/Entities"]); $config->setMetadataDriverImpl($driverImpl); // Set up caches, depending on $debug variable. @@ -33,10 +33,10 @@ $config->setProxyDir(__DIR__ . '/Proxies'); $config->setProxyNamespace('Proxies'); // Database connection information -$connectionOptions = array( +$connectionOptions = [ 'driver' => 'pdo_sqlite', 'path' => 'database.sqlite' -); +]; // Enable second-level cache $cacheConfig = new \Doctrine\ORM\Cache\CacheConfiguration(); @@ -52,4 +52,4 @@ $cacheConfig->setCacheFactory($factory); $config->setSecondLevelCacheEnabled(true); $config->setSecondLevelCacheConfiguration($cacheConfig); -return EntityManager::create($connectionOptions, $config); \ No newline at end of file +return EntityManager::create($connectionOptions, $config); diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php index 052968690..04c99e327 100644 --- a/tools/sandbox/doctrine.php +++ b/tools/sandbox/doctrine.php @@ -5,12 +5,15 @@ $em = require_once __DIR__.'/bootstrap.php'; $cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', Doctrine\Common\Version::VERSION); $cli->setCatchExceptions(true); -$cli->setHelperSet(new Symfony\Component\Console\Helper\HelperSet(array( - 'db' => new \Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper($em->getConnection()), - 'em' => new \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper($em) -))); +$cli->setHelperSet(new Symfony\Component\Console\Helper\HelperSet( + [ + 'db' => new \Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper($em->getConnection()), + 'em' => new \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper($em) + ] +)); -$cli->addCommands(array( +$cli->addCommands( + [ // DBAL Commands new \Doctrine\DBAL\Tools\Console\Command\RunSqlCommand(), new \Doctrine\DBAL\Tools\Console\Command\ImportCommand(), @@ -34,5 +37,6 @@ $cli->addCommands(array( new \Doctrine\ORM\Tools\Console\Command\RunDqlCommand(), new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(), -)); + ] +); $cli->run(); From 74c8a08828e275d2d1cb081b9133928be7173556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 7 Dec 2016 23:33:41 +0100 Subject: [PATCH 2/8] Use short-array syntax on "tests" directory --- .../EventListener/CacheMetadataListener.php | 6 +- .../Doctrine/Tests/Mocks/CacheRegionMock.php | 22 +- .../Tests/Mocks/ConcurrentRegionMock.php | 26 +- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 14 +- tests/Doctrine/Tests/Mocks/DriverMock.php | 2 +- .../Tests/Mocks/EntityManagerMock.php | 2 +- .../Tests/Mocks/EntityPersisterMock.php | 18 +- .../Tests/Mocks/HydratorMockStatement.php | 2 +- .../Tests/Mocks/MetadataDriverMock.php | 2 +- tests/Doctrine/Tests/Mocks/TaskMock.php | 2 +- .../Tests/Mocks/TimestampRegionMock.php | 2 +- tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php | 2 +- .../Doctrine/Tests/Models/CMS/CmsAddress.php | 114 ++-- tests/Doctrine/Tests/Models/CMS/CmsUser.php | 220 ++++--- .../Tests/Models/Company/CompanyContract.php | 24 +- .../Models/Company/CompanyFixContract.php | 8 +- .../Models/Company/CompanyFlexContract.php | 12 +- .../Company/CompanyFlexUltraContract.php | 10 +- .../Tests/Models/Company/CompanyPerson.php | 45 +- .../DDC1476EntityWithDefaultFieldType.php | 12 +- .../Tests/Models/DDC3346/DDC3346Author.php | 2 +- .../Tests/Models/DDC3579/DDC3579Admin.php | 5 +- .../Tests/Models/DDC3579/DDC3579User.php | 18 +- .../Models/DDC869/DDC869ChequePayment.php | 6 +- .../Models/DDC869/DDC869CreditCardPayment.php | 6 +- .../Tests/Models/DDC869/DDC869Payment.php | 12 +- .../Tests/Models/DDC889/DDC889Class.php | 6 +- .../Tests/Models/DDC889/DDC889SuperClass.php | 6 +- .../Tests/Models/DDC964/DDC964Admin.php | 34 +- .../Tests/Models/DDC964/DDC964Guest.php | 13 +- .../Tests/Models/DDC964/DDC964User.php | 48 +- .../Doctrine/Tests/Models/GeoNames/Admin1.php | 2 +- .../Tests/Models/Routing/RoutingRoute.php | 4 +- .../Tests/ORM/Cache/AbstractRegionTest.php | 16 +- .../Doctrine/Tests/ORM/Cache/CacheKeyTest.php | 30 +- .../Tests/ORM/Cache/CacheLoggerChainTest.php | 8 +- .../ORM/Cache/DefaultCacheFactoryTest.php | 34 +- .../Tests/ORM/Cache/DefaultCacheTest.php | 62 +- .../Cache/DefaultCollectionHydratorTest.php | 20 +- .../ORM/Cache/DefaultEntityHydratorTest.php | 60 +- .../Tests/ORM/Cache/DefaultQueryCacheTest.php | 166 ++--- .../Tests/ORM/Cache/DefaultRegionTest.php | 10 +- .../Tests/ORM/Cache/FileLockRegionTest.php | 18 +- .../Tests/ORM/Cache/MultiGetRegionTest.php | 6 +- .../AbstractCollectionPersisterTest.php | 24 +- ...ReadWriteCachedCollectionPersisterTest.php | 44 +- .../Entity/AbstractEntityPersisterTest.php | 102 +-- ...rictReadWriteCachedEntityPersisterTest.php | 20 +- .../ReadWriteCachedEntityPersisterTest.php | 36 +- .../ORM/Cache/StatisticsCacheLoggerTest.php | 10 +- .../Tests/ORM/CommitOrderCalculatorTest.php | 4 +- .../Doctrine/Tests/ORM/ConfigurationTest.php | 14 +- .../Decorator/EntityManagerDecoratorTest.php | 16 +- .../Doctrine/Tests/ORM/EntityManagerTest.php | 30 +- .../Tests/ORM/EntityNotFoundExceptionTest.php | 4 +- .../AbstractManyToManyAssociationTestCase.php | 3 +- .../Functional/AdvancedAssociationTest.php | 6 +- .../ORM/Functional/BasicFunctionalTest.php | 6 +- .../ORM/Functional/CascadeRemoveOrderTest.php | 14 +- .../Functional/ClassTableInheritanceTest.php | 6 +- .../Functional/ClassTableInheritanceTest2.php | 6 +- .../Functional/CompositePrimaryKeyTest.php | 17 +- ...ompositePrimaryKeyWithAssociationsTest.php | 8 +- .../ORM/Functional/DatabaseDriverTest.php | 54 +- .../ORM/Functional/DatabaseDriverTestCase.php | 6 +- .../ORM/Functional/DefaultValuesTest.php | 6 +- .../ORM/Functional/EntityListenersTest.php | 22 +- .../EntityRepositoryCriteriaTest.php | 2 +- .../ORM/Functional/EntityRepositoryTest.php | 86 +-- .../Functional/ExtraLazyCollectionTest.php | 4 +- .../Tests/ORM/Functional/IdentityMapTest.php | 10 +- .../JoinedTableCompositeKeyTest.php | 2 +- .../ORM/Functional/LifecycleCallbackTest.php | 18 +- .../Functional/Locking/GearmanLockTest.php | 27 +- .../Functional/Locking/LockAgentWorker.php | 8 +- .../Tests/ORM/Functional/Locking/LockTest.php | 2 +- .../ORM/Functional/Locking/OptimisticTest.php | 15 +- .../ManyToManyBasicAssociationTest.php | 2 +- .../Functional/MergeCompositeToOneKeyTest.php | 6 +- .../Tests/ORM/Functional/MergeProxiesTest.php | 6 +- .../Functional/MergeSharedEntitiesTest.php | 6 +- .../Tests/ORM/Functional/NativeQueryTest.php | 17 +- .../Tests/ORM/Functional/NewOperatorTest.php | 16 +- .../Tests/ORM/Functional/NotifyPolicyTest.php | 8 +- .../OneToManyBidirectionalAssociationTest.php | 2 +- ...neToManySelfReferentialAssociationTest.php | 3 +- ...OneToManyUnidirectionalAssociationTest.php | 4 +- .../OneToOneBidirectionalAssociationTest.php | 3 +- .../Functional/OneToOneEagerLoadingTest.php | 6 +- ...OneToOneSelfReferentialAssociationTest.php | 9 +- .../OneToOneUnidirectionalAssociationTest.php | 2 +- .../ORM/Functional/OrderedCollectionTest.php | 4 +- ...edJoinedTableInheritanceCollectionTest.php | 6 +- .../Tests/ORM/Functional/PaginationTest.php | 35 +- .../PersistentCollectionCriteriaTest.php | 4 +- .../Functional/PersistentCollectionTest.php | 6 +- .../ORM/Functional/PersistentObjectTest.php | 6 +- .../ORM/Functional/PostLoadEventTest.php | 26 +- .../Functional/ProxiesLikeEntitiesTest.php | 15 +- .../Tests/ORM/Functional/QueryCacheTest.php | 6 +- .../Tests/ORM/Functional/QueryTest.php | 39 +- .../Tests/ORM/Functional/ReadOnlyTest.php | 6 +- .../ORM/Functional/ReferenceProxyTest.php | 4 +- .../Tests/ORM/Functional/SQLFilterTest.php | 32 +- .../SchemaTool/CompanySchemaTest.php | 6 +- .../ORM/Functional/SchemaTool/DBAL483Test.php | 4 +- .../ORM/Functional/SchemaTool/DDC214Test.php | 12 +- .../SchemaTool/MySqlSchemaToolTest.php | 16 +- .../SchemaTool/PostgreSqlSchemaToolTest.php | 22 +- .../ORM/Functional/SchemaValidatorTest.php | 6 +- .../SecondLevelCacheAbstractTest.php | 22 +- ...econdLevelCacheCompositePrimaryKeyTest.php | 14 +- ...ompositePrimaryKeyWithAssociationsTest.php | 4 +- .../SecondLevelCacheConcurrentTest.php | 6 +- .../SecondLevelCacheQueryCacheTest.php | 8 +- .../SecondLevelCacheRepositoryTest.php | 10 +- .../ORM/Functional/SecondLevelCacheTest.php | 30 +- .../SequenceEmulatedIdentityStrategyTest.php | 2 +- .../ORM/Functional/SequenceGeneratorTest.php | 6 +- .../SingleTableCompositeKeyTest.php | 2 +- .../Functional/SingleTableInheritanceTest.php | 12 +- .../StandardEntityPersisterTest.php | 4 +- .../ORM/Functional/Ticket/DDC1080Test.php | 6 +- .../ORM/Functional/Ticket/DDC1113Test.php | 6 +- .../ORM/Functional/Ticket/DDC1151Test.php | 6 +- .../ORM/Functional/Ticket/DDC1163Test.php | 6 +- .../ORM/Functional/Ticket/DDC117Test.php | 20 +- .../ORM/Functional/Ticket/DDC1181Test.php | 6 +- .../ORM/Functional/Ticket/DDC1193Test.php | 6 +- .../ORM/Functional/Ticket/DDC1209Test.php | 6 +- .../ORM/Functional/Ticket/DDC1225Test.php | 6 +- .../ORM/Functional/Ticket/DDC1228Test.php | 8 +- .../ORM/Functional/Ticket/DDC1238Test.php | 6 +- .../ORM/Functional/Ticket/DDC1250Test.php | 6 +- .../ORM/Functional/Ticket/DDC1300Test.php | 6 +- .../ORM/Functional/Ticket/DDC1335Test.php | 14 +- .../ORM/Functional/Ticket/DDC1360Test.php | 11 +- .../ORM/Functional/Ticket/DDC1383Test.php | 6 +- .../ORM/Functional/Ticket/DDC1392Test.php | 6 +- .../ORM/Functional/Ticket/DDC1400Test.php | 6 +- .../ORM/Functional/Ticket/DDC1404Test.php | 6 +- .../ORM/Functional/Ticket/DDC142Test.php | 12 +- .../ORM/Functional/Ticket/DDC1430Test.php | 6 +- .../ORM/Functional/Ticket/DDC1436Test.php | 6 +- .../ORM/Functional/Ticket/DDC144Test.php | 6 +- .../ORM/Functional/Ticket/DDC1452Test.php | 6 +- .../ORM/Functional/Ticket/DDC1454Test.php | 6 +- .../ORM/Functional/Ticket/DDC1458Test.php | 6 +- .../ORM/Functional/Ticket/DDC1461Test.php | 6 +- .../ORM/Functional/Ticket/DDC1509Test.php | 6 +- .../ORM/Functional/Ticket/DDC1514Test.php | 6 +- .../ORM/Functional/Ticket/DDC1515Test.php | 6 +- .../ORM/Functional/Ticket/DDC1526Test.php | 8 +- .../ORM/Functional/Ticket/DDC1548Test.php | 8 +- .../ORM/Functional/Ticket/DDC1595Test.php | 6 +- .../ORM/Functional/Ticket/DDC1654Test.php | 8 +- .../ORM/Functional/Ticket/DDC1655Test.php | 12 +- .../ORM/Functional/Ticket/DDC1690Test.php | 8 +- .../ORM/Functional/Ticket/DDC1707Test.php | 6 +- .../ORM/Functional/Ticket/DDC1719Test.php | 12 +- .../ORM/Functional/Ticket/DDC1787Test.php | 6 +- .../ORM/Functional/Ticket/DDC1843Test.php | 8 +- .../ORM/Functional/Ticket/DDC1884Test.php | 4 +- .../ORM/Functional/Ticket/DDC1885Test.php | 12 +- .../ORM/Functional/Ticket/DDC1918Test.php | 2 +- .../ORM/Functional/Ticket/DDC1925Test.php | 6 +- .../ORM/Functional/Ticket/DDC192Test.php | 6 +- .../ORM/Functional/Ticket/DDC1998Test.php | 6 +- .../ORM/Functional/Ticket/DDC199Test.php | 6 +- .../ORM/Functional/Ticket/DDC2012Test.php | 32 +- .../ORM/Functional/Ticket/DDC2074Test.php | 2 +- .../ORM/Functional/Ticket/DDC2084Test.php | 8 +- .../ORM/Functional/Ticket/DDC2090Test.php | 18 +- .../ORM/Functional/Ticket/DDC2106Test.php | 8 +- .../ORM/Functional/Ticket/DDC211Test.php | 8 +- .../ORM/Functional/Ticket/DDC2138Test.php | 8 +- .../ORM/Functional/Ticket/DDC2175Test.php | 6 +- .../ORM/Functional/Ticket/DDC2182Test.php | 6 +- .../ORM/Functional/Ticket/DDC2214Test.php | 8 +- .../ORM/Functional/Ticket/DDC2230Test.php | 6 +- .../ORM/Functional/Ticket/DDC2231Test.php | 6 +- .../ORM/Functional/Ticket/DDC2252Test.php | 14 +- .../ORM/Functional/Ticket/DDC2256Test.php | 9 +- .../ORM/Functional/Ticket/DDC2306Test.php | 8 +- .../ORM/Functional/Ticket/DDC2346Test.php | 8 +- .../ORM/Functional/Ticket/DDC2350Test.php | 6 +- .../ORM/Functional/Ticket/DDC2359Test.php | 6 +- .../ORM/Functional/Ticket/DDC237Test.php | 6 +- .../ORM/Functional/Ticket/DDC2387Test.php | 8 +- .../ORM/Functional/Ticket/DDC2415Test.php | 26 +- .../ORM/Functional/Ticket/DDC2494Test.php | 18 +- .../ORM/Functional/Ticket/DDC2575Test.php | 16 +- .../ORM/Functional/Ticket/DDC2579Test.php | 10 +- .../ORM/Functional/Ticket/DDC258Test.php | 6 +- .../ORM/Functional/Ticket/DDC2660Test.php | 6 +- .../ORM/Functional/Ticket/DDC2692Test.php | 10 +- .../ORM/Functional/Ticket/DDC2759Test.php | 6 +- .../ORM/Functional/Ticket/DDC2775Test.php | 6 +- .../ORM/Functional/Ticket/DDC279Test.php | 6 +- .../ORM/Functional/Ticket/DDC2825Test.php | 12 +- .../ORM/Functional/Ticket/DDC2862Test.php | 22 +- .../ORM/Functional/Ticket/DDC2895Test.php | 16 +- .../ORM/Functional/Ticket/DDC2931Test.php | 6 +- .../ORM/Functional/Ticket/DDC2984Test.php | 18 +- .../ORM/Functional/Ticket/DDC2996Test.php | 6 +- .../ORM/Functional/Ticket/DDC3033Test.php | 16 +- .../ORM/Functional/Ticket/DDC3042Test.php | 6 +- .../ORM/Functional/Ticket/DDC3068Test.php | 12 +- .../ORM/Functional/Ticket/DDC309Test.php | 6 +- .../ORM/Functional/Ticket/DDC3123Test.php | 4 +- .../ORM/Functional/Ticket/DDC3170Test.php | 4 +- .../ORM/Functional/Ticket/DDC3192Test.php | 10 +- .../ORM/Functional/Ticket/DDC3223Test.php | 6 +- .../ORM/Functional/Ticket/DDC3300Test.php | 10 +- .../ORM/Functional/Ticket/DDC3330Test.php | 22 +- .../ORM/Functional/Ticket/DDC3346Test.php | 6 +- .../ORM/Functional/Ticket/DDC345Test.php | 6 +- .../ORM/Functional/Ticket/DDC353Test.php | 6 +- .../ORM/Functional/Ticket/DDC3597Test.php | 6 +- .../ORM/Functional/Ticket/DDC3644Test.php | 16 +- .../ORM/Functional/Ticket/DDC3711Test.php | 4 +- .../ORM/Functional/Ticket/DDC371Test.php | 6 +- .../ORM/Functional/Ticket/DDC3785Test.php | 14 +- .../ORM/Functional/Ticket/DDC381Test.php | 6 +- .../ORM/Functional/Ticket/DDC422Test.php | 6 +- .../ORM/Functional/Ticket/DDC425Test.php | 6 +- .../ORM/Functional/Ticket/DDC440Test.php | 6 +- .../ORM/Functional/Ticket/DDC444Test.php | 6 +- .../ORM/Functional/Ticket/DDC448Test.php | 6 +- .../ORM/Functional/Ticket/DDC493Test.php | 6 +- .../ORM/Functional/Ticket/DDC501Test.php | 4 +- .../ORM/Functional/Ticket/DDC512Test.php | 6 +- .../ORM/Functional/Ticket/DDC513Test.php | 6 +- .../ORM/Functional/Ticket/DDC522Test.php | 6 +- .../ORM/Functional/Ticket/DDC531Test.php | 6 +- .../ORM/Functional/Ticket/DDC588Test.php | 6 +- .../ORM/Functional/Ticket/DDC599Test.php | 6 +- .../ORM/Functional/Ticket/DDC618Test.php | 6 +- .../ORM/Functional/Ticket/DDC633Test.php | 6 +- .../ORM/Functional/Ticket/DDC656Test.php | 6 +- .../ORM/Functional/Ticket/DDC698Test.php | 6 +- .../ORM/Functional/Ticket/DDC719Test.php | 6 +- .../ORM/Functional/Ticket/DDC729Test.php | 6 +- .../ORM/Functional/Ticket/DDC735Test.php | 6 +- .../ORM/Functional/Ticket/DDC736Test.php | 5 +- .../ORM/Functional/Ticket/DDC742Test.php | 6 +- .../ORM/Functional/Ticket/DDC767Test.php | 2 +- .../ORM/Functional/Ticket/DDC809Test.php | 38 +- .../ORM/Functional/Ticket/DDC832Test.php | 6 +- .../ORM/Functional/Ticket/DDC837Test.php | 6 +- .../ORM/Functional/Ticket/DDC881Test.php | 6 +- .../ORM/Functional/Ticket/DDC949Test.php | 8 +- .../ORM/Functional/Ticket/DDC960Test.php | 6 +- .../ORM/Functional/Ticket/DDC992Test.php | 8 +- .../ORM/Functional/Ticket/GH5762Test.php | 8 +- .../ORM/Functional/Ticket/Ticket2481Test.php | 6 +- .../Tests/ORM/Functional/Ticket/Ticket69.php | 6 +- .../Tests/ORM/Functional/TypeTest.php | 5 +- .../ORM/Functional/UUIDGeneratorTest.php | 6 +- .../Functional/UnitOfWorkLifecycleTest.php | 4 +- .../ManyToManyCompositeIdForeignKeyTest.php | 10 +- .../ManyToManyCompositeIdTest.php | 8 +- .../OneToManyCompositeIdForeignKeyTest.php | 8 +- .../OneToManyCompositeIdTest.php | 6 +- .../OneToOneCompositeIdForeignKeyTest.php | 8 +- .../OneToOneCompositeIdTest.php | 6 +- .../Tests/ORM/Functional/ValueObjectsTest.php | 44 +- .../ORM/Functional/VersionedOneToOneTest.php | 8 +- .../Tests/ORM/Hydration/ArrayHydratorTest.php | 300 ++++----- .../ORM/Hydration/ObjectHydratorTest.php | 582 +++++++++--------- .../ORM/Hydration/ResultSetMappingTest.php | 105 ++-- .../ORM/Hydration/ScalarHydratorTest.php | 28 +- .../Hydration/SimpleObjectHydratorTest.php | 32 +- .../Hydration/SingleScalarHydratorTest.php | 56 +- .../Tests/ORM/Id/AssignedGeneratorTest.php | 4 +- .../Internal/HydrationCompleteHandlerTest.php | 18 +- .../Tests/ORM/LazyCriteriaCollectionTest.php | 14 +- .../ORM/Mapping/AbstractMappingDriverTest.php | 318 +++++----- .../ORM/Mapping/AnnotationDriverTest.php | 8 +- .../ORM/Mapping/AnsiQuoteStrategyTest.php | 60 +- .../Mapping/BasicInheritanceMappingTest.php | 6 +- .../ORM/Mapping/ClassMetadataBuilderTest.php | 348 ++++++----- .../ORM/Mapping/ClassMetadataFactoryTest.php | 55 +- .../Mapping/ClassMetadataLoadEventTest.php | 4 +- .../Tests/ORM/Mapping/ClassMetadataTest.php | 484 +++++++++------ .../Tests/ORM/Mapping/NamingStrategyTest.php | 191 +++--- .../Tests/ORM/Mapping/QuoteStrategyTest.php | 91 +-- .../ReflectionEmbeddedPropertyTest.php | 28 +- .../Mapping/Symfony/AbstractDriverTest.php | 26 +- .../ORM/Mapping/Symfony/XmlDriverTest.php | 2 +- .../ORM/Mapping/Symfony/YamlDriverTest.php | 2 +- .../ORM/Mapping/XmlMappingDriverTest.php | 20 +- .../ORM/Mapping/YamlMappingDriverTest.php | 2 +- .../Doctrine.Tests.Models.CMS.CmsAddress.php | 114 ++-- .../php/Doctrine.Tests.Models.CMS.CmsUser.php | 220 ++++--- .../php/Doctrine.Tests.Models.Cache.City.php | 56 +- ...e.Tests.Models.Company.CompanyContract.php | 26 +- ...ests.Models.Company.CompanyFixContract.php | 6 +- ...sts.Models.Company.CompanyFlexContract.php | 12 +- ...odels.Company.CompanyFlexUltraContract.php | 8 +- ...ine.Tests.Models.Company.CompanyPerson.php | 45 +- ...1476.DDC1476EntityWithDefaultFieldType.php | 14 +- ....Models.DDC2825.ExplicitSchemaAndTable.php | 12 +- ...dels.DDC2825.SchemaAndTableInTableName.php | 12 +- ...rine.Tests.Models.DDC3579.DDC3579Admin.php | 5 +- ...trine.Tests.Models.DDC3579.DDC3579User.php | 18 +- ...ests.Models.DDC869.DDC869ChequePayment.php | 6 +- ....Models.DDC869.DDC869CreditCardPayment.php | 6 +- ...rine.Tests.Models.DDC869.DDC869Payment.php | 14 +- ...ctrine.Tests.Models.DDC889.DDC889Class.php | 8 +- ...e.Tests.Models.DDC889.DDC889SuperClass.php | 8 +- ...ctrine.Tests.Models.DDC964.DDC964Admin.php | 32 +- ...ctrine.Tests.Models.DDC964.DDC964Guest.php | 11 +- ...octrine.Tests.Models.DDC964.DDC964User.php | 48 +- .../php/Doctrine.Tests.ORM.Mapping.Animal.php | 20 +- .../Doctrine.Tests.ORM.Mapping.Comment.php | 18 +- ...ctrine.Tests.ORM.Mapping.DDC1170Entity.php | 14 +- ...octrine.Tests.ORM.Mapping.DDC807Entity.php | 14 +- .../php/Doctrine.Tests.ORM.Mapping.PHPSLC.php | 12 +- .../php/Doctrine.Tests.ORM.Mapping.User.php | 122 ++-- .../Tests/ORM/Performance/DDC2602Test.php | 16 +- .../Performance/HydrationPerformanceTest.php | 128 ++-- .../Performance/PersisterPerformanceTest.php | 2 +- .../ORM/Performance/ProxyPerformanceTest.php | 14 +- .../ORM/Performance/SecondLevelCacheTest.php | 8 +- .../Performance/UnitOfWorkPerformanceTest.php | 2 +- ...tyPersisterCompositeTypeParametersTest.php | 14 +- ...sicEntityPersisterCompositeTypeSqlTest.php | 8 +- .../BasicEntityPersisterTypeValueSqlTest.php | 20 +- .../JoinedSubclassPersisterTest.php | 2 +- .../Tests/ORM/Proxy/ProxyFactoryTest.php | 16 +- .../ORM/Query/CustomTreeWalkersJoinTest.php | 14 +- .../Tests/ORM/Query/CustomTreeWalkersTest.php | 42 +- tests/Doctrine/Tests/ORM/Query/ExprTest.php | 40 +- .../ORM/Query/LanguageRecognitionTest.php | 66 +- tests/Doctrine/Tests/ORM/Query/LexerTest.php | 70 +-- .../ORM/Query/ParameterTypeInfererTest.php | 24 +- .../Tests/ORM/Query/ParserResultTest.php | 8 +- tests/Doctrine/Tests/ORM/Query/ParserTest.php | 33 +- .../ORM/Query/QueryExpressionVisitorTest.php | 38 +- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 12 +- .../ORM/Query/SelectSqlGenerationTest.php | 64 +- .../Tests/ORM/Query/SqlWalkerTest.php | 12 +- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 34 +- .../DefaultRepositoryFactoryTest.php | 8 +- .../ClearCacheCollectionRegionCommandTest.php | 30 +- .../ClearCacheEntityRegionCommandTest.php | 30 +- .../ClearCacheQueryRegionCommandTest.php | 30 +- .../ConvertDoctrine1SchemaCommandTest.php | 2 +- .../GenerateRepositoriesCommandTest.php | 22 +- .../Tools/Console/Command/InfoCommandTest.php | 12 +- .../Command/MappingDescribeCommandTest.php | 24 +- .../Console/Command/RunDqlCommandTest.php | 18 +- .../ORM/Tools/ConvertDoctrine1SchemaTest.php | 2 +- .../Tests/ORM/Tools/EntityGeneratorTest.php | 228 ++++--- .../Tools/EntityRepositoryGeneratorTest.php | 16 +- .../AbstractClassMetadataExporterTest.php | 15 +- .../Export/XmlClassMetadataExporterTest.php | 22 +- .../Doctrine.Tests.ORM.Tools.Export.User.php | 112 ++-- .../ORM/Tools/Pagination/CountWalkerTest.php | 18 +- .../Pagination/LimitSubqueryWalkerTest.php | 42 +- .../Tools/Pagination/WhereInWalkerTest.php | 26 +- .../Tools/ResolveTargetEntityListenerTest.php | 14 +- .../Tests/ORM/Tools/SchemaToolTest.php | 28 +- .../Tests/ORM/Tools/SchemaValidatorTest.php | 67 +- tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 12 +- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 10 +- .../ORM/Utility/IdentifierFlattenerTest.php | 6 +- .../Doctrine/Tests/OrmFunctionalTestCase.php | 170 ++--- tests/Doctrine/Tests/OrmTestCase.php | 13 +- tests/Doctrine/Tests/TestUtil.php | 12 +- 371 files changed, 4924 insertions(+), 3869 deletions(-) diff --git a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php index f27e38c47..e8cc6b23a 100644 --- a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php +++ b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php @@ -17,7 +17,7 @@ class CacheMetadataListener * * @var array */ - protected $enabledItems = array(); + protected $enabledItems = []; /** * @param \Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs $event @@ -63,9 +63,9 @@ class CacheMetadataListener return; // Already handled in the past } - $cache = array( + $cache = [ 'usage' => ClassMetadata::CACHE_USAGE_NONSTRICT_READ_WRITE - ); + ]; if ($metadata->isVersioned) { return; diff --git a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php index 519e72494..c99303907 100644 --- a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php +++ b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php @@ -13,8 +13,8 @@ use Doctrine\ORM\Cache\Region; */ class CacheRegionMock implements Region { - public $calls = array(); - public $returns = array(); + public $calls = []; + public $returns = []; public $name; /** @@ -50,7 +50,7 @@ class CacheRegionMock implements Region */ public function getName() { - $this->calls[__FUNCTION__][] = array(); + $this->calls[__FUNCTION__][] = []; return $this->name; } @@ -60,7 +60,7 @@ class CacheRegionMock implements Region */ public function contains(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; return $this->getReturn(__FUNCTION__, false); } @@ -70,7 +70,7 @@ class CacheRegionMock implements Region */ public function evict(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; return $this->getReturn(__FUNCTION__, true); } @@ -80,7 +80,7 @@ class CacheRegionMock implements Region */ public function evictAll() { - $this->calls[__FUNCTION__][] = array(); + $this->calls[__FUNCTION__][] = []; return $this->getReturn(__FUNCTION__, true); } @@ -90,7 +90,7 @@ class CacheRegionMock implements Region */ public function get(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; return $this->getReturn(__FUNCTION__, null); } @@ -100,7 +100,7 @@ class CacheRegionMock implements Region */ public function getMultiple(CollectionCacheEntry $collection) { - $this->calls[__FUNCTION__][] = array('collection' => $collection); + $this->calls[__FUNCTION__][] = ['collection' => $collection]; return $this->getReturn(__FUNCTION__, null); } @@ -110,7 +110,7 @@ class CacheRegionMock implements Region */ public function put(CacheKey $key, CacheEntry $entry, Lock $lock = null) { - $this->calls[__FUNCTION__][] = array('key' => $key, 'entry' => $entry); + $this->calls[__FUNCTION__][] = ['key' => $key, 'entry' => $entry]; return $this->getReturn(__FUNCTION__, true); } @@ -120,7 +120,7 @@ class CacheRegionMock implements Region */ public function clear() { - $this->calls = array(); - $this->returns = array(); + $this->calls = []; + $this->returns = []; } } diff --git a/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php b/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php index 49ed32985..0f939999d 100644 --- a/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConcurrentRegionMock.php @@ -17,12 +17,12 @@ use Doctrine\ORM\Cache\Lock; */ class ConcurrentRegionMock implements ConcurrentRegion { - public $calls = array(); - public $exceptions = array(); - public $locks = array(); + public $calls = []; + public $exceptions = []; + public $locks = []; /** - * @var \Doctrine\ORM\Cache\Region + * @var \Doctrine\ORM\Cache\Region */ private $region; @@ -80,7 +80,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function contains(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; if (isset($this->locks[$key->hash])) { return false; @@ -96,7 +96,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function evict(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; $this->throwException(__FUNCTION__); @@ -108,7 +108,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function evictAll() { - $this->calls[__FUNCTION__][] = array(); + $this->calls[__FUNCTION__][] = []; $this->throwException(__FUNCTION__); @@ -120,7 +120,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function get(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; $this->throwException(__FUNCTION__); @@ -136,7 +136,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function getMultiple(CollectionCacheEntry $collection) { - $this->calls[__FUNCTION__][] = array('collection' => $collection); + $this->calls[__FUNCTION__][] = ['collection' => $collection]; $this->throwException(__FUNCTION__); @@ -148,7 +148,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function getName() { - $this->calls[__FUNCTION__][] = array(); + $this->calls[__FUNCTION__][] = []; $this->throwException(__FUNCTION__); @@ -160,7 +160,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function put(CacheKey $key, CacheEntry $entry, Lock $lock = null) { - $this->calls[__FUNCTION__][] = array('key' => $key, 'entry' => $entry); + $this->calls[__FUNCTION__][] = ['key' => $key, 'entry' => $entry]; $this->throwException(__FUNCTION__); @@ -181,7 +181,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function lock(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; $this->throwException(__FUNCTION__); @@ -197,7 +197,7 @@ class ConcurrentRegionMock implements ConcurrentRegion */ public function unlock(CacheKey $key, Lock $lock) { - $this->calls[__FUNCTION__][] = array('key' => $key, 'lock' => $lock); + $this->calls[__FUNCTION__][] = ['key' => $key, 'lock' => $lock]; $this->throwException(__FUNCTION__); diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 49ca3e4ea..5a28ffa5a 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -26,12 +26,12 @@ class ConnectionMock extends Connection /** * @var array */ - private $_inserts = array(); + private $_inserts = []; /** * @var array */ - private $_executeUpdates = array(); + private $_executeUpdates = []; /** * @param array $params @@ -60,7 +60,7 @@ class ConnectionMock extends Connection /** * {@inheritdoc} */ - public function insert($tableName, array $data, array $types = array()) + public function insert($tableName, array $data, array $types = []) { $this->_inserts[$tableName][] = $data; } @@ -68,9 +68,9 @@ class ConnectionMock extends Connection /** * {@inheritdoc} */ - public function executeUpdate($query, array $params = array(), array $types = array()) + public function executeUpdate($query, array $params = [], array $types = []) { - $this->_executeUpdates[] = array('query' => $query, 'params' => $params, 'types' => $types); + $this->_executeUpdates[] = ['query' => $query, 'params' => $params, 'types' => $types]; } /** @@ -84,7 +84,7 @@ class ConnectionMock extends Connection /** * {@inheritdoc} */ - public function fetchColumn($statement, array $params = array(), $colnum = 0, array $types = array()) + public function fetchColumn($statement, array $params = [], $colnum = 0, array $types = []) { return $this->_fetchOneResult; } @@ -153,7 +153,7 @@ class ConnectionMock extends Connection */ public function reset() { - $this->_inserts = array(); + $this->_inserts = []; $this->_lastInsertId = 0; } } diff --git a/tests/Doctrine/Tests/Mocks/DriverMock.php b/tests/Doctrine/Tests/Mocks/DriverMock.php index 15a37c17d..c805f0bf9 100644 --- a/tests/Doctrine/Tests/Mocks/DriverMock.php +++ b/tests/Doctrine/Tests/Mocks/DriverMock.php @@ -25,7 +25,7 @@ class DriverMock implements Driver /** * {@inheritdoc} */ - public function connect(array $params, $username = null, $password = null, array $driverOptions = array()) + public function connect(array $params, $username = null, $password = null, array $driverOptions = []) { return new DriverConnectionMock(); } diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index 6f98e3c50..f7af70227 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -72,7 +72,7 @@ class EntityManagerMock extends EntityManager $config = new Configuration(); $config->setProxyDir(__DIR__ . '/../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true)); } if (null === $eventManager) { $eventManager = new EventManager(); diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 6130f58f3..63be3397e 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -14,17 +14,17 @@ class EntityPersisterMock extends BasicEntityPersister /** * @var array */ - private $inserts = array(); + private $inserts = []; /** * @var array */ - private $updates = array(); + private $updates = []; /** * @var array */ - private $deletes = array(); + private $deletes = []; /** * @var int @@ -39,7 +39,7 @@ class EntityPersisterMock extends BasicEntityPersister /** * @var array */ - private $postInsertIds = array(); + private $postInsertIds = []; /** * @var bool @@ -57,10 +57,10 @@ class EntityPersisterMock extends BasicEntityPersister if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == ClassMetadata::GENERATOR_TYPE_IDENTITY || $this->class->isIdGeneratorIdentity()) { $id = $this->identityColumnValueCounter++; - $this->postInsertIds[] = array( + $this->postInsertIds[] = [ 'generatedId' => $id, 'entity' => $entity, - ); + ]; return $id; } return null; @@ -139,9 +139,9 @@ class EntityPersisterMock extends BasicEntityPersister { $this->existsCalled = false; $this->identityColumnValueCounter = 0; - $this->inserts = array(); - $this->updates = array(); - $this->deletes = array(); + $this->inserts = []; + $this->updates = []; + $this->deletes = []; } /** diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index 7afec2c60..ca0df22fe 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -108,7 +108,7 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * {@inheritdoc} */ - public function execute($params = array()) + public function execute($params = []) { } diff --git a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php index b691ec02c..f14c256b1 100644 --- a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php +++ b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php @@ -30,6 +30,6 @@ class MetadataDriverMock implements MappingDriver */ public function getAllClassNames() { - return array(); + return []; } } diff --git a/tests/Doctrine/Tests/Mocks/TaskMock.php b/tests/Doctrine/Tests/Mocks/TaskMock.php index f097abc03..f6ce095ad 100644 --- a/tests/Doctrine/Tests/Mocks/TaskMock.php +++ b/tests/Doctrine/Tests/Mocks/TaskMock.php @@ -17,7 +17,7 @@ class TaskMock extends \Doctrine\Common\Cli\Tasks\AbstractTask * * @var array (TaskMock) */ - static public $instances = array(); + static public $instances = []; /** * @var int diff --git a/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php b/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php index b55c7c5e3..3f088a4e4 100644 --- a/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php +++ b/tests/Doctrine/Tests/Mocks/TimestampRegionMock.php @@ -14,6 +14,6 @@ class TimestampRegionMock extends CacheRegionMock implements TimestampRegion { public function update(CacheKey $key) { - $this->calls[__FUNCTION__][] = array('key' => $key); + $this->calls[__FUNCTION__][] = ['key' => $key]; } } diff --git a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php index 3d7361e7f..f11f71523 100644 --- a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php +++ b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php @@ -12,7 +12,7 @@ class UnitOfWorkMock extends UnitOfWork /** * @var array */ - private $_mockDataChangeSets = array(); + private $_mockDataChangeSets = []; /** * @var array|null diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php index aaf4956d3..c89686643 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php @@ -124,91 +124,115 @@ class CmsAddress public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->setPrimaryTable(array( + $metadata->setPrimaryTable( + [ 'name' => 'company_person', - )); + ] + ); - $metadata->mapField(array ( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', - )); + ] + ); - $metadata->mapField(array ( + $metadata->mapField( + [ 'fieldName' => 'zip', 'length' => 50, - )); + ] + ); - $metadata->mapField(array ( + $metadata->mapField( + [ 'fieldName' => 'city', 'length' => 50, - )); + ] + ); - $metadata->mapOneToOne(array( + $metadata->mapOneToOne( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', - 'joinColumns' => array(array('referencedColumnName' => 'id')) - )); + 'joinColumns' => [['referencedColumnName' => 'id']] + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT id, country, city FROM cms_addresses', 'resultSetMapping' => 'mapping-find-all', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'find-by-id', 'query' => 'SELECT * FROM cms_addresses WHERE id = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'count', 'query' => 'SELECT COUNT(*) AS count FROM cms_addresses', 'resultSetMapping' => 'mapping-count', - )); + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-find-all', - 'columns' => array(), - 'entities' => array ( array ( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'city', 'column' => 'city', - ), - array ( + ], + [ 'name' => 'country', 'column' => 'country', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', - ), - ), - )); + ], + ], + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-without-fields', - 'columns' => array(), - 'entities' => array(array ( + 'columns' => [], + 'entities' => [ + [ 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', - 'fields' => array() - ) - ) - )); + 'fields' => [] + ] + ] + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-count', - 'columns' =>array ( - array ( + 'columns' => [ + [ 'name' => 'count', - ), - ) - )); + ], + ] + ] + ); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CmsAddressListener', 'postPersist'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CmsAddressListener', 'prePersist'); @@ -222,4 +246,4 @@ class CmsAddress $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CmsAddressListener', 'preFlush'); $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad'); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/CMS/CmsUser.php b/tests/Doctrine/Tests/Models/CMS/CmsUser.php index 10042efb5..de23216f7 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsUser.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsUser.php @@ -271,188 +271,214 @@ class CmsUser public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->setPrimaryTable(array( + $metadata->setPrimaryTable( + [ 'name' => 'cms_users', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchIdAndUsernameWithResultClass', 'query' => 'SELECT id, username FROM cms_users WHERE username = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllColumns', 'query' => 'SELECT * FROM cms_users WHERE username = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchJoinedAddress', 'query' => 'SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', 'resultSetMapping' => 'mappingJoinedAddress', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchJoinedPhonenumber', 'query' => 'SELECT id, name, status, phonenumber AS number FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', 'resultSetMapping' => 'mappingJoinedPhonenumber', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchUserPhonenumberCount', 'query' => 'SELECT id, name, status, COUNT(phonenumber) AS numphones FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username IN (?) GROUP BY id, name, status, username ORDER BY username', 'resultSetMapping' => 'mappingUserPhonenumberCount', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ "name" => "fetchMultipleJoinsEntityResults", "resultSetMapping" => "mappingMultipleJoinsEntityResults", "query" => "SELECT u.id AS u_id, u.name AS u_name, u.status AS u_status, a.id AS a_id, a.zip AS a_zip, a.country AS a_country, COUNT(p.phonenumber) AS numphones FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id INNER JOIN cms_phonenumbers p ON u.id = p.user_id GROUP BY u.id, u.name, u.status, u.username, a.id, a.zip, a.country ORDER BY u.username" - )); + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mappingJoinedAddress', - 'columns' => array(), - 'entities' => array(array ( - 'fields'=> array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields'=> [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ), - array ( + ], + [ 'name' => 'address.zip', 'column' => 'zip', - ), - array ( + ], + [ 'name' => 'address.city', 'column' => 'city', - ), - array ( + ], + [ 'name' => 'address.country', 'column' => 'country', - ), - array ( + ], + [ 'name' => 'address.id', 'column' => 'a_id', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null - ), - ), - )); + ], + ], + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mappingJoinedPhonenumber', - 'columns' => array(), - 'entities' => array(array( - 'fields'=> array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields'=> [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ), - array ( + ], + [ 'name' => 'phonenumbers.phonenumber', 'column' => 'number', - ), - ), + ], + ], 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', 'discriminatorColumn' => null - ), - ), - )); + ], + ], + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mappingUserPhonenumberCount', - 'columns' => array(), - 'entities' => array ( - array( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ) - ), + ] + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null - ) - ), - 'columns' => array ( - array ( + ] + ], + 'columns' => [ + [ 'name' => 'numphones', - ) - ) - )); + ] + ] + ] + ); - $metadata->addSqlResultSetMapping(array( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mappingMultipleJoinsEntityResults', - 'entities' => array(array( - 'fields' => array( - array( + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'u_id', - ), - array( + ], + [ 'name' => 'name', 'column' => 'u_name', - ), - array( + ], + [ 'name' => 'status', 'column' => 'u_status', - ) - ), + ] + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null, - ), - array( - 'fields' => array( - array( + ], + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'a_id', - ), - array( + ], + [ 'name' => 'zip', 'column' => 'a_zip', - ), - array( + ], + [ 'name' => 'country', 'column' => 'a_country', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', 'discriminatorColumn' => null, - ), - ), - 'columns' => array(array( + ], + ], + 'columns' => [ + [ 'name' => 'numphones', - ) - ) - )); + ] + ] + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php index 139098274..15e691ba0 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyContract.php @@ -134,28 +134,36 @@ abstract class CompanyContract { $metadata->setInheritanceType(\Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_JOINED); $metadata->setTableName( 'company_contracts'); - $metadata->setDiscriminatorColumn(array( + $metadata->setDiscriminatorColumn( + [ 'name' => 'discr', 'type' => 'string', - )); + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'name' => 'id', 'fieldName' => 'id', - )); + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'type' => 'boolean', 'name' => 'completed', 'fieldName' => 'completed', - )); + ] + ); - $metadata->setDiscriminatorMap(array( + $metadata->setDiscriminatorMap( + [ "fix" => "CompanyFixContract", "flexible" => "CompanyFlexContract", "flexultra" => "CompanyFlexUltraContract" - )); + ] + ); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php index 87f3ce952..8fe94e258 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyFixContract.php @@ -30,10 +30,12 @@ class CompanyFixContract extends CompanyContract static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'type' => 'integer', 'name' => 'fixPrice', 'fieldName' => 'fixPrice', - )); + ] + ); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php index 86e6b330c..978e8d5e6 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php @@ -110,16 +110,20 @@ class CompanyFlexContract extends CompanyContract static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'type' => 'integer', 'name' => 'hoursWorked', 'fieldName' => 'hoursWorked', - )); + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'type' => 'integer', 'name' => 'pricePerHour', 'fieldName' => 'pricePerHour', - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php index 85126bd0e..47313d032 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexUltraContract.php @@ -31,11 +31,13 @@ class CompanyFlexUltraContract extends CompanyFlexContract static public function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'type' => 'integer', 'name' => 'maxPrice', 'fieldName' => 'maxPrice', - )); + ] + ); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); @@ -47,8 +49,8 @@ class CompanyFlexUltraContract extends CompanyFlexContract $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractListener', 'preFlushHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler'); - + $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler1'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2'); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php index 4636fa4e3..529c0e109 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php @@ -120,41 +120,50 @@ class CompanyPerson public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->setPrimaryTable(array( + $metadata->setPrimaryTable( + [ 'name' => 'company_person', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllWithResultClass', 'query' => 'SELECT id, name, discr FROM company_persons ORDER BY name', 'resultClass' => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson', - )); + ] + ); - $metadata->addNamedNativeQuery(array ( + $metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllWithSqlResultSetMapping', 'query' => 'SELECT id, name, discr AS discriminator FROM company_persons ORDER BY name', 'resultSetMapping' => 'mappingFetchAll', - )); + ] + ); - $metadata->addSqlResultSetMapping(array ( + $metadata->addSqlResultSetMapping( + [ 'name' => 'mappingFetchAll', - 'columns' => array(), - 'entities' => array ( array ( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson', 'discriminatorColumn' => 'discriminator', - ), - ), - )); + ], + ], + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php b/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php index 4f94dad13..b543b0fe5 100644 --- a/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php +++ b/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php @@ -44,13 +44,17 @@ class DDC1476EntityWithDefaultFieldType public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', - )); - $metadata->mapField(array( + ] + ); + $metadata->mapField( + [ 'fieldName' => 'name', - )); + ] + ); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_NONE); } diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php index 5229ee280..e284532c0 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php @@ -24,5 +24,5 @@ class DDC3346Author /** * @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"}) */ - public $articles = array(); + public $articles = []; } diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php index effedc3c4..85383994c 100644 --- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php +++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Admin.php @@ -15,8 +15,9 @@ class DDC3579Admin extends DDC3579User { public static function loadMetadata($metadata) { - $metadata->setAssociationOverride('groups', array( + $metadata->setAssociationOverride('groups', [ 'inversedBy' => 'admins' - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php index 7a7ea5de6..8b6193cdc 100644 --- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php +++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php @@ -81,27 +81,33 @@ class DDC3579User public static function loadMetadata($metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'user_id', 'length' => 150, - )); + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'columnName'=> 'user_name', 'nullable' => true, 'unique' => false, 'length' => 250, - )); + ] + ); - $metadata->mapManyToMany(array( + $metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'DDC3579Group' - )); + ] + ); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO); } diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php index 00e5da017..4690e068a 100644 --- a/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php +++ b/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php @@ -13,10 +13,12 @@ class DDC869ChequePayment extends DDC869Payment public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'serialNumber', 'type' => 'string', - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php index 4c1f8c306..6f314e318 100644 --- a/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php +++ b/tests/Doctrine/Tests/Models/DDC869/DDC869CreditCardPayment.php @@ -13,10 +13,12 @@ class DDC869CreditCardPayment extends DDC869Payment public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'creditCardNumber', 'type' => 'string', - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php index ea052d12e..f689a82ea 100644 --- a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php +++ b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php @@ -21,16 +21,20 @@ class DDC869Payment public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', - )); - $metadata->mapField(array( + ] + ); + $metadata->mapField( + [ 'fieldName' => 'value', 'type' => 'float', - )); + ] + ); $metadata->isMappedSuperclass = true; $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php b/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php index 8bba1274c..089261a83 100644 --- a/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php +++ b/tests/Doctrine/Tests/Models/DDC889/DDC889Class.php @@ -15,12 +15,14 @@ class DDC889Class extends DDC889SuperClass public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', - )); + ] + ); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO); } diff --git a/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php b/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php index 42fd93386..8408a9ad7 100644 --- a/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php +++ b/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php @@ -13,9 +13,11 @@ class DDC889SuperClass public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'name', - )); + ] + ); $metadata->isMappedSuperclass = true; $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_NONE); diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php index 110326b2c..29ea4dd4e 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php @@ -23,23 +23,31 @@ class DDC964Admin extends DDC964User { public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->setAssociationOverride('address',array( - 'joinColumns'=>array(array( + $metadata->setAssociationOverride('address', + [ + 'joinColumns'=> [ + [ 'name' => 'adminaddress_id', 'referencedColumnName' => 'id', - )) - )); + ] + ] + ] + ); - $metadata->setAssociationOverride('groups',array( - 'joinTable' => array( + $metadata->setAssociationOverride('groups', + [ + 'joinTable' => [ 'name' => 'ddc964_users_admingroups', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => 'adminuser_id', - )), - 'inverseJoinColumns' =>array (array ( + ] + ], + 'inverseJoinColumns' => [[ 'name' => 'admingroup_id', - )) - ) - )); + ]] + ] + ] + ); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php index cb64d15fa..23486b0fd 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php @@ -26,17 +26,20 @@ class DDC964Guest extends DDC964User { public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->setAttributeOverride('id', array( + $metadata->setAttributeOverride('id', [ 'columnName' => 'guest_id', 'type' => 'integer', 'length' => 140, - )); + ] + ); - $metadata->setAttributeOverride('name',array( + $metadata->setAttributeOverride('name', + [ 'columnName' => 'guest_name', 'nullable' => false, 'unique' => true, 'length' => 240, - )); + ] + ); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php index f1bfdae39..a9f15c8c9 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php @@ -109,47 +109,59 @@ class DDC964User public static function loadMetadata(\Doctrine\ORM\Mapping\ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'user_id', 'length' => 150, - )); - $metadata->mapField(array( + ] + ); + $metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'columnName'=> 'user_name', 'nullable' => true, 'unique' => false, 'length' => 250, - )); + ] + ); - $metadata->mapManyToOne(array( + $metadata->mapManyToOne( + [ 'fieldName' => 'address', 'targetEntity' => 'DDC964Address', - 'cascade' => array('persist','merge'), - 'joinColumn' => array('name'=>'address_id', 'referencedColumnMame'=>'id'), - )); + 'cascade' => ['persist','merge'], + 'joinColumn' => ['name'=>'address_id', 'referencedColumnMame'=>'id'], + ] + ); - $metadata->mapManyToMany(array( + $metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'DDC964Group', 'inversedBy' => 'users', - 'cascade' => array('persist','merge','detach'), - 'joinTable' => array( + 'cascade' => ['persist','merge','detach'], + 'joinTable' => [ 'name' => 'ddc964_users_groups', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name'=>'user_id', 'referencedColumnName'=>'id', - )), - 'inverseJoinColumns'=>array(array( + ] + ], + 'inverseJoinColumns'=> [ + [ 'name'=>'group_id', 'referencedColumnName'=>'id', - )) - ) - )); + ] + ] + ] + ] + ); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/GeoNames/Admin1.php b/tests/Doctrine/Tests/Models/GeoNames/Admin1.php index 15a0147ed..11b9d8e85 100644 --- a/tests/Doctrine/Tests/Models/GeoNames/Admin1.php +++ b/tests/Doctrine/Tests/Models/GeoNames/Admin1.php @@ -28,7 +28,7 @@ class Admin1 * @OneToMany(targetEntity="Admin1AlternateName", mappedBy="admin1") * @Cache */ - public $names = array(); + public $names = []; /** * @Column(type="string", length=255); diff --git a/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php b/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php index 9e5d5d02e..7354e56ca 100644 --- a/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php +++ b/tests/Doctrine/Tests/Models/Routing/RoutingRoute.php @@ -30,10 +30,10 @@ class RoutingRoute * @OneToMany(targetEntity="RoutingRouteBooking", mappedBy="route") * @OrderBy({"passengerName" = "ASC"}) */ - public $bookings = array(); + public $bookings = []; public function __construct() { $this->legs = new ArrayCollection(); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php index ca01b069d..665978f01 100644 --- a/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/AbstractRegionTest.php @@ -37,10 +37,10 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase static public function dataProviderCacheValues() { - return array( - array(new CacheKeyMock('key.1'), new CacheEntryMock(array('id'=>1, 'name' => 'bar'))), - array(new CacheKeyMock('key.2'), new CacheEntryMock(array('id'=>2, 'name' => 'foo'))), - ); + return [ + [new CacheKeyMock('key.1'), new CacheEntryMock(['id'=>1, 'name' => 'bar'])], + [new CacheKeyMock('key.2'), new CacheEntryMock(['id'=>2, 'name' => 'foo'])], + ]; } /** @@ -57,7 +57,7 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase $actual = $this->region->get($key); $this->assertEquals($value, $actual); - + $this->region->evict($key); $this->assertFalse($this->region->contains($key)); @@ -71,8 +71,8 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase $this->assertFalse($this->region->contains($key1)); $this->assertFalse($this->region->contains($key2)); - $this->region->put($key1, new CacheEntryMock(array('value' => 'foo'))); - $this->region->put($key2, new CacheEntryMock(array('value' => 'bar'))); + $this->region->put($key1, new CacheEntryMock(['value' => 'foo'])); + $this->region->put($key2, new CacheEntryMock(['value' => 'bar'])); $this->assertTrue($this->region->contains($key1)); $this->assertTrue($this->region->contains($key2)); @@ -82,4 +82,4 @@ abstract class AbstractRegionTest extends OrmFunctionalTestCase $this->assertFalse($this->region->contains($key1)); $this->assertFalse($this->region->contains($key2)); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php index 39c28af1e..63c86d7f1 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php @@ -13,57 +13,57 @@ class CacheKeyTest extends DoctrineTestCase { public function testEntityCacheKeyIdentifierCollision() { - $key1 = new EntityCacheKey('Foo', array('id'=>1)); - $key2 = new EntityCacheKey('Bar', array('id'=>1)); + $key1 = new EntityCacheKey('Foo', ['id'=>1]); + $key2 = new EntityCacheKey('Bar', ['id'=>1]); $this->assertNotEquals($key1->hash, $key2->hash); } public function testEntityCacheKeyIdentifierType() { - $key1 = new EntityCacheKey('Foo', array('id'=>1)); - $key2 = new EntityCacheKey('Foo', array('id'=>'1')); + $key1 = new EntityCacheKey('Foo', ['id'=>1]); + $key2 = new EntityCacheKey('Foo', ['id'=>'1']); $this->assertEquals($key1->hash, $key2->hash); } public function testEntityCacheKeyIdentifierOrder() { - $key1 = new EntityCacheKey('Foo', array('foo_bar'=>1, 'bar_foo'=> 2)); - $key2 = new EntityCacheKey('Foo', array('bar_foo'=>2, 'foo_bar'=> 1)); + $key1 = new EntityCacheKey('Foo', ['foo_bar'=>1, 'bar_foo'=> 2]); + $key2 = new EntityCacheKey('Foo', ['bar_foo'=>2, 'foo_bar'=> 1]); $this->assertEquals($key1->hash, $key2->hash); } public function testCollectionCacheKeyIdentifierType() { - $key1 = new CollectionCacheKey('Foo', 'assoc', array('id'=>1)); - $key2 = new CollectionCacheKey('Foo', 'assoc', array('id'=>'1')); + $key1 = new CollectionCacheKey('Foo', 'assoc', ['id'=>1]); + $key2 = new CollectionCacheKey('Foo', 'assoc', ['id'=>'1']); $this->assertEquals($key1->hash, $key2->hash); } public function testCollectionCacheKeyIdentifierOrder() { - $key1 = new CollectionCacheKey('Foo', 'assoc', array('foo_bar'=>1, 'bar_foo'=> 2)); - $key2 = new CollectionCacheKey('Foo', 'assoc', array('bar_foo'=>2, 'foo_bar'=> 1)); + $key1 = new CollectionCacheKey('Foo', 'assoc', ['foo_bar'=>1, 'bar_foo'=> 2]); + $key2 = new CollectionCacheKey('Foo', 'assoc', ['bar_foo'=>2, 'foo_bar'=> 1]); $this->assertEquals($key1->hash, $key2->hash); } public function testCollectionCacheKeyIdentifierCollision() { - $key1 = new CollectionCacheKey('Foo', 'assoc', array('id'=>1)); - $key2 = new CollectionCacheKey('Bar', 'assoc', array('id'=>1)); + $key1 = new CollectionCacheKey('Foo', 'assoc', ['id'=>1]); + $key2 = new CollectionCacheKey('Bar', 'assoc', ['id'=>1]); $this->assertNotEquals($key1->hash, $key2->hash); } public function testCollectionCacheKeyAssociationCollision() { - $key1 = new CollectionCacheKey('Foo', 'assoc1', array('id'=>1)); - $key2 = new CollectionCacheKey('Foo', 'assoc2', array('id'=>1)); + $key1 = new CollectionCacheKey('Foo', 'assoc1', ['id'=>1]); + $key2 = new CollectionCacheKey('Foo', 'assoc2', ['id'=>1]); $this->assertNotEquals($key1->hash, $key2->hash); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php index 0af90cb07..625b05867 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php @@ -42,13 +42,13 @@ class CacheLoggerChainTest extends DoctrineTestCase $this->logger->setLogger('mock', $this->mock); $this->assertSame($this->mock, $this->logger->getLogger('mock')); - $this->assertEquals(array('mock' => $this->mock), $this->logger->getLoggers()); + $this->assertEquals(['mock' => $this->mock], $this->logger->getLoggers()); } public function testEntityCacheChain() { $name = 'my_entity_region'; - $key = new EntityCacheKey(State::CLASSNAME, array('id' => 1)); + $key = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); $this->logger->setLogger('mock', $this->mock); @@ -72,7 +72,7 @@ class CacheLoggerChainTest extends DoctrineTestCase public function testCollectionCacheChain() { $name = 'my_collection_region'; - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); $this->logger->setLogger('mock', $this->mock); @@ -116,4 +116,4 @@ class CacheLoggerChainTest extends DoctrineTestCase $this->logger->queryCachePut($name, $key); $this->logger->queryCacheMiss($name, $key); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php index 40c997d42..a948676d7 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php @@ -40,9 +40,9 @@ class DefaultCacheFactoryTest extends OrmTestCase $this->em = $this->_getTestEntityManager(); $this->regionsConfig = new RegionsConfiguration; - $arguments = array($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()); + $arguments = [$this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()]; $this->factory = $this->getMockBuilder(DefaultCacheFactory::class) - ->setMethods(array('getRegion')) + ->setMethods(['getRegion']) ->setConstructorArgs($arguments) ->getMock(); } @@ -261,24 +261,30 @@ class DefaultCacheFactoryTest extends OrmTestCase { $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()); - $factory->getRegion(array( + $factory->getRegion( + [ 'usage' => ClassMetadata::CACHE_USAGE_READ_WRITE, 'region' => 'foo' - )); + ] + ); } public function testBuildsNewNamespacedCacheInstancePerRegionInstance() { $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()); - $fooRegion = $factory->getRegion(array( + $fooRegion = $factory->getRegion( + [ 'region' => 'foo', 'usage' => ClassMetadata::CACHE_USAGE_READ_ONLY, - )); - $barRegion = $factory->getRegion(array( + ] + ); + $barRegion = $factory->getRegion( + [ 'region' => 'bar', 'usage' => ClassMetadata::CACHE_USAGE_READ_ONLY, - )); + ] + ); $this->assertSame('foo', $fooRegion->getCache()->getNamespace()); $this->assertSame('bar', $barRegion->getCache()->getNamespace()); @@ -293,10 +299,12 @@ class DefaultCacheFactoryTest extends OrmTestCase $this->assertInstanceOf( 'Doctrine\ORM\Cache\Region\DefaultRegion', - $factory->getRegion(array( + $factory->getRegion( + [ 'region' => 'bar', 'usage' => ClassMetadata::CACHE_USAGE_READ_ONLY, - )) + ] + ) ); } @@ -309,10 +317,12 @@ class DefaultCacheFactoryTest extends OrmTestCase $this->assertInstanceOf( 'Doctrine\ORM\Cache\Region\DefaultMultiGetRegion', - $factory->getRegion(array( + $factory->getRegion( + [ 'region' => 'bar', 'usage' => ClassMetadata::CACHE_USAGE_READ_ONLY, - )) + ] + ) ); } diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php index c33d0839b..866153fbb 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php @@ -72,7 +72,7 @@ class DefaultCacheTest extends OrmTestCase { $this->assertInstanceOf('Doctrine\ORM\Cache', $this->cache); } - + public function testGetEntityCacheRegionAccess() { $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(State::CLASSNAME)); @@ -87,9 +87,9 @@ class DefaultCacheTest extends OrmTestCase public function testContainsEntity() { - $identifier = array('id'=>1); + $identifier = ['id'=>1]; $className = Country::CLASSNAME; - $cacheEntry = array_merge($identifier, array('name' => 'Brazil')); + $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1)); @@ -101,9 +101,9 @@ class DefaultCacheTest extends OrmTestCase public function testEvictEntity() { - $identifier = array('id'=>1); + $identifier = ['id'=>1]; $className = Country::CLASSNAME; - $cacheEntry = array_merge($identifier, array('name' => 'Brazil')); + $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); @@ -117,9 +117,9 @@ class DefaultCacheTest extends OrmTestCase public function testEvictEntityRegion() { - $identifier = array('id'=>1); + $identifier = ['id'=>1]; $className = Country::CLASSNAME; - $cacheEntry = array_merge($identifier, array('name' => 'Brazil')); + $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); @@ -133,9 +133,9 @@ class DefaultCacheTest extends OrmTestCase public function testEvictEntityRegions() { - $identifier = array('id'=>1); + $identifier = ['id'=>1]; $className = Country::CLASSNAME; - $cacheEntry = array_merge($identifier, array('name' => 'Brazil')); + $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); @@ -148,13 +148,13 @@ class DefaultCacheTest extends OrmTestCase public function testContainsCollection() { - $ownerId = array('id'=>1); + $ownerId = ['id'=>1]; $className = State::CLASSNAME; $association = 'cities'; - $cacheEntry = array( - array('id' => 11), - array('id' => 12), - ); + $cacheEntry = [ + ['id' => 11], + ['id' => 12], + ]; $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1)); @@ -166,13 +166,13 @@ class DefaultCacheTest extends OrmTestCase public function testEvictCollection() { - $ownerId = array('id'=>1); + $ownerId = ['id'=>1]; $className = State::CLASSNAME; $association = 'cities'; - $cacheEntry = array( - array('id' => 11), - array('id' => 12), - ); + $cacheEntry = [ + ['id' => 11], + ['id' => 12], + ]; $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); @@ -186,13 +186,13 @@ class DefaultCacheTest extends OrmTestCase public function testEvictCollectionRegion() { - $ownerId = array('id'=>1); + $ownerId = ['id'=>1]; $className = State::CLASSNAME; $association = 'cities'; - $cacheEntry = array( - array('id' => 11), - array('id' => 12), - ); + $cacheEntry = [ + ['id' => 11], + ['id' => 12], + ]; $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); @@ -206,13 +206,13 @@ class DefaultCacheTest extends OrmTestCase public function testEvictCollectionRegions() { - $ownerId = array('id'=>1); + $ownerId = ['id'=>1]; $className = State::CLASSNAME; $association = 'cities'; - $cacheEntry = array( - array('id' => 11), - array('id' => 12), - ); + $cacheEntry = [ + ['id' => 11], + ['id' => 12], + ]; $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); @@ -257,7 +257,7 @@ class DefaultCacheTest extends OrmTestCase $method->setAccessible(true); $property->setValue($entity, $identifier); - $this->assertEquals(array('id'=>$identifier), $method->invoke($this->cache, $metadata, $identifier)); + $this->assertEquals(['id'=>$identifier], $method->invoke($this->cache, $metadata, $identifier)); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php index ed0456e39..e3c4d785b 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php @@ -41,17 +41,21 @@ class DefaultCollectionHydratorTest extends OrmFunctionalTestCase public function testLoadCacheCollection() { $targetRegion = $this->_em->getCache()->getEntityCacheRegion(City::CLASSNAME); - $entry = new CollectionCacheEntry(array( - new EntityCacheKey(City::CLASSNAME, array('id'=>31)), - new EntityCacheKey(City::CLASSNAME, array('id'=>32)), - )); + $entry = new CollectionCacheEntry( + [ + new EntityCacheKey(City::CLASSNAME, ['id'=>31]), + new EntityCacheKey(City::CLASSNAME, ['id'=>32]), + ] + ); - $targetRegion->put(new EntityCacheKey(City::CLASSNAME, array('id'=>31)), new EntityCacheEntry(City::CLASSNAME, array('id'=>31, 'name'=>'Foo'))); - $targetRegion->put(new EntityCacheKey(City::CLASSNAME, array('id'=>32)), new EntityCacheEntry(City::CLASSNAME, array('id'=>32, 'name'=>'Bar'))); + $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>31]), new EntityCacheEntry(City::CLASSNAME, ['id'=>31, 'name'=>'Foo'] + )); + $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>32]), new EntityCacheEntry(City::CLASSNAME, ['id'=>32, 'name'=>'Bar'] + )); $sourceClass = $this->_em->getClassMetadata(State::CLASSNAME); $targetClass = $this->_em->getClassMetadata(City::CLASSNAME); - $key = new CollectionCacheKey($sourceClass->name, 'cities', array('id'=>21)); + $key = new CollectionCacheKey($sourceClass->name, 'cities', ['id'=>21]); $collection = new PersistentCollection($this->_em, $targetClass, new ArrayCollection()); $list = $this->structure->loadCacheEntry($sourceClass, $key, $entry, $collection); @@ -75,4 +79,4 @@ class DefaultCollectionHydratorTest extends OrmFunctionalTestCase $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($collection[1])); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php index 73878ee46..e7fdb617b 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php @@ -43,8 +43,8 @@ class DefaultEntityHydratorTest extends OrmTestCase public function testCreateEntity() { $metadata = $this->em->getClassMetadata(Country::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>1)); - $entry = new EntityCacheEntry($metadata->name, array('id'=>1, 'name'=>'Foo')); + $key = new EntityCacheKey($metadata->name, ['id'=>1]); + $entry = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']); $entity = $this->structure->loadCacheEntry($metadata, $key, $entry); $this->assertInstanceOf($metadata->name, $entity); @@ -57,8 +57,8 @@ class DefaultEntityHydratorTest extends OrmTestCase public function testLoadProxy() { $metadata = $this->em->getClassMetadata(Country::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>1)); - $entry = new EntityCacheEntry($metadata->name, array('id'=>1, 'name'=>'Foo')); + $key = new EntityCacheKey($metadata->name, ['id'=>1]); + $entry = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']); $proxy = $this->em->getReference($metadata->name, $key->identifier); $entity = $this->structure->loadCacheEntry($metadata, $key, $entry, $proxy); @@ -74,9 +74,9 @@ class DefaultEntityHydratorTest extends OrmTestCase { $entity = new Country('Foo'); $uow = $this->em->getUnitOfWork(); - $data = array('id'=>1, 'name'=>'Foo'); + $data = ['id'=>1, 'name'=>'Foo']; $metadata = $this->em->getClassMetadata(Country::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>1)); + $key = new EntityCacheKey($metadata->name, ['id'=>1]); $entity->setId(1); $uow->registerManaged($entity, $key->identifier, $data); @@ -88,10 +88,11 @@ class DefaultEntityHydratorTest extends OrmTestCase $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); - $this->assertEquals(array( + $this->assertEquals( + [ 'id' => 1, 'name' => 'Foo', - ), $cache->data); + ], $cache->data); } public function testBuildCacheEntryAssociation() @@ -99,16 +100,16 @@ class DefaultEntityHydratorTest extends OrmTestCase $country = new Country('Foo'); $state = new State('Bat', $country); $uow = $this->em->getUnitOfWork(); - $countryData = array('id'=>11, 'name'=>'Foo'); - $stateData = array('id'=>12, 'name'=>'Bar', 'country' => $country); + $countryData = ['id'=>11, 'name'=>'Foo']; + $stateData = ['id'=>12, 'name'=>'Bar', 'country' => $country]; $metadata = $this->em->getClassMetadata(State::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>11)); + $key = new EntityCacheKey($metadata->name, ['id'=>11]); $country->setId(11); $state->setId(12); - $uow->registerManaged($country, array('id'=>11), $countryData); - $uow->registerManaged($state, array('id'=>12), $stateData); + $uow->registerManaged($country, ['id'=>11], $countryData); + $uow->registerManaged($state, ['id'=>12], $stateData); $cache = $this->structure->buildCacheEntry($metadata, $key, $state); @@ -118,11 +119,12 @@ class DefaultEntityHydratorTest extends OrmTestCase $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); $this->assertArrayHasKey('country', $cache->data); - $this->assertEquals(array( + $this->assertEquals( + [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)), - ), $cache->data); + 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + ], $cache->data); } public function testBuildCacheEntryNonInitializedAssocProxy() @@ -130,13 +132,13 @@ class DefaultEntityHydratorTest extends OrmTestCase $proxy = $this->em->getReference(Country::CLASSNAME, 11); $entity = new State('Bat', $proxy); $uow = $this->em->getUnitOfWork(); - $entityData = array('id'=>12, 'name'=>'Bar', 'country' => $proxy); + $entityData = ['id'=>12, 'name'=>'Bar', 'country' => $proxy]; $metadata = $this->em->getClassMetadata(State::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>11)); + $key = new EntityCacheKey($metadata->name, ['id'=>11]); $entity->setId(12); - $uow->registerManaged($entity, array('id'=>12), $entityData); + $uow->registerManaged($entity, ['id'=>12], $entityData); $cache = $this->structure->buildCacheEntry($metadata, $key, $entity); @@ -146,11 +148,12 @@ class DefaultEntityHydratorTest extends OrmTestCase $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); $this->assertArrayHasKey('country', $cache->data); - $this->assertEquals(array( + $this->assertEquals( + [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)), - ), $cache->data); + 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + ], $cache->data); } public function testCacheEntryWithWrongIdentifierType() @@ -158,13 +161,13 @@ class DefaultEntityHydratorTest extends OrmTestCase $proxy = $this->em->getReference(Country::CLASSNAME, 11); $entity = new State('Bat', $proxy); $uow = $this->em->getUnitOfWork(); - $entityData = array('id'=> 12, 'name'=>'Bar', 'country' => $proxy); + $entityData = ['id'=> 12, 'name'=>'Bar', 'country' => $proxy]; $metadata = $this->em->getClassMetadata(State::CLASSNAME); - $key = new EntityCacheKey($metadata->name, array('id'=>'12')); + $key = new EntityCacheKey($metadata->name, ['id'=>'12']); $entity->setId(12); - $uow->registerManaged($entity, array('id'=>12), $entityData); + $uow->registerManaged($entity, ['id'=>12], $entityData); $cache = $this->structure->buildCacheEntry($metadata, $key, $entity); @@ -175,11 +178,12 @@ class DefaultEntityHydratorTest extends OrmTestCase $this->assertArrayHasKey('name', $cache->data); $this->assertArrayHasKey('country', $cache->data); $this->assertSame($entity->getId(), $cache->data['id']); - $this->assertEquals(array( + $this->assertEquals( + [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)), - ), $cache->data); + 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + ], $cache->data); } } diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php index 8fa09bac6..f9b11bee8 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php @@ -79,7 +79,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testPutBasicQueryResult() { - $result = array(); + $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); $metadata = $this->em->getClassMetadata(Country::CLASSNAME); @@ -92,7 +92,7 @@ class DefaultQueryCacheTest extends OrmTestCase $result[] = $entity; $metadata->setFieldValue($entity, 'id', $i); - $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name)); + $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]); } $this->assertTrue($this->queryCache->put($key, $rsm, $result)); @@ -114,7 +114,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testPutToOneAssociationQueryResult() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -122,7 +122,8 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass = $this->em->getClassMetadata(State::CLASSNAME); $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name')); + $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + ); for ($i = 0; $i < 4; $i++) { $state = new State("State $i"); @@ -132,8 +133,8 @@ class DefaultQueryCacheTest extends OrmTestCase $cityClass->setFieldValue($city, 'id', $i); $stateClass->setFieldValue($state, 'id', $i*2); - $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $city->getName())); - $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state)); + $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $city->getName()]); + $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]); } $this->assertTrue($this->queryCache->put($key, $rsm, $result)); @@ -153,7 +154,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testPutToOneAssociation2LevelsQueryResult() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -162,8 +163,10 @@ class DefaultQueryCacheTest extends OrmTestCase $countryClass = $this->em->getClassMetadata(Country::CLASSNAME); $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name')); - $rsm->addJoinedEntityFromClassMetadata(Country::CLASSNAME, 'co', 's', 'country', array('id'=>'country_id', 'name'=>'country_name')); + $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + ); + $rsm->addJoinedEntityFromClassMetadata(Country::CLASSNAME, 'co', 's', 'country', ['id'=>'country_id', 'name'=>'country_name'] + ); for ($i = 0; $i < 4; $i++) { $country = new Country("Country $i"); @@ -176,9 +179,10 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass->setFieldValue($state, 'id', $i*2); $countryClass->setFieldValue($country, 'id', $i*3); - $uow->registerManaged($country, array('id' => $country->getId()), array('name' => $country->getName())); - $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'country' => $country)); - $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state)); + $uow->registerManaged($country, ['id' => $country->getId()], ['name' => $country->getName()]); + $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'country' => $country] + ); + $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]); } $this->assertTrue($this->queryCache->put($key, $rsm, $result)); @@ -202,14 +206,15 @@ class DefaultQueryCacheTest extends OrmTestCase public function testPutToOneAssociationNullQueryResult() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); $cityClass = $this->em->getClassMetadata(City::CLASSNAME); $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name')); + $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + ); for ($i = 0; $i < 4; $i++) { $city = new City("City $i", null); @@ -217,7 +222,7 @@ class DefaultQueryCacheTest extends OrmTestCase $cityClass->setFieldValue($city, 'id', $i); - $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => null)); + $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => null]); } $this->assertTrue($this->queryCache->put($key, $rsm, $result)); @@ -233,7 +238,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testPutToManyAssociationQueryResult() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -241,7 +246,7 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass = $this->em->getClassMetadata(State::CLASSNAME); $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array('id'=>'c_id', 'name'=>'c_name')); + $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); for ($i = 0; $i < 4; $i++) { $state = new State("State $i"); @@ -256,9 +261,12 @@ class DefaultQueryCacheTest extends OrmTestCase $state->addCity($city1); $state->addCity($city2); - $uow->registerManaged($city1, array('id' => $city1->getId()), array('name' => $city1->getName(), 'state' => $state)); - $uow->registerManaged($city2, array('id' => $city2->getId()), array('name' => $city2->getName(), 'state' => $state)); - $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'cities' => $state->getCities())); + $uow->registerManaged($city1, ['id' => $city1->getId()], ['name' => $city1->getName(), 'state' => $state] + ); + $uow->registerManaged($city2, ['id' => $city2->getId()], ['name' => $city2->getName(), 'state' => $state] + ); + $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'cities' => $state->getCities()] + ); } $this->assertTrue($this->queryCache->put($key, $rsm, $result)); @@ -270,16 +278,18 @@ class DefaultQueryCacheTest extends OrmTestCase { $rsm = new ResultSetMappingBuilder($this->em); $key = new QueryCacheKey('query.key1', 0); - $entry = new QueryCacheEntry(array( - array('identifier' => array('id' => 1)), - array('identifier' => array('id' => 2)) - )); - - $data = array( - array('id'=>1, 'name' => 'Foo'), - array('id'=>2, 'name' => 'Bar') + $entry = new QueryCacheEntry( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] ); + $data = [ + ['id'=>1, 'name' => 'Foo'], + ['id'=>2, 'name' => 'Bar'] + ]; + $this->region->addReturn('get', $entry); $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0])); $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1])); @@ -299,7 +309,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testCancelPutResultIfEntityPutFails() { - $result = array(); + $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); $metadata = $this->em->getClassMetadata(Country::CLASSNAME); @@ -312,7 +322,7 @@ class DefaultQueryCacheTest extends OrmTestCase $result[] = $entity; $metadata->setFieldValue($entity, 'id', $i); - $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name)); + $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]); } $this->region->addReturn('put', false); @@ -324,7 +334,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testCancelPutResultIfAssociationEntityPutFails() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -332,7 +342,8 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass = $this->em->getClassMetadata(State::CLASSNAME); $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', array('id'=>'state_id', 'name'=>'state_name')); + $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + ); $state = new State("State 1"); $city = new City("City 2", $state); @@ -341,8 +352,8 @@ class DefaultQueryCacheTest extends OrmTestCase $cityClass->setFieldValue($city, 'id', 1); $stateClass->setFieldValue($state, 'id', 11); - $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $city->getName())); - $uow->registerManaged($city, array('id' => $city->getId()), array('name' => $city->getName(), 'state' => $state)); + $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $city->getName()]); + $uow->registerManaged($city, ['id' => $city->getId()], ['name' => $city->getName(), 'state' => $state]); $this->region->addReturn('put', true); // put root entity $this->region->addReturn('put', false); // association fails @@ -352,7 +363,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testCancelPutToManyAssociationQueryResult() { - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -360,7 +371,7 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass = $this->em->getClassMetadata(State::CLASSNAME); $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array('id'=>'c_id', 'name'=>'c_name')); + $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); $state = new State("State"); $city1 = new City("City 1", $state); @@ -374,9 +385,10 @@ class DefaultQueryCacheTest extends OrmTestCase $state->addCity($city1); $state->addCity($city2); - $uow->registerManaged($city1, array('id' => $city1->getId()), array('name' => $city1->getName(), 'state' => $state)); - $uow->registerManaged($city2, array('id' => $city2->getId()), array('name' => $city2->getName(), 'state' => $state)); - $uow->registerManaged($state, array('id' => $state->getId()), array('name' => $state->getName(), 'cities' => $state->getCities())); + $uow->registerManaged($city1, ['id' => $city1->getId()], ['name' => $city1->getName(), 'state' => $state]); + $uow->registerManaged($city2, ['id' => $city2->getId()], ['name' => $city2->getName(), 'state' => $state]); + $uow->registerManaged($state, ['id' => $state->getId()], ['name' => $state->getName(), 'cities' => $state->getCities()] + ); $this->region->addReturn('put', true); // put root entity $this->region->addReturn('put', false); // collection association fails @@ -390,10 +402,12 @@ class DefaultQueryCacheTest extends OrmTestCase { $rsm = new ResultSetMappingBuilder($this->em); $key = new QueryCacheKey('query.key1', 0, Cache::MODE_PUT); - $entry = new QueryCacheEntry(array( - array('identifier' => array('id' => 1)), - array('identifier' => array('id' => 2)) - )); + $entry = new QueryCacheEntry( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] + ); $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); @@ -404,7 +418,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testIgnoreCacheNonPutMode() { - $result = array(); + $result = []; $rsm = new ResultSetMappingBuilder($this->em); $metadata = $this->em->getClassMetadata(Country::CLASSNAME); $key = new QueryCacheKey('query.key1', 0, Cache::MODE_GET); @@ -417,7 +431,7 @@ class DefaultQueryCacheTest extends OrmTestCase $result[] = $entity; $metadata->setFieldValue($entity, 'id', $i); - $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('name' => $name)); + $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['name' => $name]); } $this->assertFalse($this->queryCache->put($key, $rsm, $result)); @@ -427,14 +441,16 @@ class DefaultQueryCacheTest extends OrmTestCase { $rsm = new ResultSetMappingBuilder($this->em); $key = new QueryCacheKey('query.key1', 50); - $entry = new QueryCacheEntry(array( - array('identifier' => array('id' => 1)), - array('identifier' => array('id' => 2)) - )); - $entities = array( - array('id'=>1, 'name' => 'Foo'), - array('id'=>2, 'name' => 'Bar') + $entry = new QueryCacheEntry( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] ); + $entities = [ + ['id'=>1, 'name' => 'Foo'], + ['id'=>2, 'name' => 'Bar'] + ]; $entry->time = microtime(true) - 100; @@ -451,16 +467,18 @@ class DefaultQueryCacheTest extends OrmTestCase { $rsm = new ResultSetMappingBuilder($this->em); $key = new QueryCacheKey('query.key1', 0); - $entry = new \ArrayObject(array( - array('identifier' => array('id' => 1)), - array('identifier' => array('id' => 2)) - )); - - $data = array( - array('id'=>1, 'name' => 'Foo'), - array('id'=>2, 'name' => 'Bar') + $entry = new \ArrayObject( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] ); + $data = [ + ['id'=>1, 'name' => 'Foo'], + ['id'=>2, 'name' => 'Bar'] + ]; + $this->region->addReturn('get', $entry); $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0])); $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1])); @@ -474,10 +492,12 @@ class DefaultQueryCacheTest extends OrmTestCase { $rsm = new ResultSetMappingBuilder($this->em); $key = new QueryCacheKey('query.key1', 0); - $entry = new QueryCacheEntry(array( - array('identifier' => array('id' => 1)), - array('identifier' => array('id' => 2)) - )); + $entry = new QueryCacheEntry( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] + ); $this->region->addReturn('get', $entry); $this->region->addReturn('get', null); @@ -508,14 +528,16 @@ class DefaultQueryCacheTest extends OrmTestCase $wurzburg->addAttraction(new Restaurant('Fischers Fritz', $wurzburg)); $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', array( + $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', [ 'id' => 'c_id', 'name' => 'c_name' - )); - $rsm->addJoinedEntityFromClassMetadata(Restaurant::CLASSNAME, 'a', 'c', 'attractions', array( + ] + ); + $rsm->addJoinedEntityFromClassMetadata(Restaurant::CLASSNAME, 'a', 'c', 'attractions', [ 'id' => 'a_id', 'name' => 'a_name' - )); + ] + ); $cities = $reflection->invoke($this->queryCache, $rsm, 'c', $bavaria); $attractions = $reflection->invoke($this->queryCache, $rsm, 'a', $bavaria); @@ -537,7 +559,7 @@ class DefaultQueryCacheTest extends OrmTestCase */ public function testScalarResultException() { - $result = array(); + $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -552,7 +574,7 @@ class DefaultQueryCacheTest extends OrmTestCase */ public function testSupportMultipleRootEntitiesException() { - $result = array(); + $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); @@ -568,7 +590,7 @@ class DefaultQueryCacheTest extends OrmTestCase */ public function testNotCacheableEntityException() { - $result = array(); + $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); $className = 'Doctrine\Tests\Models\Generic\BooleanModel'; @@ -583,7 +605,7 @@ class DefaultQueryCacheTest extends OrmTestCase $entity->booleanField = $boolean; $result[] = $entity; - $this->em->getUnitOfWork()->registerManaged($entity, array('id' => $i), array('booleanField' => $boolean)); + $this->em->getUnitOfWork()->registerManaged($entity, ['id' => $i], ['booleanField' => $boolean]); } $this->assertFalse($this->queryCache->put($key, $rsm, $result)); diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php index 2bcc1fc21..5faed3c9e 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php @@ -33,7 +33,7 @@ class DefaultRegionTest extends AbstractRegionTest } $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('value' => 'foo')); + $entry = new CacheEntryMock(['value' => 'foo']); $region1 = new DefaultRegion('region1', new ApcCache()); $region2 = new DefaultRegion('region2', new ApcCache()); @@ -79,10 +79,10 @@ class DefaultRegionTest extends AbstractRegionTest public function testGetMulti() { $key1 = new CacheKeyMock('key.1'); - $value1 = new CacheEntryMock(array('id' => 1, 'name' => 'bar')); + $value1 = new CacheEntryMock(['id' => 1, 'name' => 'bar']); $key2 = new CacheKeyMock('key.2'); - $value2 = new CacheEntryMock(array('id' => 2, 'name' => 'bar')); + $value2 = new CacheEntryMock(['id' => 2, 'name' => 'bar']); $this->assertFalse($this->region->contains($key1)); $this->assertFalse($this->region->contains($key2)); @@ -93,9 +93,9 @@ class DefaultRegionTest extends AbstractRegionTest $this->assertTrue($this->region->contains($key1)); $this->assertTrue($this->region->contains($key2)); - $actual = $this->region->getMultiple(new CollectionCacheEntry(array($key1, $key2))); + $actual = $this->region->getMultiple(new CollectionCacheEntry([$key1, $key2])); $this->assertEquals($value1, $actual[0]); $this->assertEquals($value2, $actual[1]); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php index 6fdef6fea..5bb771ce7 100644 --- a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php @@ -21,7 +21,7 @@ class FileLockRegionTest extends AbstractRegionTest * @var \Doctrine\ORM\Cache\ConcurrentRegion */ protected $region; - + /** * @var string */ @@ -67,7 +67,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testLockAndUnlock() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $this->assertFalse($this->region->contains($key)); @@ -91,7 +91,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testLockWithExistingLock() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $this->assertFalse($this->region->contains($key)); @@ -114,7 +114,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testUnlockWithExistingLock() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $this->assertFalse($this->region->contains($key)); @@ -143,7 +143,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testPutWithExistingLock() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $this->assertFalse($this->region->contains($key)); @@ -166,7 +166,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testLockedEvict() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $this->assertFalse($this->region->contains($key)); @@ -186,11 +186,11 @@ class FileLockRegionTest extends AbstractRegionTest public function testLockedEvictAll() { $key1 = new CacheKeyMock('key1'); - $entry1 = new CacheEntryMock(array('foo1' => 'bar1')); + $entry1 = new CacheEntryMock(['foo1' => 'bar1']); $file1 = $this->getFileName($this->region, $key1); $key2 = new CacheKeyMock('key2'); - $entry2 = new CacheEntryMock(array('foo2' => 'bar2')); + $entry2 = new CacheEntryMock(['foo2' => 'bar2']); $file2 = $this->getFileName($this->region, $key2); $this->assertFalse($this->region->contains($key1)); @@ -222,7 +222,7 @@ class FileLockRegionTest extends AbstractRegionTest public function testLockLifetime() { $key = new CacheKeyMock('key'); - $entry = new CacheEntryMock(array('foo' => 'bar')); + $entry = new CacheEntryMock(['foo' => 'bar']); $file = $this->getFileName($this->region, $key); $property = new \ReflectionProperty($this->region, 'lockLifetime'); diff --git a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php index 65d21b93f..0d98665d0 100644 --- a/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/MultiGetRegionTest.php @@ -20,10 +20,10 @@ class MultiGetRegionTest extends AbstractRegionTest public function testGetMulti() { $key1 = new CacheKeyMock('key.1'); - $value1 = new CacheEntryMock(array('id' => 1, 'name' => 'bar')); + $value1 = new CacheEntryMock(['id' => 1, 'name' => 'bar']); $key2 = new CacheKeyMock('key.2'); - $value2 = new CacheEntryMock(array('id' => 2, 'name' => 'bar')); + $value2 = new CacheEntryMock(['id' => 2, 'name' => 'bar']); $this->assertFalse($this->region->contains($key1)); $this->assertFalse($this->region->contains($key2)); @@ -34,7 +34,7 @@ class MultiGetRegionTest extends AbstractRegionTest $this->assertTrue($this->region->contains($key1)); $this->assertTrue($this->region->contains($key2)); - $actual = $this->region->getMultiple(new CollectionCacheEntry(array($key1, $key2))); + $actual = $this->region->getMultiple(new CollectionCacheEntry([$key1, $key2])); $this->assertEquals($value1, $actual[0]); $this->assertEquals($value2, $actual[1]); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php index adc8ec0ba..681b43f0b 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php @@ -35,7 +35,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase /** * @var array */ - protected $regionMockMethods = array( + protected $regionMockMethods = [ 'getName', 'contains', 'get', @@ -43,12 +43,12 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase 'put', 'evict', 'evictAll' - ); + ]; /** * @var array */ - protected $collectionPersisterMockMethods = array( + protected $collectionPersisterMockMethods = [ 'delete', 'update', 'count', @@ -60,7 +60,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase 'get', 'getMultiple', 'loadCriteria' - ); + ]; /** * @param \Doctrine\ORM\EntityManager $em @@ -133,7 +133,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('delete') @@ -150,7 +150,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $collection->setDirty(true); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('update') @@ -165,7 +165,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('count') @@ -182,7 +182,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $collection = $this->createCollection($entity); $slice = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('slice') @@ -199,7 +199,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('contains') @@ -215,7 +215,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('containsKey') @@ -232,7 +232,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('removeElement') @@ -249,7 +249,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->collectionPersister->expects($this->once()) ->method('get') diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php index b41d27ab1..1c1e12b6d 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php @@ -16,7 +16,7 @@ use Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister; */ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersisterTest { - protected $regionMockMethods = array( + protected $regionMockMethods = [ 'getName', 'contains', 'get', @@ -26,7 +26,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister 'evictAll', 'lock', 'unlock', - ); + ]; /** * {@inheritdoc} @@ -52,14 +52,14 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($collection); } @@ -70,14 +70,14 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($collection); } @@ -88,7 +88,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -100,7 +100,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($collection); $persister->afterTransactionRolledBack(); @@ -112,7 +112,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -123,7 +123,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($collection); $persister->afterTransactionRolledBack(); @@ -135,7 +135,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -149,7 +149,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($collection); @@ -166,7 +166,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -180,7 +180,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($collection); @@ -197,7 +197,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -211,7 +211,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($collection); @@ -228,7 +228,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -242,7 +242,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($collection); @@ -258,7 +258,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $entity = new State("Foo"); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -272,7 +272,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('delete') ->with($this->equalTo($collection)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($collection); $this->assertCount(0, $property->getValue($persister)); @@ -283,7 +283,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $entity = new State("Foo"); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); $property->setAccessible(true); @@ -297,7 +297,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister ->method('update') ->with($this->equalTo($collection)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($collection); $this->assertCount(0, $property->getValue($persister)); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php index 83fd3ad85..7e4d83663 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php @@ -38,7 +38,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase /** * @var array */ - protected $regionMockMethods = array( + protected $regionMockMethods = [ 'getName', 'contains', 'get', @@ -46,12 +46,12 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase 'put', 'evict', 'evictAll' - ); + ]; /** * @var array */ - protected $entityPersisterMockMethods = array( + protected $entityPersisterMockMethods = [ 'getClassMetadata', 'getResultSetMapping', 'getInserts', @@ -79,7 +79,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase 'lock', 'getOneToManyCollection', 'exists' - ); + ]; /** * @param \Doctrine\ORM\EntityManager $em @@ -150,9 +150,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('getInserts') - ->will($this->returnValue(array($entity))); + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->getInserts()); + $this->assertEquals([$entity], $persister->getInserts()); } public function testInvokeGetSelectSQL() @@ -161,10 +161,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('getSelectSQL') - ->with($this->equalTo(array('name'=>'Foo')), $this->equalTo(array(0)), $this->equalTo(1), $this->equalTo(2), $this->equalTo(3), $this->equalTo(array(4))) + ->with($this->equalTo(['name'=>'Foo']), $this->equalTo([0]), $this->equalTo(1), $this->equalTo(2), $this->equalTo(3), $this->equalTo( + [4] + )) ->will($this->returnValue('SELECT * FROM foo WERE name = ?')); - $this->assertEquals('SELECT * FROM foo WERE name = ?', $persister->getSelectSQL(array('name'=>'Foo'), array(0), 1, 2, 3, array(4))); + $this->assertEquals('SELECT * FROM foo WERE name = ?', $persister->getSelectSQL( + ['name'=>'Foo'], [0], 1, 2, 3, [4] + )); } public function testInvokeGetInsertSQL() @@ -184,10 +188,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('expandParameters') - ->with($this->equalTo(array('name'=>'Foo'))) - ->will($this->returnValue(array('name'=>'Foo'))); + ->with($this->equalTo(['name'=>'Foo'])) + ->will($this->returnValue(['name'=>'Foo'])); - $this->assertEquals(array('name'=>'Foo'), $persister->expandParameters(array('name'=>'Foo'))); + $this->assertEquals(['name'=>'Foo'], $persister->expandParameters(['name'=>'Foo'])); } public function testInvokeExpandCriteriaParameters() @@ -198,9 +202,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('expandCriteriaParameters') ->with($this->equalTo($criteria)) - ->will($this->returnValue(array('name'=>'Foo'))); + ->will($this->returnValue(['name'=>'Foo'])); - $this->assertEquals(array('name'=>'Foo'), $persister->expandCriteriaParameters($criteria)); + $this->assertEquals(['name'=>'Foo'], $persister->expandCriteriaParameters($criteria)); } public function testInvokeSelectConditionStatementSQL() @@ -209,10 +213,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('getSelectConditionStatementSQL') - ->with($this->equalTo('id'), $this->equalTo(1), $this->equalTo(array()), $this->equalTo('=')) + ->with($this->equalTo('id'), $this->equalTo(1), $this->equalTo([]), $this->equalTo('=')) ->will($this->returnValue('name = 1')); - $this->assertEquals('name = 1', $persister->getSelectConditionStatementSQL('id', 1, array(), '=')); + $this->assertEquals('name = 1', $persister->getSelectConditionStatementSQL('id', 1, [], '=')); } public function testInvokeExecuteInserts() @@ -221,9 +225,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('executeInserts') - ->will($this->returnValue(array('id' => 1))); + ->will($this->returnValue(['id' => 1])); - $this->assertEquals(array('id' => 1), $persister->executeInserts()); + $this->assertEquals(['id' => 1], $persister->executeInserts()); } public function testInvokeUpdate() @@ -235,7 +239,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase ->method('update') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->assertNull($persister->update($entity)); } @@ -249,7 +253,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase ->method('delete') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->assertNull($persister->delete($entity)); } @@ -273,10 +277,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('load') - ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity), $this->equalTo(array(0)), $this->equalTo(array(1)), $this->equalTo(2), $this->equalTo(3), $this->equalTo(array(4))) + ->with($this->equalTo(['id' => 1]), $this->equalTo($entity), $this->equalTo([0]), $this->equalTo( + [1] + ), $this->equalTo(2), $this->equalTo(3), $this->equalTo( + [4] + )) ->will($this->returnValue($entity)); - $this->assertEquals($entity, $persister->load(array('id' => 1), $entity, array(0), array(1), 2, 3, array(4))); + $this->assertEquals($entity, $persister->load(['id' => 1], $entity, [0], [1], 2, 3, [4])); } public function testInvokeLoadAll() @@ -287,18 +295,18 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $rsm->addEntityResult(Country::CLASSNAME, 'c'); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $this->entityPersister->expects($this->once()) ->method('loadAll') - ->with($this->equalTo(array('id' => 1)), $this->equalTo(array(0)), $this->equalTo(1), $this->equalTo(2)) - ->will($this->returnValue(array($entity))); + ->with($this->equalTo(['id' => 1]), $this->equalTo([0]), $this->equalTo(1), $this->equalTo(2)) + ->will($this->returnValue([$entity])); $this->entityPersister->expects($this->once()) ->method('getResultSetMapping') ->will($this->returnValue($rsm)); - $this->assertEquals(array($entity), $persister->loadAll(array('id' => 1), array(0), 1, 2)); + $this->assertEquals([$entity], $persister->loadAll(['id' => 1], [0], 1, 2)); } public function testInvokeLoadById() @@ -308,10 +316,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('loadById') - ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity)) + ->with($this->equalTo(['id' => 1]), $this->equalTo($entity)) ->will($this->returnValue($entity)); - $this->assertEquals($entity, $persister->loadById(array('id' => 1), $entity)); + $this->assertEquals($entity, $persister->loadById(['id' => 1], $entity)); } public function testInvokeLoadOneToOneEntity() @@ -321,10 +329,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('loadOneToOneEntity') - ->with($this->equalTo(array()), $this->equalTo('foo'), $this->equalTo(array('id' => 11))) + ->with($this->equalTo([]), $this->equalTo('foo'), $this->equalTo(['id' => 11])) ->will($this->returnValue($entity)); - $this->assertEquals($entity, $persister->loadOneToOneEntity(array(), 'foo', array('id' => 11))); + $this->assertEquals($entity, $persister->loadOneToOneEntity([], 'foo', ['id' => 11])); } public function testInvokeRefresh() @@ -334,10 +342,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('refresh') - ->with($this->equalTo(array('id' => 1)), $this->equalTo($entity), $this->equalTo(0)) + ->with($this->equalTo(['id' => 1]), $this->equalTo($entity), $this->equalTo(0)) ->will($this->returnValue($entity)); - $this->assertNull($persister->refresh(array('id' => 1), $entity), 0); + $this->assertNull($persister->refresh(['id' => 1], $entity), 0); } public function testInvokeLoadCriteria() @@ -347,7 +355,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $entity = new Country("Foo"); $criteria = new Criteria(); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $rsm->addEntityResult(Country::CLASSNAME, 'c'); $this->entityPersister->expects($this->once()) @@ -357,9 +365,9 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('loadCriteria') ->with($this->equalTo($criteria)) - ->will($this->returnValue(array($entity))); + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->loadCriteria($criteria)); + $this->assertEquals([$entity], $persister->loadCriteria($criteria)); } public function testInvokeGetManyToManyCollection() @@ -369,10 +377,10 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('getManyToManyCollection') - ->with($this->equalTo(array()), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2)) - ->will($this->returnValue(array($entity))); + ->with($this->equalTo([]), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2)) + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->getManyToManyCollection(array(), 'Foo', 1 ,2)); + $this->assertEquals([$entity], $persister->getManyToManyCollection([], 'Foo', 1 ,2)); } public function testInvokeGetOneToManyCollection() @@ -382,16 +390,16 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('getOneToManyCollection') - ->with($this->equalTo(array()), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2)) - ->will($this->returnValue(array($entity))); + ->with($this->equalTo([]), $this->equalTo('Foo'), $this->equalTo(1), $this->equalTo(2)) + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->getOneToManyCollection(array(), 'Foo', 1 ,2)); + $this->assertEquals([$entity], $persister->getOneToManyCollection([], 'Foo', 1 ,2)); } public function testInvokeLoadManyToManyCollection() { $mapping = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country'); - $assoc = array('type' => 1); + $assoc = ['type' => 1]; $coll = new PersistentCollection($this->em, $mapping, new ArrayCollection()); $persister = $this->createPersisterDefault(); $entity = new Country("Foo"); @@ -399,15 +407,15 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('loadManyToManyCollection') ->with($this->equalTo($assoc), $this->equalTo('Foo'), $coll) - ->will($this->returnValue(array($entity))); + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->loadManyToManyCollection($assoc, 'Foo', $coll)); + $this->assertEquals([$entity], $persister->loadManyToManyCollection($assoc, 'Foo', $coll)); } public function testInvokeLoadOneToManyCollection() { $mapping = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country'); - $assoc = array('type' => 1); + $assoc = ['type' => 1]; $coll = new PersistentCollection($this->em, $mapping, new ArrayCollection()); $persister = $this->createPersisterDefault(); $entity = new Country("Foo"); @@ -415,14 +423,14 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('loadOneToManyCollection') ->with($this->equalTo($assoc), $this->equalTo('Foo'), $coll) - ->will($this->returnValue(array($entity))); + ->will($this->returnValue([$entity])); - $this->assertEquals(array($entity), $persister->loadOneToManyCollection($assoc, 'Foo', $coll)); + $this->assertEquals([$entity], $persister->loadOneToManyCollection($assoc, 'Foo', $coll)); } public function testInvokeLock() { - $identifier = array('id' => 1); + $identifier = ['id' => 1]; $persister = $this->createPersisterDefault(); $this->entityPersister->expects($this->once()) diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php index df1f6ac59..ad05020e6 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php @@ -32,7 +32,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste $property->setAccessible(true); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); $persister->delete($entity); @@ -48,8 +48,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); - $entry = new EntityCacheEntry(Country::CLASSNAME, array('id'=>1, 'name'=>'Foo')); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $entry = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); @@ -64,12 +64,12 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste $this->entityPersister->expects($this->once()) ->method('getInserts') - ->will($this->returnValue(array($entity))); + ->will($this->returnValue([$entity])); $this->entityPersister->expects($this->once()) ->method('executeInserts'); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->addInsert($entity); $persister->executeInserts(); @@ -85,8 +85,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); - $entry = new EntityCacheEntry(Country::CLASSNAME, array('id'=>1, 'name'=>'Foo')); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $entry = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); @@ -99,7 +99,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste ->method('update') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); @@ -114,7 +114,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); @@ -127,7 +127,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste ->method('delete') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($entity); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php index dc9fef43a..d90fd678b 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php @@ -17,7 +17,7 @@ use Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister; */ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest { - protected $regionMockMethods = array( + protected $regionMockMethods = [ 'getName', 'contains', 'get', @@ -27,7 +27,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest 'evictAll', 'lock', 'unlock', - ); + ]; /** * {@inheritdoc} @@ -52,14 +52,14 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($entity); } @@ -69,14 +69,14 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); } @@ -86,7 +86,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -98,7 +98,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->with($this->equalTo($key)) ->will($this->returnValue($lock)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); $persister->afterTransactionRolledBack(); @@ -109,7 +109,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -120,7 +120,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($entity); $persister->afterTransactionRolledBack(); @@ -131,7 +131,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); $property->setAccessible(true); @@ -145,7 +145,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); $persister->delete($entity); @@ -162,7 +162,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); $property->setAccessible(true); @@ -176,7 +176,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->method('evict') ->with($this->equalTo($key)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); $persister->delete($entity); @@ -192,7 +192,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); $property->setAccessible(true); @@ -206,7 +206,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->method('delete') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->delete($entity); $this->assertCount(0, $property->getValue($persister)); @@ -216,7 +216,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, array('id'=>1)); + $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); $property->setAccessible(true); @@ -230,7 +230,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest ->method('update') ->with($this->equalTo($entity)); - $this->em->getUnitOfWork()->registerManaged($entity, array('id'=>1), array('id'=>1, 'name'=>'Foo')); + $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); $persister->update($entity); $this->assertCount(0, $property->getValue($persister)); diff --git a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php index 16c91729b..0d5a72237 100644 --- a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php @@ -29,7 +29,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase public function testEntityCache() { $name = 'my_entity_region'; - $key = new EntityCacheKey(State::CLASSNAME, array('id' => 1)); + $key = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); $this->logger->entityCacheHit($name, $key); $this->logger->entityCachePut($name, $key); @@ -46,7 +46,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase public function testCollectionCache() { $name = 'my_collection_region'; - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1)); + $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); $this->logger->collectionCacheHit($name, $key); $this->logger->collectionCachePut($name, $key); @@ -83,8 +83,8 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase $entityRegion = 'my_entity_region'; $queryRegion = 'my_query_region'; - $coolKey = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id' => 1)); - $entityKey = new EntityCacheKey(State::CLASSNAME, array('id' => 1)); + $coolKey = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); + $entityKey = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); $queryKey = new QueryCacheKey('my_query_hash'); $this->logger->queryCacheHit($queryRegion, $queryKey); @@ -131,4 +131,4 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase $this->assertArrayHasKey($queryRegion, $hit); $this->assertArrayHasKey($entityRegion, $hit); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php index 770ec7deb..dba00d524 100644 --- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php +++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php @@ -44,7 +44,7 @@ class CommitOrderCalculatorTest extends OrmTestCase $sorted = $this->_calc->sort(); // There is only 1 valid ordering for this constellation - $correctOrder = array($class5, $class1, $class2, $class3, $class4); + $correctOrder = [$class5, $class1, $class2, $class3, $class4]; $this->assertSame($correctOrder, $sorted); } @@ -63,7 +63,7 @@ class CommitOrderCalculatorTest extends OrmTestCase $sorted = $this->_calc->sort(); // There is only 1 valid ordering for this constellation - $correctOrder = array($class2, $class1); + $correctOrder = [$class2, $class1]; $this->assertSame($correctOrder, $sorted); } diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index 7d55652df..4988ac9b2 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -75,7 +75,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase public function testNewDefaultAnnotationDriver() { - $paths = array(__DIR__); + $paths = [__DIR__]; $reflectionClass = new ReflectionClass(__NAMESPACE__ . '\ConfigurationTestAnnotationReaderChecker'); $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths, false); @@ -99,7 +99,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase { $this->configuration->addEntityNamespace('TestNamespace', __NAMESPACE__); $this->assertSame(__NAMESPACE__, $this->configuration->getEntityNamespace('TestNamespace')); - $namespaces = array('OtherNamespace' => __NAMESPACE__); + $namespaces = ['OtherNamespace' => __NAMESPACE__]; $this->configuration->setEntityNamespaces($namespaces); $this->assertSame($namespaces, $this->configuration->getEntityNamespaces()); $this->expectException(\Doctrine\ORM\ORMException::class); @@ -259,7 +259,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->configuration->addCustomStringFunction('FunctionName', __CLASS__); $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('FunctionName')); $this->assertSame(null, $this->configuration->getCustomStringFunction('NonExistingFunction')); - $this->configuration->setCustomStringFunctions(array('OtherFunctionName' => __CLASS__)); + $this->configuration->setCustomStringFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('OtherFunctionName')); $this->expectException(\Doctrine\ORM\ORMException::class); $this->configuration->addCustomStringFunction('concat', __CLASS__); @@ -270,7 +270,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->configuration->addCustomNumericFunction('FunctionName', __CLASS__); $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('FunctionName')); $this->assertSame(null, $this->configuration->getCustomNumericFunction('NonExistingFunction')); - $this->configuration->setCustomNumericFunctions(array('OtherFunctionName' => __CLASS__)); + $this->configuration->setCustomNumericFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('OtherFunctionName')); $this->expectException(\Doctrine\ORM\ORMException::class); $this->configuration->addCustomNumericFunction('abs', __CLASS__); @@ -281,7 +281,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->configuration->addCustomDatetimeFunction('FunctionName', __CLASS__); $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('FunctionName')); $this->assertSame(null, $this->configuration->getCustomDatetimeFunction('NonExistingFunction')); - $this->configuration->setCustomDatetimeFunctions(array('OtherFunctionName' => __CLASS__)); + $this->configuration->setCustomDatetimeFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('OtherFunctionName')); $this->expectException(\Doctrine\ORM\ORMException::class); $this->configuration->addCustomDatetimeFunction('date_add', __CLASS__); @@ -300,9 +300,9 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->assertSame(__CLASS__, $this->configuration->getCustomHydrationMode('HydrationModeName')); $this->configuration->setCustomHydrationModes( - array( + [ 'AnotherHydrationModeName' => __CLASS__ - ) + ] ); $this->assertNull($this->configuration->getCustomHydrationMode('HydrationModeName')); diff --git a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php index c52ce550c..933580af0 100644 --- a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php +++ b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php @@ -14,7 +14,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase { $this->wrapped = $this->createMock(EntityManagerInterface::class); $this->decorator = $this->getMockBuilder('Doctrine\ORM\Decorator\EntityManagerDecorator') - ->setConstructorArgs(array($this->wrapped)) + ->setConstructorArgs([$this->wrapped]) ->setMethods(null) ->getMock(); } @@ -23,7 +23,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase { $class = new \ReflectionClass('Doctrine\ORM\EntityManager'); - $methods = array(); + $methods = []; foreach ($class->getMethods() as $method) { if ($method->isConstructor() || $method->isStatic() || !$method->isPublic()) { continue; @@ -31,17 +31,17 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase /** Special case EntityManager::createNativeQuery() */ if ($method->getName() === 'createNativeQuery') { - $methods[] = array($method->getName(), array('name', new ResultSetMapping())); + $methods[] = [$method->getName(), ['name', new ResultSetMapping()]]; continue; } if ($method->getNumberOfRequiredParameters() === 0) { - $methods[] = array($method->getName(), array()); + $methods[] = [$method->getName(), []]; } elseif ($method->getNumberOfRequiredParameters() > 0) { - $methods[] = array($method->getName(), array_fill(0, $method->getNumberOfRequiredParameters(), 'req') ?: array()); + $methods[] = [$method->getName(), array_fill(0, $method->getNumberOfRequiredParameters(), 'req') ?: []]; } if ($method->getNumberOfParameters() != $method->getNumberOfRequiredParameters()) { - $methods[] = array($method->getName(), array_fill(0, $method->getNumberOfParameters(), 'all') ?: array()); + $methods[] = [$method->getName(), array_fill(0, $method->getNumberOfParameters(), 'all') ?: []]; } } @@ -58,8 +58,8 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase ->method($method) ->will($this->returnValue('INNER VALUE FROM ' . $method)); - call_user_func_array(array($stub, 'with'), $parameters); + call_user_func_array([$stub, 'with'], $parameters); - $this->assertSame('INNER VALUE FROM ' . $method, call_user_func_array(array($this->decorator, $method), $parameters)); + $this->assertSame('INNER VALUE FROM ' . $method, call_user_func_array([$this->decorator, $method], $parameters)); } } diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index 954a3f2f0..43471b643 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -139,13 +139,13 @@ class EntityManagerTest extends OrmTestCase static public function dataMethodsAffectedByNoObjectArguments() { - return array( - array('persist'), - array('remove'), - array('merge'), - array('refresh'), - array('detach') - ); + return [ + ['persist'], + ['remove'], + ['merge'], + ['refresh'], + ['detach'] + ]; } /** @@ -160,13 +160,13 @@ class EntityManagerTest extends OrmTestCase static public function dataAffectedByErrorIfClosedException() { - return array( - array('flush'), - array('persist'), - array('remove'), - array('merge'), - array('refresh'), - ); + return [ + ['flush'], + ['persist'], + ['remove'], + ['merge'], + ['refresh'], + ]; } /** @@ -196,7 +196,7 @@ class EntityManagerTest extends OrmTestCase public function testTransactionalAcceptsVariousCallables() { - $this->assertSame('callback', $this->_em->transactional(array($this, 'transactionalCallback'))); + $this->assertSame('callback', $this->_em->transactional([$this, 'transactionalCallback'])); } public function testTransactionalThrowsInvalidArgumentExceptionIfNonCallablePassed() diff --git a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php index 7dce1b171..2da4d568f 100644 --- a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php +++ b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php @@ -16,7 +16,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase { $exception = EntityNotFoundException::fromClassNameAndIdentifier( 'foo', - array('foo' => 'bar') + ['foo' => 'bar'] ); $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception); @@ -24,7 +24,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase $exception = EntityNotFoundException::fromClassNameAndIdentifier( 'foo', - array() + [] ); $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception); diff --git a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php index 37f0fcd29..26445c141 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php +++ b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php @@ -31,7 +31,8 @@ class AbstractManyToManyAssociationTestCase extends OrmFunctionalTestCase FROM {$this->_table} WHERE {$this->_firstField} = ? AND {$this->_secondField} = ? - ", array($firstId, $secondId))->fetchAll()); + ", [$firstId, $secondId] + )->fetchAll()); } public function assertCollectionEquals(Collection $first, Collection $second) diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php index 5546b285e..e54a23115 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php @@ -16,13 +16,15 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Phrase'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PhraseType'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Definition'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Lemma'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Type') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index bee055f84..af62cb6d5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -127,7 +127,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase // Check that the foreign key has been set $userId = $this->_em->getConnection()->executeQuery( - "SELECT user_id FROM cms_addresses WHERE id=?", array($address->id) + "SELECT user_id FROM cms_addresses WHERE id=?", [$address->id] )->fetchColumn(); $this->assertTrue(is_numeric($userId)); @@ -1075,11 +1075,11 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->persist($userB); $this->_em->persist($userC); - $this->_em->flush(array($userA, $userB, $userB)); + $this->_em->flush([$userA, $userB, $userB]); $userC->name = 'changed name'; - $this->_em->flush(array($userA, $userB)); + $this->_em->flush([$userA, $userB]); $this->_em->refresh($userC); $this->assertTrue($userA->id > 0, 'user a has an id'); diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index a2392a3e8..c552139af 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -14,20 +14,24 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'), $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'), - )); + ] + ); } protected function tearDown() { parent::tearDown(); - $this->_schemaTool->dropSchema(array( + $this->_schemaTool->dropSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'), $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'), - )); + ] + ); } public function testSingle() @@ -153,4 +157,4 @@ class CascadeRemoveOrderEntityG { return $this->id; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 697f568ff..9d594e8c9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -72,7 +72,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(array('name' => 'Guilherme Blanco')); + $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(['name' => 'Guilherme Blanco']); $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $guilherme); $this->assertEquals('Guilherme Blanco', $guilherme->getName()); @@ -389,12 +389,12 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager'); - $pmanager = $repos->findOneBy(array('spouse' => $person->getId())); + $pmanager = $repos->findOneBy(['spouse' => $person->getId()]); $this->assertEquals($manager->getId(), $pmanager->getId()); $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson'); - $pmanager = $repos->findOneBy(array('spouse' => $person->getId())); + $pmanager = $repos->findOneBy(['spouse' => $person->getId()]); $this->assertEquals($manager->getId(), $pmanager->getId()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php index 5682bffe1..b7988054d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php @@ -15,12 +15,14 @@ class ClassTableInheritanceTest2 extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIParent'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIChild'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated2') - )); + ] + ); } catch (\Exception $ignored) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php index 1df74636c..a461fea19 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php @@ -30,7 +30,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase public function putTripAroundEurope() { - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $tour = new NavTour("Trip around Europe"); $tour->addPointOfInterest($poi); @@ -46,7 +46,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $this->assertInstanceOf('Doctrine\Tests\Models\Navigation\NavPointOfInterest', $poi); $this->assertEquals(100, $poi->getLat()); @@ -61,7 +61,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $photo = new NavPhotos($poi, "asdf"); $this->_em->persist($photo); $this->_em->flush(); @@ -79,7 +79,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $photo = new NavPhotos($poi, "asdf"); $this->_em->persist($photo); $this->_em->flush(); @@ -140,7 +140,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('The identifier long is missing for a query of Doctrine\Tests\Models\Navigation\NavPointOfInterest'); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('key1' => 100)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['key1' => 100]); } public function testUnrecognizedIdentifierFieldsOnGetReference() @@ -148,7 +148,8 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage("Unrecognized identifier fields: 'key1'"); - $poi = $this->_em->getReference('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 10, 'long' => 20, 'key1' => 100)); + $poi = $this->_em->getReference('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 10, 'long' => 20, 'key1' => 100] + ); } /** @@ -158,7 +159,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $poi->addVisitor(new NavUser("test1")); $poi->addVisitor(new NavUser("test2")); @@ -169,7 +170,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); + $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); $this->assertEquals(0, count($poi->getVisitors())); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php index b735925e6..3b5427f05 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php @@ -44,13 +44,13 @@ class CompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase $admin1Repo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1'); $admin1NamesRepo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1AlternateName'); - $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1)); + $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]); - $names = $admin1NamesRepo->findBy(array('admin1' => $admin1Rome)); + $names = $admin1NamesRepo->findBy(['admin1' => $admin1Rome]); $this->assertCount(2, $names); - $name1 = $admin1NamesRepo->findOneBy(array('admin1' => $admin1Rome, 'id' => 1)); - $name2 = $admin1NamesRepo->findOneBy(array('admin1' => $admin1Rome, 'id' => 2)); + $name1 = $admin1NamesRepo->findOneBy(['admin1' => $admin1Rome, 'id' => 1]); + $name2 = $admin1NamesRepo->findOneBy(['admin1' => $admin1Rome, 'id' => 2]); $this->assertEquals(1, $name1->id); $this->assertEquals("Roma", $name1->name); diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php index 37149abfd..5d08039e5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php @@ -33,15 +33,15 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $user = new Table("ddc2059_user"); $user->addColumn('id', 'integer'); - $user->setPrimaryKey(array('id')); + $user->setPrimaryKey(['id']); $project = new Table("ddc2059_project"); $project->addColumn('id', 'integer'); $project->addColumn('user_id', 'integer'); $project->addColumn('user', 'string'); - $project->setPrimaryKey(array('id')); - $project->addForeignKeyConstraint('ddc2059_user', array('user_id'), array('id')); + $project->setPrimaryKey(['id']); + $project->addForeignKeyConstraint('ddc2059_user', ['user_id'], ['id']); - $metadata = $this->convertToClassMetadata(array($project, $user), array()); + $metadata = $this->convertToClassMetadata([$project, $user], []); $this->assertTrue(isset($metadata['Ddc2059Project']->fieldMappings['user'])); $this->assertTrue(isset($metadata['Ddc2059Project']->associationMappings['user2'])); @@ -55,12 +55,12 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $table = new Table("dbdriver_foo"); $table->addColumn('id', 'integer'); - $table->setPrimaryKey(array('id')); - $table->addColumn('bar', 'string', array('notnull' => false, 'length' => 200)); + $table->setPrimaryKey(['id']); + $table->addColumn('bar', 'string', ['notnull' => false, 'length' => 200]); $this->_sm->dropAndCreateTable($table); - $metadatas = $this->extractClassMetadata(array("DbdriverFoo")); + $metadatas = $this->extractClassMetadata(["DbdriverFoo"]); $this->assertArrayHasKey('DbdriverFoo', $metadatas); $metadata = $metadatas['DbdriverFoo']; @@ -86,19 +86,19 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $tableB = new Table("dbdriver_bar"); $tableB->addColumn('id', 'integer'); - $tableB->setPrimaryKey(array('id')); + $tableB->setPrimaryKey(['id']); $this->_sm->dropAndCreateTable($tableB); $tableA = new Table("dbdriver_baz"); $tableA->addColumn('id', 'integer'); - $tableA->setPrimaryKey(array('id')); + $tableA->setPrimaryKey(['id']); $tableA->addColumn('bar_id', 'integer'); - $tableA->addForeignKeyConstraint('dbdriver_bar', array('bar_id'), array('id')); + $tableA->addForeignKeyConstraint('dbdriver_bar', ['bar_id'], ['id']); $this->_sm->dropAndCreateTable($tableA); - $metadatas = $this->extractClassMetadata(array("DbdriverBar", "DbdriverBaz")); + $metadatas = $this->extractClassMetadata(["DbdriverBar", "DbdriverBaz"]); $this->assertArrayHasKey('DbdriverBaz', $metadatas); $bazMetadata = $metadatas['DbdriverBaz']; @@ -118,7 +118,7 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $this->markTestSkipped('Platform does not support foreign keys.'); } - $metadatas = $this->extractClassMetadata(array("CmsUsers", "CmsGroups", "CmsTags")); + $metadatas = $this->extractClassMetadata(["CmsUsers", "CmsGroups", "CmsTags"]); $this->assertArrayHasKey('CmsUsers', $metadatas, 'CmsUsers entity was not detected.'); $this->assertArrayHasKey('CmsGroups', $metadatas, 'CmsGroups entity was not detected.'); @@ -136,18 +136,18 @@ class DatabaseDriverTest extends DatabaseDriverTestCase { $tableB = new Table("dbdriver_bar"); $tableB->addColumn('id', 'integer'); - $tableB->setPrimaryKey(array('id')); + $tableB->setPrimaryKey(['id']); $tableA = new Table("dbdriver_baz"); $tableA->addColumn('id', 'integer'); - $tableA->setPrimaryKey(array('id')); + $tableA->setPrimaryKey(['id']); $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')); + $tableMany->addForeignKeyConstraint('dbdriver_bar', ['bar_id'], ['id']); - $metadatas = $this->convertToClassMetadata(array($tableA, $tableB), array($tableMany)); + $metadatas = $this->convertToClassMetadata([$tableA, $tableB], [$tableMany]); $this->assertEquals(0, count($metadatas['DbdriverBaz']->associationMappings), "no association mappings should be detected."); } @@ -160,24 +160,24 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $table = new Table("dbdriver_foo"); - $table->addColumn('id', 'integer', array('unsigned' => true)); - $table->setPrimaryKey(array('id')); - $table->addColumn('column_unsigned', 'integer', array('unsigned' => true)); - $table->addColumn('column_comment', 'string', array('comment' => 'test_comment')); - $table->addColumn('column_default', 'string', array('default' => 'test_default')); - $table->addColumn('column_decimal', 'decimal', array('precision' => 4, 'scale' => 3)); + $table->addColumn('id', 'integer', ['unsigned' => true]); + $table->setPrimaryKey(['id']); + $table->addColumn('column_unsigned', 'integer', ['unsigned' => true]); + $table->addColumn('column_comment', 'string', ['comment' => 'test_comment']); + $table->addColumn('column_default', 'string', ['default' => 'test_default']); + $table->addColumn('column_decimal', 'decimal', ['precision' => 4, 'scale' => 3]); $table->addColumn('column_index1', 'string'); $table->addColumn('column_index2', 'string'); - $table->addIndex(array('column_index1','column_index2'), 'index1'); + $table->addIndex(['column_index1','column_index2'], 'index1'); $table->addColumn('column_unique_index1', 'string'); $table->addColumn('column_unique_index2', 'string'); - $table->addUniqueIndex(array('column_unique_index1', 'column_unique_index2'), 'unique_index1'); + $table->addUniqueIndex(['column_unique_index1', 'column_unique_index2'], 'unique_index1'); $this->_sm->dropAndCreateTable($table); - $metadatas = $this->extractClassMetadata(array("DbdriverFoo")); + $metadatas = $this->extractClassMetadata(["DbdriverFoo"]); $this->assertArrayHasKey('DbdriverFoo', $metadatas); @@ -208,13 +208,13 @@ class DatabaseDriverTest extends DatabaseDriverTestCase $this->assertTrue( ! empty($metadata->table['indexes']['index1']['columns'])); $this->assertEquals( - array('column_index1','column_index2'), + ['column_index1','column_index2'], $metadata->table['indexes']['index1']['columns'] ); $this->assertTrue( ! empty($metadata->table['uniqueConstraints']['unique_index1']['columns'])); $this->assertEquals( - array('column_unique_index1', 'column_unique_index2'), + ['column_unique_index1', 'column_unique_index2'], $metadata->table['uniqueConstraints']['unique_index1']['columns'] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php index 03902c40c..89d3cd358 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php +++ b/tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php @@ -11,13 +11,13 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; */ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase { - protected function convertToClassMetadata(array $entityTables, array $manyTables = array()) + protected function convertToClassMetadata(array $entityTables, array $manyTables = []) { $sm = $this->_em->getConnection()->getSchemaManager(); $driver = new DatabaseDriver($sm); $driver->setTables($entityTables, $manyTables); - $metadatas = array(); + $metadatas = []; foreach ($driver->getAllClassNames() AS $className) { $class = new ClassMetadataInfo($className); $driver->loadMetadataForClass($className, $class); @@ -34,7 +34,7 @@ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase protected function extractClassMetadata(array $classNames) { $classNames = array_map('strtolower', $classNames); - $metadatas = array(); + $metadatas = []; $sm = $this->_em->getConnection()->getSchemaManager(); $driver = new DatabaseDriver($sm); diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php index e81bd7f8a..75c0a20e6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php @@ -14,10 +14,12 @@ class DefaultValuesTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueUser'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueAddress') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php index 89901be19..64bc31770 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php @@ -31,7 +31,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $fix = new CompanyFixContract(); $fix->setFixPrice(2000); - $this->listener->preFlushCalls = array(); + $this->listener->preFlushCalls = []; $this->_em->persist($fix); $this->_em->flush(); @@ -55,12 +55,12 @@ class EntityListenersTest extends OrmFunctionalTestCase { $fix = new CompanyFixContract(); $fix->setFixPrice(2000); - + $this->_em->persist($fix); $this->_em->flush(); $this->_em->clear(); - $this->listener->postLoadCalls = array(); + $this->listener->postLoadCalls = []; $dql = "SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1"; $fix = $this->_em->createQuery($dql)->setParameter(1, $fix->getId())->getSingleResult(); @@ -85,7 +85,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $fix = new CompanyFixContract(); $fix->setFixPrice(2000); - $this->listener->prePersistCalls = array(); + $this->listener->prePersistCalls = []; $this->_em->persist($fix); $this->_em->flush(); @@ -110,7 +110,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $fix = new CompanyFixContract(); $fix->setFixPrice(2000); - $this->listener->postPersistCalls = array(); + $this->listener->postPersistCalls = []; $this->_em->persist($fix); $this->_em->flush(); @@ -138,8 +138,8 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->persist($fix); $this->_em->flush(); - $this->listener->preUpdateCalls = array(); - + $this->listener->preUpdateCalls = []; + $fix->setFixPrice(2000); $this->_em->persist($fix); @@ -168,7 +168,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->persist($fix); $this->_em->flush(); - $this->listener->postUpdateCalls = array(); + $this->listener->postUpdateCalls = []; $fix->setFixPrice(2000); @@ -198,7 +198,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->persist($fix); $this->_em->flush(); - $this->listener->preRemoveCalls = array(); + $this->listener->preRemoveCalls = []; $this->_em->remove($fix); $this->_em->flush(); @@ -226,7 +226,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->persist($fix); $this->_em->flush(); - $this->listener->postRemoveCalls = array(); + $this->listener->postRemoveCalls = []; $this->_em->remove($fix); $this->_em->flush(); @@ -245,4 +245,4 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->listener->postRemoveCalls[0][1] ); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php index 76e269a20..694ad66da 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php @@ -23,7 +23,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase public function tearDown() { if ($this->_em) { - $this->_em->getConfiguration()->setEntityNamespaces(array()); + $this->_em->getConfiguration()->setEntityNamespaces([]); } parent::tearDown(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index e0b96387a..2aa25b8c7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -28,7 +28,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function tearDown() { if ($this->_em) { - $this->_em->getConfiguration()->setEntityNamespaces(array()); + $this->_em->getConfiguration()->setEntityNamespaces([]); } parent::tearDown(); } @@ -92,7 +92,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - return array($user->id, $address->id); + return [$user->id, $address->id]; } public function loadFixtureUserEmail() @@ -136,7 +136,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - return array($user1, $user2, $user3); + return [$user1, $user2, $user3]; } public function buildUser($name, $username, $status, $address) @@ -183,7 +183,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $user1Id = $this->loadFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $users = $repos->findBy(array('status' => 'dev')); + $users = $repos->findBy(['status' => 'dev']); $this->assertEquals(2, count($users)); $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]); $this->assertEquals('Guilherme', $users[0]->name); @@ -208,7 +208,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->clear(); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); - $addresses = $repository->findBy(array('user' => array($user1->getId(), $user2->getId()))); + $addresses = $repository->findBy(['user' => [$user1->getId(), $user2->getId()]]); $this->assertEquals(2, count($addresses)); $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]); @@ -232,7 +232,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->clear(); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); - $addresses = $repository->findBy(array('user' => array($user1, $user2))); + $addresses = $repository->findBy(['user' => [$user1, $user2]]); $this->assertEquals(2, count($addresses)); $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]); @@ -277,13 +277,13 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixture(); $repos = $this->_em->getRepository(CmsUser::class); - $userCount = $repos->count(array()); + $userCount = $repos->count([]); $this->assertSame(4, $userCount); - $userCount = $repos->count(array('status' => 'dev')); + $userCount = $repos->count(['status' => 'dev']); $this->assertSame(2, $userCount); - $userCount = $repos->count(array('status' => 'nonexistent')); + $userCount = $repos->count(['status' => 'nonexistent']); $this->assertSame(0, $userCount); } @@ -405,7 +405,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage("You cannot search for the association field 'Doctrine\Tests\Models\CMS\CmsUser#address', because it is the inverse side of an association. Find methods only work on owning side associations."); - $user = $repos->findBy(array('address' => $addressId)); + $user = $repos->findBy(['address' => $addressId]); } /** @@ -415,7 +415,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { list($userId, $addressId) = $this->loadAssociatedFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); - $address = $repos->findOneBy(array('user' => $userId)); + $address = $repos->findOneBy(['user' => $userId]); $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address); $this->assertEquals($addressId, $address->id); @@ -429,8 +429,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $userAsc = $repos->findOneBy(array(), array("username" => "ASC")); - $userDesc = $repos->findOneBy(array(), array("username" => "DESC")); + $userAsc = $repos->findOneBy([], ["username" => "ASC"]); + $userDesc = $repos->findOneBy([], ["username" => "DESC"]); $this->assertNotSame($userAsc, $userDesc); } @@ -442,7 +442,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { list($userId, $addressId) = $this->loadAssociatedFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); - $addresses = $repos->findBy(array('user' => $userId)); + $addresses = $repos->findBy(['user' => $userId]); $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsAddress', $addresses); $this->assertEquals(1, count($addresses)); @@ -501,11 +501,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testIsNullCriteriaDoesNotGenerateAParameter() { $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $users = $repos->findBy(array('status' => null, 'username' => 'romanb')); + $users = $repos->findBy(['status' => null, 'username' => 'romanb']); $params = $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params']; $this->assertEquals(1, count($params), "Should only execute with one parameter."); - $this->assertEquals(array('romanb'), $params); + $this->assertEquals(['romanb'], $params); } public function testIsNullCriteria() @@ -514,7 +514,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $users = $repos->findBy(array('status' => null)); + $users = $repos->findBy(['status' => null]); $this->assertEquals(1, count($users)); } @@ -527,10 +527,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $users1 = $repos->findBy(array(), null, 1, 0); - $users2 = $repos->findBy(array(), null, 1, 1); + $users1 = $repos->findBy([], null, 1, 0); + $users2 = $repos->findBy([], null, 1, 1); - $this->assertEquals(4, count($repos->findBy(array()))); + $this->assertEquals(4, count($repos->findBy([]))); $this->assertEquals(1, count($users1)); $this->assertEquals(1, count($users2)); $this->assertNotSame($users1[0], $users2[0]); @@ -544,8 +544,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $usersAsc = $repos->findBy(array(), array("username" => "ASC")); - $usersDesc = $repos->findBy(array(), array("username" => "DESC")); + $usersAsc = $repos->findBy([], ["username" => "ASC"]); + $usersDesc = $repos->findBy([], ["username" => "DESC"]); $this->assertEquals(4, count($usersAsc), "Pre-condition: only four users in fixture"); $this->assertEquals(4, count($usersDesc), "Pre-condition: only four users in fixture"); @@ -561,8 +561,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixtureUserEmail(); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $resultAsc = $repository->findBy(array(), array('email' => 'ASC')); - $resultDesc = $repository->findBy(array(), array('email' => 'DESC')); + $resultAsc = $repository->findBy([], ['email' => 'ASC']); + $resultDesc = $repository->findBy([], ['email' => 'DESC']); $this->assertCount(3, $resultAsc); $this->assertCount(3, $resultDesc); @@ -579,8 +579,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $usersAsc = $repos->findByStatus('dev', array('username' => "ASC")); - $usersDesc = $repos->findByStatus('dev', array('username' => "DESC")); + $usersAsc = $repos->findByStatus('dev', ['username' => "ASC"]); + $usersDesc = $repos->findByStatus('dev', ['username' => "DESC"]); $this->assertEquals(2, count($usersAsc)); $this->assertEquals(2, count($usersDesc)); @@ -601,8 +601,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->loadFixture(); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $users1 = $repos->findByStatus('dev', array(), 1, 0); - $users2 = $repos->findByStatus('dev', array(), 1, 1); + $users1 = $repos->findByStatus('dev', [], 1, 0); + $users2 = $repos->findByStatus('dev', [], 1, 1); $this->assertEquals(1, count($users1)); $this->assertEquals(1, count($users2)); @@ -680,7 +680,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testInvalidOrderByAssociation() { $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->findBy(array('status' => 'test'), array('address' => 'ASC')); + ->findBy(['status' => 'test'], ['address' => 'ASC']); } /** @@ -692,7 +692,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectExceptionMessage('Invalid order by orientation specified for Doctrine\Tests\Models\CMS\CmsUser#username'); $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $repo->findBy(array('status' => 'test'), array('username' => 'INVALID')); + $repo->findBy(['status' => 'test'], ['username' => 'INVALID']); } /** @@ -701,10 +701,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindByAssociationArray() { $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle'); - $data = $repo->findBy(array('user' => array(1, 2, 3))); + $data = $repo->findBy(['user' => [1, 2, 3]]); $query = array_pop($this->_sqlLoggerStack->queries); - $this->assertEquals(array(1,2,3), $query['params'][0]); + $this->assertEquals([1,2,3], $query['params'][0]); $this->assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]); } @@ -760,7 +760,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $users = $repository->matching(new Criteria( - Criteria::expr()->in('username', array('beberlei', 'gblanco')) + Criteria::expr()->in('username', ['beberlei', 'gblanco']) )); $this->assertEquals(2, count($users)); @@ -775,7 +775,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $users = $repository->matching(new Criteria( - Criteria::expr()->notIn('username', array('beberlei', 'gblanco', 'asm89')) + Criteria::expr()->notIn('username', ['beberlei', 'gblanco', 'asm89']) )); $this->assertEquals(1, count($users)); @@ -874,7 +874,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); $criteria = new Criteria( - Criteria::expr()->in('user', array($user)) + Criteria::expr()->in('user', [$user]) ); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); @@ -941,7 +941,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $rsm = $repository->createResultSetMappingBuilder('u'); $this->assertInstanceOf('Doctrine\ORM\Query\ResultSetMappingBuilder', $rsm); - $this->assertEquals(array('u' => 'Doctrine\Tests\Models\CMS\CmsUser'), $rsm->aliasMap); + $this->assertEquals(['u' => 'Doctrine\Tests\Models\CMS\CmsUser'], $rsm->aliasMap); } /** @@ -953,7 +953,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectExceptionMessage('Unrecognized field: '); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $repository->findBy(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test')); + $repository->findBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']); } /** @@ -965,7 +965,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectExceptionMessage('Unrecognized field: '); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $repository->findOneBy(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test')); + $repository->findOneBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']); } /** @@ -994,7 +994,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectExceptionMessage('Unrecognized identifier fields: '); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); - $repository->find(array('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test', 'id' => 1)); + $repository->find(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test', 'id' => 1]); } /** @@ -1016,7 +1016,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->persist($user2); $this->_em->flush(); - $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findBy(array('status' => array(null))); + $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findBy(['status' => [null]]); $this->assertCount(1, $users); $this->assertSame($user1, reset($users)); @@ -1044,7 +1044,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $users = $this ->_em ->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->findBy(array('status' => array('foo', null))); + ->findBy(['status' => ['foo', null]]); $this->assertCount(1, $users); $this->assertSame($user1, reset($users)); @@ -1072,12 +1072,12 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $users = $this ->_em ->getRepository('Doctrine\Tests\Models\CMS\CmsUser') - ->findBy(array('status' => array('dbal maintainer', null))); + ->findBy(['status' => ['dbal maintainer', null]]); $this->assertCount(2, $users); foreach ($users as $user) { - $this->assertTrue(in_array($user, array($user1, $user2))); + $this->assertTrue(in_array($user, [$user1, $user2])); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php index c8af5bd85..c0afab021 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php @@ -1229,7 +1229,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - return array($user->id, $tweet->id); + return [$user->id, $tweet->id]; } /** @@ -1250,6 +1250,6 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - return array($user->id, $userList->id); + return [$user->id, $userList->id]; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php index 94a11dab4..15929ae27 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php @@ -82,7 +82,7 @@ class IdentityMapTest extends OrmFunctionalTestCase $this->assertSame($user1, $address->user); //external update to CmsAddress - $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', array($user2->getId())); + $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', [$user2->getId()]); // But we want to have this external change! // Solution 1: refresh(), broken atm! @@ -125,7 +125,7 @@ class IdentityMapTest extends OrmFunctionalTestCase $this->assertSame($user1, $address->user); //external update to CmsAddress - $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', array($user2->getId())); + $this->_em->getConnection()->executeUpdate('update cms_addresses set user_id = ?', [$user2->getId()]); //select $q = $this->_em->createQuery('select a, u from Doctrine\Tests\Models\CMS\CmsAddress a join a.user u'); @@ -181,7 +181,8 @@ class IdentityMapTest extends OrmFunctionalTestCase $this->assertFalse($user->getPhonenumbers()->isDirty()); //external update to CmsAddress - $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', array(999, $user->getId())); + $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', [999, $user->getId()] + ); //select $q = $this->_em->createQuery('select u, p from Doctrine\Tests\Models\CMS\CmsUser u join u.phonenumbers p'); @@ -232,7 +233,8 @@ class IdentityMapTest extends OrmFunctionalTestCase $this->assertEquals(3, count($user->getPhonenumbers())); //external update to CmsAddress - $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', array(999, $user->getId())); + $this->_em->getConnection()->executeUpdate('insert into cms_phonenumbers (phonenumber, user_id) VALUES (?,?)', [999, $user->getId()] + ); //select $q = $this->_em->createQuery('select u, p from Doctrine\Tests\Models\CMS\CmsUser u join u.phonenumbers p'); diff --git a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php index 8f6e0cc59..21f7cabde 100644 --- a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php @@ -58,7 +58,7 @@ class JoinedTableCompositeKeyTest extends OrmFunctionalTestCase { return $this->_em->find( 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass', - array('keyPart1' => 'part-1', 'keyPart2' => 'part-2') + ['keyPart1' => 'part-1', 'keyPart2' => 'part-2'] ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 508645927..3a31f9c52 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -15,12 +15,14 @@ class LifecycleCallbackTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackEventArgEntity'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestUser'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackCascader'), - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } @@ -270,13 +272,13 @@ DQL; public function testLifecycleCallbacksGetInherited() { $childMeta = $this->_em->getClassMetadata(__NAMESPACE__ . '\LifecycleCallbackChildEntity'); - $this->assertEquals(array('prePersist' => array(0 => 'doStuff')), $childMeta->lifecycleCallbacks); + $this->assertEquals(['prePersist' => [0 => 'doStuff']], $childMeta->lifecycleCallbacks); } public function testLifecycleListener_ChangeUpdateChangeSet() { $listener = new LifecycleListenerPreUpdate; - $this->_em->getEventManager()->addEventListener(array('preUpdate'), $listener); + $this->_em->getEventManager()->addEventListener(['preUpdate'], $listener); $user = new LifecycleCallbackTestUser; $user->setName('Bob'); @@ -292,7 +294,7 @@ DQL; $this->_em->flush(); // preUpdate reverts Alice to Bob $this->_em->clear(); - $this->_em->getEventManager()->removeEventListener(array('preUpdate'), $listener); + $this->_em->getEventManager()->removeEventListener(['preUpdate'], $listener); $bob = $this->_em->createQuery($dql)->getSingleResult(); @@ -315,7 +317,7 @@ DQL; $this->_em->flush(); $this->_em->refresh($e); - + $this->_em->remove($e); $this->_em->flush(); @@ -358,7 +360,7 @@ DQL; 'Doctrine\ORM\Event\LifecycleEventArgs', $e->calls['postUpdateHandler'] ); - + $this->assertInstanceOf( 'Doctrine\ORM\Event\LifecycleEventArgs', $e->calls['preRemoveHandler'] @@ -517,7 +519,7 @@ class LifecycleCallbackEventArgEntity /** @Column() */ public $value; - public $calls = array(); + public $calls = []; /** * @PostPersist diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index e69d3ee6a..b1ace3513 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -23,11 +23,11 @@ class GearmanLockTest extends OrmFunctionalTestCase $this->useModelSet('cms'); parent::setUp(); - $this->tasks = array(); + $this->tasks = []; $this->gearman = new \GearmanClient(); $this->gearman->addServer(); - $this->gearman->setCompleteCallback(array($this, "gearmanTaskCompleted")); + $this->gearman->setCompleteCallback([$this, "gearmanTaskCompleted"]); $article = new CmsArticle(); $article->text = "my article"; @@ -78,7 +78,7 @@ class GearmanLockTest extends OrmFunctionalTestCase public function testDqlWithLock() { - $this->asyncDqlWithLock('SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a', array(), LockMode::PESSIMISTIC_WRITE); + $this->asyncDqlWithLock('SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a', [], LockMode::PESSIMISTIC_WRITE); $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); @@ -140,37 +140,42 @@ class GearmanLockTest extends OrmFunctionalTestCase protected function asyncFindWithLock($entityName, $entityId, $lockMode) { - $this->startJob('findWithLock', array( + $this->startJob('findWithLock', [ 'entityName' => $entityName, 'entityId' => $entityId, 'lockMode' => $lockMode, - )); + ] + ); } protected function asyncDqlWithLock($dql, $params, $lockMode) { - $this->startJob('dqlWithLock', array( + $this->startJob('dqlWithLock', [ 'dql' => $dql, 'dqlParams' => $params, 'lockMode' => $lockMode, - )); + ] + ); } protected function asyncLock($entityName, $entityId, $lockMode) { - $this->startJob('lock', array( + $this->startJob('lock', [ 'entityName' => $entityName, 'entityId' => $entityId, 'lockMode' => $lockMode, - )); + ] + ); } protected function startJob($fn, $fixture) { - $this->gearman->addTask($fn, serialize(array( + $this->gearman->addTask($fn, serialize( + [ 'conn' => $this->_em->getConnection()->getParams(), 'fixture' => $fixture - ))); + ] + )); $this->assertEquals(GEARMAN_SUCCESS, $this->gearman->returnCode()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php index 0ca10460f..c3d226aa4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php @@ -17,9 +17,9 @@ class LockAgentWorker $worker = new \GearmanWorker(); $worker->addServer(); - $worker->addFunction("findWithLock", array($lockAgent, "findWithLock")); - $worker->addFunction("dqlWithLock", array($lockAgent, "dqlWithLock")); - $worker->addFunction('lock', array($lockAgent, 'lock')); + $worker->addFunction("findWithLock", [$lockAgent, "findWithLock"]); + $worker->addFunction("dqlWithLock", [$lockAgent, "dqlWithLock"]); + $worker->addFunction('lock', [$lockAgent, 'lock']); while($worker->work()) { if ($worker->returnCode() != GEARMAN_SUCCESS) { @@ -98,7 +98,7 @@ class LockAgentWorker $config->setProxyNamespace('MyProject\Proxies'); $config->setAutoGenerateProxyClasses(true); - $annotDriver = $config->newDefaultAnnotationDriver(array(__DIR__ . '/../../../Models/'), true); + $annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/'], true); $config->setMetadataDriverImpl($annotDriver); $cache = new ArrayCache(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index 8ac9bfefc..e92b9476b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php @@ -19,7 +19,7 @@ class LockTest extends OrmFunctionalTestCase { $this->useModelSet('cms'); parent::setUp(); - $this->handles = array(); + $this->handles = []; } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index e4cad5171..ff1502daa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -14,12 +14,14 @@ class OptimisticTest extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedParent'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedChild'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticStandard'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticTimestamp') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } @@ -55,7 +57,7 @@ class OptimisticTest extends OrmFunctionalTestCase // Manually update/increment the version so we can try and save the same // $test and make sure the exception is thrown saying the record was // changed or updated since you read it - $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', array(2, $test->id)); + $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', [2, $test->id]); // Now lets change a property and try and save it again $test->whatever = 'ok'; @@ -95,7 +97,7 @@ class OptimisticTest extends OrmFunctionalTestCase // Manually update/increment the version so we can try and save the same // $test and make sure the exception is thrown saying the record was // changed or updated since you read it - $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', array(2, $test->id)); + $this->_conn->executeQuery('UPDATE optimistic_joined_parent SET version = ? WHERE id = ?', [2, $test->id]); // Now lets change a property and try and save it again $test->name = 'WHATT???'; @@ -151,7 +153,7 @@ class OptimisticTest extends OrmFunctionalTestCase // Manually update/increment the version so we can try and save the same // $test and make sure the exception is thrown saying the record was // changed or updated since you read it - $this->_conn->executeQuery('UPDATE optimistic_standard SET version = ? WHERE id = ?', array(2, $test->id)); + $this->_conn->executeQuery('UPDATE optimistic_standard SET version = ? WHERE id = ?', [2, $test->id]); // Now lets change a property and try and save it again $test->name = 'WHATT???'; @@ -210,7 +212,8 @@ class OptimisticTest extends OrmFunctionalTestCase // Manually increment the version datetime column $format = $this->_em->getConnection()->getDatabasePlatform()->getDateTimeFormatString(); - $this->_conn->executeQuery('UPDATE optimistic_timestamp SET version = ? WHERE id = ?', array(date($format, strtotime($test->version->format($format)) + 3600), $test->id)); + $this->_conn->executeQuery('UPDATE optimistic_timestamp SET version = ? WHERE id = ?', [date($format, strtotime($test->version->format($format)) + 3600), $test->id] + ); // Try and update the record and it should throw an exception $caughtException = null; diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index 2d051b688..b6d5957a2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -330,7 +330,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $user = $this->_em->find(get_class($user), $user->id); - $coll = new ArrayCollection(array($group1, $group2)); + $coll = new ArrayCollection([$group1, $group2]); $user->groups = $coll; $this->_em->flush(); $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->groups, diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php index 9b3b338a0..48263f3c4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php @@ -15,10 +15,12 @@ class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(Country::CLASSNAME), $this->_em->getClassMetadata(CompositeToOneKeyState::CLASSNAME), - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php index 42bf4187e..e32b0385c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php @@ -239,7 +239,7 @@ class MergeProxiesTest extends OrmFunctionalTestCase $config->setProxyDir(realpath(__DIR__ . '/../../Proxies')); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver( - array(realpath(__DIR__ . '/../../Models/Cache')), + [realpath(__DIR__ . '/../../Models/Cache')], true )); $config->setSQLLogger($logger); @@ -248,10 +248,10 @@ class MergeProxiesTest extends OrmFunctionalTestCase // multi-connection is not relevant for the purpose of checking locking here, but merely // to stub out DB-level access and intercept it $connection = DriverManager::getConnection( - array( + [ 'driver' => 'pdo_sqlite', 'memory' => true - ), + ], $config ); diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php index ffe64fcff..e77b39694 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php @@ -15,10 +15,12 @@ class MergeSharedEntitiesTest extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEFile'), $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEPicture'), - )); + ] + ); } catch (ToolsException $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 320aa357a..9d9eb233d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -281,7 +281,8 @@ class NativeQueryTest extends OrmFunctionalTestCase $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address', array('id' => 'a_id')); + $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address', ['id' => 'a_id'] + ); $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm); $query->setParameter(1, 'romanb'); @@ -349,7 +350,8 @@ class NativeQueryTest extends OrmFunctionalTestCase { $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'un', 'address', array('id' => 'a_id')); + $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'un', 'address', ['id' => 'a_id'] + ); $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm); $query->setParameter(1, 'romanb'); @@ -558,7 +560,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $result = $repository->createNativeNamedQuery('fetchUserPhonenumberCount') - ->setParameter(1, array('test','FabioBatSilva'))->getResult(); + ->setParameter(1, ['test','FabioBatSilva'])->getResult(); $this->assertEquals(2, count($result)); $this->assertTrue(is_array($result[0])); @@ -746,10 +748,11 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseCustomRenames() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u', array( + $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u', [ 'id' => 'id1', 'username' => 'username2' - )); + ] + ); $selectClause = $rsm->generateSelectClause(); @@ -764,7 +767,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $selectClause = $rsm->generateSelectClause(array('u' => 'u1')); + $selectClause = $rsm->generateSelectClause(['u' => 'u1']); $this->assertSQLEquals('u1.id AS id, u1.status AS status, u1.username AS username, u1.name AS name, u1.email_id AS email_id', $selectClause); } @@ -804,7 +807,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->setDiscriminatorColumn('c', $this->platform->getSQLResultCasing('discr')); - $selectClause = $rsm->generateSelectClause(array('u' => 'u1', 'c' => 'c1')); + $selectClause = $rsm->generateSelectClause(['u' => 'u1', 'c' => 'c1']); $this->assertSQLEquals('u1.id as id, c1.discr as discr', $selectClause); } diff --git a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php index 37067aec0..972412199 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php @@ -18,7 +18,7 @@ class NewOperatorTest extends OrmFunctionalTestCase * @var array */ private $fixtures; - + protected function setUp() { $this->useModelSet('cms'); @@ -26,13 +26,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->loadFixtures(); } - + public function provideDataForHydrationMode() { - return array( - array(Query::HYDRATE_ARRAY), - array(Query::HYDRATE_OBJECT), - ); + return [ + [Query::HYDRATE_ARRAY], + [Query::HYDRATE_OBJECT], + ]; } private function loadFixtures() @@ -93,7 +93,7 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->fixtures = array($u1, $u2, $u3); + $this->fixtures = [$u1, $u2, $u3]; } /** @@ -223,7 +223,7 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->_em->getConfiguration() ->addEntityNamespace('cms', 'Doctrine\Tests\Models\CMS'); - + $query = $this->_em->createQuery($dql); $result = $query->getResult(); diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php index ecebc28d9..a289ef9dd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php @@ -18,10 +18,12 @@ class NotifyPolicyTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyUser'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyGroup') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } @@ -91,7 +93,7 @@ class NotifyPolicyTest extends OrmFunctionalTestCase } class NotifyBaseEntity implements NotifyPropertyChanged { - public $listeners = array(); + public $listeners = []; public function addPropertyChangedListener(PropertyChangedListener $listener) { $this->listeners[] = $listener; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index 8327142fd..ddc7378f7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -232,7 +232,7 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase public function assertFeatureForeignKeyIs($value, ECommerceFeature $feature) { $foreignKey = $this->_em->getConnection()->executeQuery( 'SELECT product_id FROM ecommerce_features WHERE id=?', - array($feature->getId()) + [$feature->getId()] )->fetchColumn(); $this->assertEquals($value, $foreignKey); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php index 3d6c688bd..f6b64b5eb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php @@ -116,7 +116,8 @@ class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase } public function assertForeignKeyIs($value, ECommerceCategory $child) { - $foreignKey = $this->_em->getConnection()->executeQuery('SELECT parent_id FROM ecommerce_categories WHERE id=?', array($child->getId()))->fetchColumn(); + $foreignKey = $this->_em->getConnection()->executeQuery('SELECT parent_id FROM ecommerce_categories WHERE id=?', [$child->getId()] + )->fetchColumn(); $this->assertEquals($value, $foreignKey); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php index e2c663118..c13a6fe99 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php @@ -12,14 +12,14 @@ use Doctrine\Tests\OrmFunctionalTestCase; */ class OneToManyUnidirectionalAssociationTest extends OrmFunctionalTestCase { - protected $locations = array(); + protected $locations = []; public function setUp() { $this->useModelSet('routing'); parent::setUp(); - $locations = array("Berlin", "Bonn", "Brasilia", "Atlanta"); + $locations = ["Berlin", "Bonn", "Brasilia", "Atlanta"]; foreach ($locations AS $locationName) { $location = new RoutingLocation(); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php index 6d42e7634..d2880ee81 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php @@ -144,7 +144,8 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase } public function assertCartForeignKeyIs($value) { - $foreignKey = $this->_em->getConnection()->executeQuery('SELECT customer_id FROM ecommerce_carts WHERE id=?', array($this->cart->getId()))->fetchColumn(); + $foreignKey = $this->_em->getConnection()->executeQuery('SELECT customer_id FROM ecommerce_carts WHERE id=?', [$this->cart->getId()] + )->fetchColumn(); $this->assertEquals($value, $foreignKey); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php index 522a009eb..8a9921002 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php @@ -15,13 +15,15 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase parent::setUp(); $schemaTool = new SchemaTool($this->_em); try { - $schemaTool->createSchema(array( + $schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Train'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainDriver'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOwner'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Waggon'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOrder'), - )); + ] + ); } catch(\Exception $e) {} } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index cad28d4c3..bc7897f6a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -86,9 +86,11 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase public function testMultiSelfReference() { try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\MultiSelfReference') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } @@ -118,7 +120,8 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase } public function assertForeignKeyIs($value) { - $foreignKey = $this->_em->getConnection()->executeQuery('SELECT mentor_id FROM ecommerce_customers WHERE id=?', array($this->customer->getId()))->fetchColumn(); + $foreignKey = $this->_em->getConnection()->executeQuery('SELECT mentor_id FROM ecommerce_customers WHERE id=?', [$this->customer->getId()] + )->fetchColumn(); $this->assertEquals($value, $foreignKey); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php index 60b5b3656..2ffbfa443 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php @@ -101,7 +101,7 @@ class OneToOneUnidirectionalAssociationTest extends OrmFunctionalTestCase public function assertForeignKeyIs($value) { $foreignKey = $this->_em->getConnection()->executeQuery( 'SELECT shipping_id FROM ecommerce_products WHERE id=?', - array($this->product->getId()) + [$this->product->getId()] )->fetchColumn(); $this->assertEquals($value, $foreignKey); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php index c4e5dca70..5d5c54e24 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php @@ -10,14 +10,14 @@ use Doctrine\Tests\OrmFunctionalTestCase; class OrderedCollectionTest extends OrmFunctionalTestCase { - protected $locations = array(); + protected $locations = []; public function setUp() { $this->useModelSet('routing'); parent::setUp(); - $locations = array("Berlin", "Bonn", "Brasilia", "Atlanta"); + $locations = ["Berlin", "Bonn", "Brasilia", "Atlanta"]; foreach ($locations AS $locationName) { $location = new RoutingLocation(); diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php index b3d85340e..d71bfb0b4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php @@ -16,11 +16,13 @@ class OrderedJoinedTableInheritanceCollectionTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Pet'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Cat'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Dog'), - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php index 8afe9d332..dcf44ce45 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php @@ -633,14 +633,15 @@ class PaginationTest extends OrmFunctionalTestCase { $dql = 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u'; $query = $this->_em->createQuery($dql); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Functional\CustomPaginationTestTreeWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\CustomPaginationTestTreeWalker'] + ); $paginator = new Paginator($query, true); $paginator->setUseOutputWalkers(false); $this->assertCount(1, $paginator->getIterator()); $this->assertEquals(1, $paginator->count()); } - + public function testCountQueryStripsParametersInSelect() { $query = $this->_em->createQuery( @@ -695,7 +696,7 @@ class PaginationTest extends OrmFunctionalTestCase public function populate() { - $groups = array(); + $groups = []; for ($j = 0; $j < 3; $j++) {; $group = new CmsGroup(); $group->name = "group$j"; @@ -762,28 +763,28 @@ class PaginationTest extends OrmFunctionalTestCase public function useOutputWalkers() { - return array( - array(true), - array(false), - ); + return [ + [true], + [false], + ]; } public function fetchJoinCollection() { - return array( - array(true), - array(false), - ); + return [ + [true], + [false], + ]; } public function useOutputWalkersAndFetchJoinCollection() { - return array( - array(true, false), - array(true, true), - array(false, false), - array(false, true), - ); + return [ + [true, false], + [true, true], + [false, false], + [false, true], + ]; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php index a730546d6..99a04d52b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php @@ -24,7 +24,7 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase public function tearDown() { if ($this->_em) { - $this->_em->getConfiguration()->setEntityNamespaces(array()); + $this->_em->getConfiguration()->setEntityNamespaces([]); } parent::tearDown(); } @@ -75,7 +75,7 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase $repository = $this->_em->getRepository('Doctrine\Tests\Models\Tweet\User'); - $user = $repository->findOneBy(array('name' => 'ngal')); + $user = $repository->findOneBy(['name' => 'ngal']); $tweets = $user->tweets->matching(new Criteria()); $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php index d3d22825b..3eac4263c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php @@ -13,10 +13,12 @@ class PersistentCollectionTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionHolder'), $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionContent'), - )); + ] + ); } catch (\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index 861b29225..459c0549c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -17,9 +17,11 @@ class PersistentObjectTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PersistentEntity'), - )); + ] + ); } catch (\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php index b6fb57964..0debc2ca6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php @@ -46,7 +46,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); } @@ -63,7 +63,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $query = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :id'); @@ -83,7 +83,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $query = $this->_em->createQuery('SELECT u, e FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.email e WHERE u.id = :id'); @@ -103,7 +103,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $query = $this->_em->createQuery('SELECT u, p FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.phonenumbers p WHERE u.id = :id'); @@ -123,12 +123,12 @@ class PostLoadEventTest extends OrmFunctionalTestCase ->method('postLoad') ->will($this->returnValue(true)); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $userProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); // Now deactivate original listener and attach new one - $eventManager->removeEventListener(array(Events::postLoad), $mockListener); + $eventManager->removeEventListener([Events::postLoad], $mockListener); $mockListener2 = $this->createMock(PostLoadListener::class); @@ -137,7 +137,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase ->method('postLoad') ->will($this->returnValue(true)); - $eventManager->addEventListener(array(Events::postLoad), $mockListener2); + $eventManager->addEventListener([Events::postLoad], $mockListener2); $userProxy->getName(); } @@ -155,7 +155,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase ->method('postLoad') ->will($this->returnValue(true)); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $query = $this->_em->createQuery('SELECT PARTIAL u.{id, name}, p FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.phonenumbers p WHERE u.id = :id'); @@ -177,7 +177,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $emailProxy = $user->getEmail(); @@ -198,7 +198,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), $mockListener); + $eventManager->addEventListener([Events::postLoad], $mockListener); $phonenumbersCol = $user->getPhonenumbers(); @@ -211,7 +211,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase public function testAssociationsArePopulatedWhenEventIsFired() { $checkerListener = new PostLoadListenerCheckAssociationsArePopulated(); - $this->_em->getEventManager()->addEventListener(array(Events::postLoad), $checkerListener); + $this->_em->getEventManager()->addEventListener([Events::postLoad], $checkerListener); $qb = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->createQueryBuilder('u'); $qb->leftJoin('u.email', 'email'); @@ -229,7 +229,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase { $eventManager = $this->_em->getEventManager(); $listener = new PostLoadListenerLoadEntityInEventHandler(); - $eventManager->addEventListener(array(Events::postLoad), $listener); + $eventManager->addEventListener([Events::postLoad], $listener); $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); $this->assertSame(1, $listener->countHandledEvents('Doctrine\Tests\Models\CMS\CmsUser'), 'Doctrine\Tests\Models\CMS\CmsUser should be handled once!'); @@ -303,7 +303,7 @@ class PostLoadListenerCheckAssociationsArePopulated class PostLoadListenerLoadEntityInEventHandler { - private $firedByClasses = array(); + private $firedByClasses = []; public function postLoad(LifecycleEventArgs $event) { diff --git a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php index 1528404df..7d9fbce9d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php @@ -24,14 +24,16 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), - )); + ] + ); } catch (\Exception $e) { } $this->user = new CmsUser(); @@ -48,7 +50,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase public function testPersistUpdate() { // Considering case (a) - $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', array('id' => 123)); + $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => 123]); $proxy->__isInitialized__ = true; $proxy->id = null; $proxy->username = 'ocra'; @@ -87,7 +89,8 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase */ public function testProxyAsDqlParameterPersist() { - $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', array('id' => $this->user->getId())); + $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => $this->user->getId()] + ); $proxy->id = $this->user->getId(); $result = $this ->_em @@ -117,7 +120,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase $result = $this ->_em ->getRepository('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser') - ->findOneBy(array('username' => $this->user->username)); + ->findOneBy(['username' => $this->user->username]); $this->assertSame($this->user->getId(), $result->getId()); $this->_em->clear(); $result = $this @@ -133,4 +136,4 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase { $this->_em->createQuery('DELETE FROM Doctrine\Tests\Models\CMS\CmsUser u')->execute(); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php index bdfe766ce..6eec3609f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php @@ -128,7 +128,7 @@ class QueryCacheTest extends OrmFunctionalTestCase $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux'); $sqlExecMock = $this->getMockBuilder(AbstractSqlExecutor::class) - ->setMethods(array('execute')) + ->setMethods(['execute']) ->getMock(); $sqlExecMock->expects($this->once()) @@ -136,14 +136,14 @@ class QueryCacheTest extends OrmFunctionalTestCase ->will($this->returnValue( 10 )); $parserResultMock = $this->getMockBuilder(ParserResult::class) - ->setMethods(array('getSqlExecutor')) + ->setMethods(['getSqlExecutor']) ->getMock(); $parserResultMock->expects($this->once()) ->method('getSqlExecutor') ->will($this->returnValue($sqlExecMock)); $cache = $this->getMockBuilder(CacheProvider::class) - ->setMethods(array('doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush', 'doGetStats')) + ->setMethods(['doFetch', 'doContains', 'doSave', 'doDelete', 'doFlush', 'doGetStats']) ->getMock(); $cache->expects($this->at(0))->method('doFetch')->will($this->returnValue(1)); diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index f23409506..8d0ad2d8d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -174,8 +174,8 @@ class QueryTest extends OrmFunctionalTestCase public function testSetParametersBackwardsCompatible() { $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1 AND u.status = ?2'); - $q->setParameters(array(1 => 'jwage', 2 => 'active')); - + $q->setParameters([1 => 'jwage', 2 => 'active']); + $users = $q->getResult(); } @@ -200,16 +200,17 @@ class QueryTest extends OrmFunctionalTestCase $articleId = $article1->id; $query = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = ?1"); - $articles = $query->iterate(new ArrayCollection(array(new Parameter(1, 'Doctrine 2'))), Query::HYDRATE_ARRAY); + $articles = $query->iterate(new ArrayCollection([new Parameter(1, 'Doctrine 2')]), Query::HYDRATE_ARRAY); - $found = array(); + $found = []; foreach ($articles AS $article) { $found[] = $article; } $this->assertEquals(1, count($found)); - $this->assertEquals(array( - array(array('id' => $articleId, 'topic' => 'Doctrine 2', 'text' => 'This is an introduction to Doctrine 2.', 'version' => 1)) - ), $found); + $this->assertEquals( + [ + [['id' => $articleId, 'topic' => 'Doctrine 2', 'text' => 'This is an introduction to Doctrine 2.', 'version' => 1]] + ], $found); } public function testIterateResult_IterativelyBuildUpUnitOfWork() @@ -232,7 +233,7 @@ class QueryTest extends OrmFunctionalTestCase $articles = $query->iterate(); $iteratedCount = 0; - $topics = array(); + $topics = []; foreach($articles AS $row) { $article = $row[0]; $topics[] = $article->topic; @@ -244,7 +245,7 @@ class QueryTest extends OrmFunctionalTestCase $iteratedCount++; } - $this->assertEquals(array("Doctrine 2", "Symfony 2"), $topics); + $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics); $this->assertEquals(2, $iteratedCount); $this->_em->flush(); @@ -271,7 +272,7 @@ class QueryTest extends OrmFunctionalTestCase $articles = $query->iterate(); $iteratedCount = 0; - $topics = array(); + $topics = []; foreach($articles AS $row) { $article = $row[0]; $topics[] = $article->topic; @@ -281,7 +282,7 @@ class QueryTest extends OrmFunctionalTestCase $iteratedCount++; } - $this->assertEquals(array("Doctrine 2", "Symfony 2"), $topics); + $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics); $this->assertEquals(2, $iteratedCount); $this->_em->flush(); @@ -394,7 +395,7 @@ class QueryTest extends OrmFunctionalTestCase $this->fail($e->getMessage()); } - $this->_em->getConfiguration()->setEntityNamespaces(array()); + $this->_em->getConfiguration()->setEntityNamespaces([]); } /** @@ -502,7 +503,7 @@ class QueryTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u"); $this->expectException(NonUniqueResultException::class); - + $fetchedUser = $query->getOneOrNullResult(); } @@ -545,10 +546,12 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.status = :a AND u.id IN (:b)"); - $query->setParameters(new ArrayCollection(array( - new Parameter('b', array($user1->id, $user2->id, $user3->id)), + $query->setParameters(new ArrayCollection( + [ + new Parameter('b', [$user1->id, $user2->id, $user3->id]), new Parameter('a', 'developer') - ))); + ] + )); $result = $query->getResult(); $this->assertEquals(3, count($result)); @@ -578,7 +581,7 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username IN (?0)"); - $query->setParameter(0, array('beberlei', 'jwage')); + $query->setParameter(0, ['beberlei', 'jwage']); $users = $query->execute(); @@ -623,7 +626,7 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u IN (?0) OR u.username = ?1"); - $query->setParameter(0, array($userA, $userC)); + $query->setParameter(0, [$userA, $userC]); $query->setParameter(1, 'beberlei'); $users = $query->execute(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php index dd8a23ff3..9eacc7a9c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php @@ -15,9 +15,11 @@ class ReadOnlyTest extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\ReadOnlyEntity'), - )); + ] + ); } catch(\Exception $e) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php index 4baeed9f1..b7116a3cd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php @@ -57,7 +57,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - $productProxy = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct', array('id' => $id)); + $productProxy = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct', ['id' => $id]); $this->assertEquals('Doctrine Cookbook', $productProxy->getName()); } @@ -189,7 +189,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase $this->assertEquals($id, $entity->getId()); $this->assertFalse($entity->__isInitialized__, "Getting the identifier doesn't initialize the proxy when extending."); } - + public function testDoNotInitializeProxyOnGettingTheIdentifierAndReturnTheRightType() { $product = new ECommerceProduct(); diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php index 5fccc0bdb..42db02906 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php @@ -92,7 +92,7 @@ class SQLFilterTest extends OrmFunctionalTestCase $em = $this->_getEntityManager(); // No enabled filters - $this->assertEquals(array(), $em->getFilters()->getEnabledFilters()); + $this->assertEquals([], $em->getFilters()->getEnabledFilters()); $this->configureFilters($em); $filter = $em->getFilters()->enable("locale"); @@ -170,11 +170,11 @@ class SQLFilterTest extends OrmFunctionalTestCase // Check for a disabled filter $em->getFilters()->disable("locale"); $this->assertFalse($em->getFilters()->isEnabled("locale")); - + // Check a non-existing filter - $this->assertFalse($em->getFilters()->isEnabled("foo_filter")); + $this->assertFalse($em->getFilters()->isEnabled("foo_filter")); } - + protected function configureFilters($em) { // Add filters to the configuration of the EM @@ -322,10 +322,10 @@ class SQLFilterTest extends OrmFunctionalTestCase $filter2->setParameter('foo', 'bar', DBALType::STRING); $filter2->setParameter('locale', 'en', DBALType::STRING); - $parameters = array( - 'foo' => array('value' => 'bar', 'type' => DBALType::STRING), - 'locale' => array('value' => 'en', 'type' => DBALType::STRING), - ); + $parameters = [ + 'foo' => ['value' => 'bar', 'type' => DBALType::STRING], + 'locale' => ['value' => 'en', 'type' => DBALType::STRING], + ]; $this->assertEquals(serialize($parameters), ''.$filter); $this->assertEquals(''.$filter, ''.$filter2); @@ -399,12 +399,16 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadFixtureData(); - $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(array('id' => $this->groupId2))); + $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy( + ['id' => $this->groupId2] + )); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy(array('id' => $this->groupId2))); + $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy( + ['id' => $this->groupId2] + )); } public function testRepositoryFindByX() @@ -423,12 +427,16 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadFixtureData(); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(array('id' => $this->groupId2))); + $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy( + ['id' => $this->groupId2] + )); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy(array('id' => $this->groupId2))); + $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy( + ['id' => $this->groupId2] + )); } public function testRepositoryFindOneByX() diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php index 32c75d25d..66eee731a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php @@ -59,9 +59,11 @@ class CompanySchemaTest extends OrmFunctionalTestCase $this->markTestSkipped("Foreign Key test"); } - $sql = $this->_schemaTool->getDropSchemaSQL(array( + $sql = $this->_schemaTool->getDropSchemaSQL( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyManager'), - )); + ] + ); $this->assertEquals(4, count($sql)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php index 22debe962..54caeb34a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php @@ -23,9 +23,9 @@ class DBAL483Test extends OrmFunctionalTestCase { $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DBAL483Default'); - $this->schemaTool->createSchema(array($class)); + $this->schemaTool->createSchema([$class]); - $updateSql = $this->schemaTool->getUpdateSchemaSql(array($class)); + $updateSql = $this->schemaTool->getUpdateSchemaSql([$class]); $updateSql = array_filter($updateSql, function ($sql) { return strpos($sql, 'DBAL483') !== false; diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php index 4b4d0328d..3ca501ae0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php @@ -11,7 +11,7 @@ use Doctrine\Tests\OrmFunctionalTestCase; */ class DDC214Test extends OrmFunctionalTestCase { - private $classes = array(); + private $classes = []; private $schemaTool = null; public function setUp() @@ -31,14 +31,14 @@ class DDC214Test extends OrmFunctionalTestCase */ public function testCmsAddressModel() { - $this->classes = array( + $this->classes = [ 'Doctrine\Tests\Models\CMS\CmsUser', 'Doctrine\Tests\Models\CMS\CmsPhonenumber', 'Doctrine\Tests\Models\CMS\CmsAddress', 'Doctrine\Tests\Models\CMS\CmsGroup', 'Doctrine\Tests\Models\CMS\CmsArticle', 'Doctrine\Tests\Models\CMS\CmsEmail', - ); + ]; $this->assertCreatedSchemaNeedsNoUpdates($this->classes); } @@ -48,7 +48,7 @@ class DDC214Test extends OrmFunctionalTestCase */ public function testCompanyModel() { - $this->classes = array( + $this->classes = [ 'Doctrine\Tests\Models\Company\CompanyPerson', 'Doctrine\Tests\Models\Company\CompanyEmployee', 'Doctrine\Tests\Models\Company\CompanyManager', @@ -57,14 +57,14 @@ class DDC214Test extends OrmFunctionalTestCase 'Doctrine\Tests\Models\Company\CompanyAuction', 'Doctrine\Tests\Models\Company\CompanyRaffle', 'Doctrine\Tests\Models\Company\CompanyCar' - ); + ]; $this->assertCreatedSchemaNeedsNoUpdates($this->classes); } public function assertCreatedSchemaNeedsNoUpdates($classes) { - $classMetadata = array(); + $classMetadata = []; foreach ($classes AS $class) { $classMetadata[] = $this->_em->getClassMetadata($class); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php index a923c40fc..9df372c91 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php @@ -16,14 +16,14 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsTag'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -49,9 +49,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql2() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel') - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -62,9 +62,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql3() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel') - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -78,9 +78,9 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase */ public function testGetCreateSchemaSql4() { - $classes = array( + $classes = [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\MysqlSchemaNamespacedEntity') - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php index f98fe4beb..f71bfe9ce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php @@ -25,11 +25,11 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -58,15 +58,15 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase $this->assertEquals("ALTER TABLE cms_users_tags ADD CONSTRAINT FK_93F5A1ADBAD26311 FOREIGN KEY (tag_id) REFERENCES cms_tags (id) NOT DEFERRABLE INITIALLY IMMEDIATE", array_shift($sql)); $this->assertEquals("ALTER TABLE cms_phonenumbers ADD CONSTRAINT FK_F21F790FA76ED395 FOREIGN KEY (user_id) REFERENCES cms_users (id) NOT DEFERRABLE INITIALLY IMMEDIATE", array_shift($sql)); - $this->assertEquals(array(), $sql, "SQL Array should be empty now."); + $this->assertEquals([], $sql, "SQL Array should be empty now."); $this->assertEquals(22, $sqlCount, "Total of 22 queries should be executed"); } public function testGetCreateSchemaSql2() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel') - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -79,9 +79,9 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql3() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel') - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getCreateSchemaSql($classes); @@ -93,11 +93,11 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetDropSchemaSql() { - $classes = array( + $classes = [ $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - ); + ]; $tool = new SchemaTool($this->_em); $sql = $tool->getDropSchemaSQL($classes); @@ -119,10 +119,10 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase */ public function testUpdateSchemaWithPostgreSQLSchema() { - $classes = array( + $classes = [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Screen'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Avatar'), - ); + ]; $tool = new SchemaTool($this->_em); $tool->createSchema($classes); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php index 06eb67a2e..d6f98af1f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php @@ -14,12 +14,12 @@ class SchemaValidatorTest extends OrmFunctionalTestCase { static public function dataValidateModelSets() { - $modelSets = array(); + $modelSets = []; foreach (self::$_modelSets as $modelSet => $classes) { if ($modelSet == "customtype") { continue; } - $modelSets[] = array($modelSet); + $modelSets[] = [$modelSet]; } return $modelSets; } @@ -31,7 +31,7 @@ class SchemaValidatorTest extends OrmFunctionalTestCase { $validator = new SchemaValidator($this->_em); - $classes = array(); + $classes = []; foreach (self::$_modelSets[$modelSet] as $className) { $classes[] = $this->_em->getClassMetadata($className); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php index 320bbbb2f..becf7edbb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheAbstractTest.php @@ -27,16 +27,16 @@ use Doctrine\Tests\Models\Cache\AttractionLocationInfo; */ abstract class SecondLevelCacheAbstractTest extends OrmFunctionalTestCase { - protected $people = array(); - protected $addresses = array(); - protected $countries = array(); - protected $states = array(); - protected $cities = array(); - protected $travels = array(); - protected $travelers = array(); - protected $attractions = array(); - protected $attractionsInfo = array(); - protected $travelersWithProfile = array(); + protected $people = []; + protected $addresses = []; + protected $countries = []; + protected $states = []; + protected $cities = []; + protected $travels = []; + protected $travelers = []; + protected $attractions = []; + protected $attractionsInfo = []; + protected $travelersWithProfile = []; /** * @var \Doctrine\ORM\Cache @@ -280,4 +280,4 @@ abstract class SecondLevelCacheAbstractTest extends OrmFunctionalTestCase $this->cache->evictEntityRegions(); $this->cache->evictCollectionRegions(); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php index f5c105225..efa8f9f4d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php @@ -24,10 +24,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); $flight = new Flight($leavingFrom, $goingTo); - $id = array( + $id = [ 'leavingFrom' => $leavingFromId, 'goingTo' => $goingToId, - ); + ]; $flight->setDeparture(new \DateTime('tomorrow')); @@ -70,10 +70,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); $flight = new Flight($leavingFrom, $goingTo); - $id = array( + $id = [ 'leavingFrom' => $leavingFromId, 'goingTo' => $goingToId, - ); + ]; $flight->setDeparture(new \DateTime('tomorrow')); @@ -114,10 +114,10 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); $flight = new Flight($leavingFrom, $goingTo); - $id = array( + $id = [ 'leavingFrom' => $leavingFromId, 'goingTo' => $goingToId, - ); + ]; $flight->setDeparture($now); @@ -172,4 +172,4 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $this->assertEquals($leavingFrom->getId(), $leavingFromId); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php index dc4f40db0..0fc7ae415 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php @@ -55,7 +55,7 @@ class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctio $queries = $this->getCurrentQueryCount(); - $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1)); + $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]); $this->assertEquals("Italy", $admin1Rome->country->name); $this->assertEquals(2, count($admin1Rome->names)); @@ -65,7 +65,7 @@ class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctio $queries = $this->getCurrentQueryCount(); - $admin1Rome = $admin1Repo->findOneBy(array('country' => 'IT', 'id' => 1)); + $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]); $this->assertEquals("Italy", $admin1Rome->country->name); $this->assertEquals(2, count($admin1Rome->names)); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php index f4d8e6b76..ee5aa3fbd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php @@ -58,7 +58,7 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $countryId = $this->countries[0]->getId(); - $cacheId = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId)); + $cacheId = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId]); $region = $this->_em->getCache()->getEntityCacheRegion(Country::CLASSNAME); $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId)); @@ -97,7 +97,7 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $stateId = $this->states[0]->getId(); - $cacheId = new CollectionCacheKey(State::CLASSNAME, 'cities', array('id'=>$stateId)); + $cacheId = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>$stateId]); $region = $this->_em->getCache()->getCollectionCacheRegion(State::CLASSNAME, 'cities'); $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId)); @@ -147,4 +147,4 @@ class CacheFactorySecondLevelCacheConcurrentTest extends DefaultCacheFactory { 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 b34b0f825..51a93417b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php @@ -191,10 +191,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $countryName1 = $this->countries[0]->getName(); $countryName2 = $this->countries[1]->getName(); - $key1 = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId1)); - $key2 = new EntityCacheKey(Country::CLASSNAME, array('id'=>$countryId2)); - $entry1 = new EntityCacheEntry(Country::CLASSNAME, array('id'=>$countryId1, 'name'=>'outdated')); - $entry2 = new EntityCacheEntry(Country::CLASSNAME, array('id'=>$countryId2, 'name'=>'outdated')); + $key1 = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId1]); + $key2 = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId2]); + $entry1 = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId1, 'name'=>'outdated']); + $entry2 = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId2, 'name'=>'outdated']); $region->put($key1, $entry1); $region->put($key2, $entry2); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php index 71f7d952f..8e37dd960 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php @@ -92,7 +92,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertCount(2, $countries); $this->assertInstanceOf(Country::CLASSNAME, $countries[0]); $this->assertInstanceOf(Country::CLASSNAME, $countries[1]); - + $country = new Country('foo'); $this->_em->persist($country); @@ -105,7 +105,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $country = $repository->find($country->getId()); - + $this->_em->remove($country); $this->_em->flush(); $this->_em->clear(); @@ -125,7 +125,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $criteria = array('name'=>$this->countries[0]->getName()); + $criteria = ['name'=>$this->countries[0]->getName()]; $repository = $this->_em->getRepository(Country::CLASSNAME); $queryCount = $this->getCurrentQueryCount(); @@ -155,7 +155,7 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $criteria = array('name'=>$this->countries[0]->getName()); + $criteria = ['name'=>$this->countries[0]->getName()]; $repository = $this->_em->getRepository(Country::CLASSNAME); $queryCount = $this->getCurrentQueryCount(); @@ -247,4 +247,4 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry()); $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php index 56735840a..79044395a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php @@ -63,7 +63,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->assertInstanceOf(Country::CLASSNAME, $c3); $this->assertInstanceOf(Country::CLASSNAME, $c4); - + $this->assertEquals($c1->getId(), $c3->getId()); $this->assertEquals($c1->getName(), $c3->getName()); @@ -195,9 +195,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest public function testPostFlushFailure() { - $listener = new ListenerSecondLevelCacheTest(array(Events::postFlush => function(){ + $listener = new ListenerSecondLevelCacheTest( + [ + Events::postFlush => function(){ throw new \RuntimeException('post flush failure'); - })); + } + ] + ); $this->_em->getEventManager() ->addEventListener(Events::postFlush, $listener); @@ -225,9 +229,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesStates(); $this->_em->clear(); - $listener = new ListenerSecondLevelCacheTest(array(Events::postUpdate => function(){ + $listener = new ListenerSecondLevelCacheTest( + [ + Events::postUpdate => function(){ throw new \RuntimeException('post update failure'); - })); + } + ] + ); $this->_em->getEventManager() ->addEventListener(Events::postUpdate, $listener); @@ -237,7 +245,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $stateId = $this->states[0]->getId(); $stateName = $this->states[0]->getName(); $state = $this->_em->find(State::CLASSNAME, $stateId); - + $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId)); $this->assertInstanceOf(State::CLASSNAME, $state); $this->assertEquals($stateName, $state->getName()); @@ -269,9 +277,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesCountries(); $this->_em->clear(); - $listener = new ListenerSecondLevelCacheTest(array(Events::postRemove => function(){ + $listener = new ListenerSecondLevelCacheTest( + [ + Events::postRemove => function(){ throw new \RuntimeException('post remove failure'); - })); + } + ] + ); $this->_em->getEventManager() ->addEventListener(Events::postRemove, $listener); @@ -324,7 +336,7 @@ class ListenerSecondLevelCacheTest { public $callbacks; - public function __construct(array $callbacks = array()) + public function __construct(array $callbacks = []) { $this->callbacks = $callbacks; } diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php index 02c891e75..812d56d31 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php @@ -21,7 +21,7 @@ class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase } else { try { $this->_schemaTool->createSchema( - array($this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\SequenceEmulatedIdentityEntity')) + [$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\SequenceEmulatedIdentityEntity')] ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index 2fcd6a1b9..f77e1b0da 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -19,9 +19,11 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase } try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\SequenceEntity'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php index 53829a1c0..80cf1596f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php @@ -58,7 +58,7 @@ class SingleTableCompositeKeyTest extends OrmFunctionalTestCase { return $this->_em->find( 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass', - array('keyPart1' => 'part-1', 'keyPart2' => 'part-2') + ['keyPart1' => 'part-1', 'keyPart2' => 'part-2'] ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php index 72be4c4d6..380f84b8b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php @@ -14,7 +14,7 @@ use Doctrine\Tests\OrmFunctionalTestCase; class SingleTableInheritanceTest extends OrmFunctionalTestCase { private $salesPerson; - private $engineers = array(); + private $engineers = []; private $fix; private $flex; private $ultra; @@ -232,7 +232,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase sort($discrValues); - $this->assertEquals(array('fix', 'flexible', 'flexultra'), $discrValues); + $this->assertEquals(['fix', 'flexible', 'flexultra'], $discrValues); } public function testQueryChildClassWithCondition() @@ -327,19 +327,19 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $this->loadFullFixture(); $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyContract"); - $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId())); + $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(3, count($contracts), "There should be 3 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyContract'"); $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFixContract"); - $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId())); + $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFixContract'"); $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexContract"); - $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId())); + $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(2, count($contracts), "There should be 2 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexContract'"); $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexUltraContract"); - $contracts = $repos->findBy(array('salesPerson' => $this->salesPerson->getId())); + $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexUltraContract'"); } diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php index a335b234e..f7f651f1e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php @@ -39,8 +39,8 @@ class StandardEntityPersisterTest extends OrmFunctionalTestCase $persister = $this->_em->getUnitOfWork()->getEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceCart'); $newCart = new ECommerceCart(); - $this->_em->getUnitOfWork()->registerManaged($newCart, array('id' => $cardId), array()); - $persister->load(array('customer_id' => $customer->getId()), $newCart, $class->associationMappings['customer']); + $this->_em->getUnitOfWork()->registerManaged($newCart, ['id' => $cardId], []); + $persister->load(['customer_id' => $customer->getId()], $newCart, $class->associationMappings['customer']); $this->assertEquals('Credit card', $newCart->getPayment()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php index 9369ca4c9..637b42cdf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php @@ -11,11 +11,13 @@ class DDC1080Test extends OrmFunctionalTestCase { public function testHydration() { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Bar'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080FooBar'), - )); + ] + ); $foo1 = new DDC1080Foo(); $foo1->setFooTitle('foo title 1'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php index e40f27994..9ff8882b5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php @@ -13,12 +13,14 @@ class DDC1113Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Engine'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Vehicle'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Car'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Bus'), - )); + ] + ); } catch (\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php index 8e67b514f..053586bc9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php @@ -13,10 +13,12 @@ class DDC1151Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->markTestSkipped("This test is useful for all databases, but designed only for postgresql."); } - $sql = $this->_schemaTool->getCreateSchemaSql(array( + $sql = $this->_schemaTool->getCreateSchemaSql( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151Group'), - )); + ] + ); $this->assertEquals("CREATE TABLE \"User\" (id INT NOT NULL, PRIMARY KEY(id))", $sql[0]); $this->assertEquals("CREATE TABLE ddc1151user_ddc1151group (ddc1151user_id INT NOT NULL, ddc1151group_id INT NOT NULL, PRIMARY KEY(ddc1151user_id, ddc1151group_id))", $sql[1]); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php index dad902b35..8e8fcdb8b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php @@ -11,12 +11,14 @@ class DDC1163Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Product'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163SpecialProduct'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163ProxyHolder'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Tag'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php index 9c28b7e88..51141b4e6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php @@ -34,7 +34,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $link = new DDC117Link($this->article1, $this->article2, "Link-Description"); $this->_em->persist($link); - + $this->reference = new DDC117Reference($this->article1, $this->article2, "Test-Description"); $this->_em->persist($this->reference); @@ -53,7 +53,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testAssociationOnlyCompositeKey() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $mapRef); @@ -92,7 +92,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testUpdateAssociationEntity() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); $this->assertNotNull($mapRef); @@ -126,7 +126,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testRemoveCompositeElement() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); @@ -143,7 +143,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testDqlRemoveCompositeElement() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $dql = "DELETE "."Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2"; $this->_em->createQuery($dql) @@ -188,7 +188,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testMixedCompositeKey() { - $idCriteria = array('article' => $this->article1->id(), 'language' => 'en'); + $idCriteria = ['article' => $this->article1->id(), 'language' => 'en']; $this->translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria); $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $this->translation); @@ -282,10 +282,10 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testReferencesToForeignKeyEntities() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); - $idCriteria = array('article' => $this->article1->id(), 'language' => 'en'); + $idCriteria = ['article' => $this->article1->id(), 'language' => 'en']; $translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria); $approveChanges = new DDC117ApproveChanges($reference->source()->getDetails(), $reference, $translation); @@ -429,7 +429,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testMergeForeignKeyIdentifierEntity() { - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); @@ -484,7 +484,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference)); - $idCriteria = array('source' => $this->article1->id(), 'target' => $this->article2->id()); + $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference)); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php index b6d82816c..8cf1ebe15 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -9,11 +9,13 @@ class DDC1181Test extends OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Hotel'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Booking'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Room'), - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php index a4ecf5d39..00d0a35a4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php @@ -10,11 +10,13 @@ class DDC1193Test extends OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Company'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Person'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Account') - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index 06dde7696..7700aa0a5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -10,11 +10,13 @@ class DDC1209Test extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_2'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_3') - )); + ] + ); } catch(\Exception $e) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php index 95ff58fb5..105ae9f90 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php @@ -11,10 +11,12 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity2'), - )); + ] + ); } catch(\PDOException $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php index 913a3df76..8a9f252df 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php @@ -12,10 +12,12 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'), - )); + ] + ); } catch(\Exception $e) { } @@ -40,7 +42,7 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized"); $this->assertEquals("Bar", $user->getProfile()->getName()); - $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile())); + $this->assertEquals(["id" => 1, "name" => "Foo"], $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile())); $this->_em->flush(); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php index dd0f99d03..6c24b2f55 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -11,9 +11,11 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php index 3d88b8cb1..ed54ec681 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php @@ -11,9 +11,11 @@ class DDC1250Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1250ClientHistory'), - )); + ] + ); } catch(\PDOException $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php index bffb48764..97fd33b2a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php @@ -10,10 +10,12 @@ class DDC1300Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300FooLocale'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php index 911a4bf61..d92a32781 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php @@ -11,10 +11,12 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335Phone'), - )); + ] + ); $this->loadFixture(); } catch(\Exception $e) { } @@ -128,9 +130,9 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase private function loadFixture() { - $p1 = array('11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz'); - $p2 = array('22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz'); - $p3 = array('33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz'); + $p1 = ['11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz']; + $p2 = ['22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz']; + $p3 = ['33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz']; $u1 = new DDC1335User("foo@foo.com", "Foo",$p1); $u2 = new DDC1335User("bar@bar.com", "Bar",$p2); @@ -171,7 +173,7 @@ class DDC1335User */ public $phones; - public function __construct($email, $name, array $numbers = array()) + public function __construct($email, $name, array $numbers = []) { $this->name = $name; $this->email = $email; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php index e423de5bb..05a99b7cb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php @@ -15,15 +15,18 @@ class DDC1360Test extends OrmFunctionalTestCase $this->markTestSkipped("PostgreSQL only test."); } - $sql = $this->_schemaTool->getCreateSchemaSql(array( + $sql = $this->_schemaTool->getCreateSchemaSql( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote') - )); + ] + ); - $this->assertEquals(array( + $this->assertEquals( + [ 'CREATE SCHEMA user', 'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))', 'CREATE SEQUENCE "user"."user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1', - ), $sql); + ], $sql); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php index fb6ae25e6..a84fd7154 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php @@ -12,10 +12,12 @@ class DDC1383Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383AbstractEntity'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383Entity'), - )); + ] + ); } catch(\Exception $ignored) {} } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php index 2e0df824b..5fe34f6cc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php @@ -14,10 +14,12 @@ class DDC1392Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392File'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392Picture'), - )); + ] + ); } catch (\Exception $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php index 41183ffdd..22fd282ce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php @@ -12,11 +12,13 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400Article'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400UserState'), - )); + ] + ); } catch (\Exception $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php index 322582c20..e4d0a47f2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php @@ -13,10 +13,12 @@ class DDC1404Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ParentEntity'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ChildEntity'), - )); + ] + ); $this->loadFixtures(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php index c985d61ac..6f08cf80c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php @@ -17,12 +17,14 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), - )); + ] + ); } catch(\Exception $e) { } } @@ -50,7 +52,7 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $id = $user->id; $this->assertNotNull($id); - + $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $id); $address = $user->getAddress(); @@ -75,8 +77,8 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNull($user->getAddress()); $this->assertEquals('FabioBatSilva1', $user->name); - - + + $this->_em->remove($user); $this->_em->flush(); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php index 30e681d72..3356d4268 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php @@ -13,10 +13,12 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430Order'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430OrderProduct'), - )); + ] + ); $this->loadFixtures(); } catch (\Exception $exc) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php index fa25c69e0..cd9ff6b32 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php @@ -12,9 +12,11 @@ class DDC1436Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1436Page'), - )); + ] + ); } catch (\Exception $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index 2fc8eef93..d7b280f00 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -10,11 +10,13 @@ class DDC144Test extends OrmFunctionalTestCase parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144FlowElement'), // $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Expression'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Operand'), - )); + ] + ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php index 4db5fe0cb..4dd486c1e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php @@ -15,10 +15,12 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityA'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityB'), - )); + ] + ); } catch (\Exception $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php index 02e900317..f4b456e65 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php @@ -12,10 +12,12 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454File'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454Picture'), - )); + ] + ); } catch (\Exception $ignored) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php index f04e6cb01..6f2d80afb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php @@ -9,10 +9,12 @@ class DDC1258Test extends OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\TestEntity'), $this->_em->getClassMetadata(__NAMESPACE__ . '\TestAdditionalEntity') - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php index bfa469155..fd419d743 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php @@ -12,10 +12,12 @@ class DDC1461Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461TwitterAccount'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461User') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php index edceef666..351a963c4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php @@ -13,11 +13,13 @@ class DDC1509Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509AbstractFile'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'), - )); + ] + ); } catch (\Exception $ignored) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php index daaa69b2a..36dd46748 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php @@ -14,11 +14,13 @@ class DDC1514Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityA'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityB'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityC'), - )); + ] + ); } catch (\Exception $ignored) { } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php index 9116a4df1..2ceaaa104 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php @@ -11,10 +11,12 @@ class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php index e2d770a53..c33549afb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php @@ -10,14 +10,16 @@ class DDC1526Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1526Menu'), - )); + ] + ); } public function testIssue() { - $parents = array(); + $parents = []; for ($i = 0; $i < 9; $i++) { $entity = new DDC1526Menu; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php index 74c1fe1d5..179d4914c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php @@ -10,11 +10,13 @@ class DDC1548Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E2'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548Rel'), - )); + ] + ); } public function testIssue() @@ -78,4 +80,4 @@ class DDC1548Rel * @OneToOne(targetEntity="DDC1548E2", mappedBy="rel") */ public $e2; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php index 144894f17..c44896b85 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php @@ -15,11 +15,13 @@ class DDC1595Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\DebugStack); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595BaseInheritance'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity2'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php index a63eab8eb..aad2902d9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php @@ -10,10 +10,12 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->setUpEntitySchema(array( + $this->setUpEntitySchema( + [ __NAMESPACE__ . '\\DDC1654Post', __NAMESPACE__ . '\\DDC1654Comment', - )); + ] + ); } public function tearDown() @@ -142,7 +144,7 @@ class DDC1654Post * @ManyToMany(targetEntity="DDC1654Comment", orphanRemoval=true, * cascade={"persist"}) */ - public $comments = array(); + public $comments = []; } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php index cb5023a86..3b24b4d91 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php @@ -14,11 +14,13 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Bar'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Baz'), - )); + ] + ); } catch(\Exception $e) { } } @@ -26,10 +28,10 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testPostLoadOneToManyInheritance() { $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Foo'); - $this->assertEquals(array("postLoad" => array("postLoad")), $cm->lifecycleCallbacks); + $this->assertEquals(["postLoad" => ["postLoad"]], $cm->lifecycleCallbacks); $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Bar'); - $this->assertEquals(array("postLoad" => array("postLoad", "postSubLoaded")), $cm->lifecycleCallbacks); + $this->assertEquals(["postLoad" => ["postLoad", "postSubLoaded"]], $cm->lifecycleCallbacks); $baz = new DDC1655Baz(); $foo = new DDC1655Foo(); @@ -140,5 +142,5 @@ class DDC1655Baz /** * @OneToMany(targetEntity="DDC1655Foo", mappedBy="baz") */ - public $foos = array(); + public $foos = []; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php index ed1cb4257..a108f81b8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php @@ -10,10 +10,12 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Parent'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Child') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } @@ -75,7 +77,7 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase } class NotifyBaseEntity implements NotifyPropertyChanged { - public $listeners = array(); + public $listeners = []; public function addPropertyChangedListener(PropertyChangedListener $listener) { if (!in_array($listener, $this->listeners)) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php index 5e587c4df..dd6dcaeeb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php @@ -15,10 +15,12 @@ class DDC1707Test extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'), - )); + ] + ); } catch (\Exception $ignored) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php index a9cadb3cc..fe5a0de65 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php @@ -15,18 +15,22 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(self::CLASS_NAME), - )); + ] + ); } protected function tearDown() { parent::tearDown(); - $this->_schemaTool->dropSchema(array( + $this->_schemaTool->dropSchema( + [ $this->_em->getClassMetadata(self::CLASS_NAME), - )); + ] + ); } public function testCreateRetrieveUpdateDelete() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php index 862d9196a..134108030 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php @@ -10,10 +10,12 @@ class DDC1787Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Bar'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php index bf52e570b..6cf8c68c4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php @@ -16,12 +16,14 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), - )); + ] + ); } catch(\Exception $e) { } } @@ -109,7 +111,7 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->remove($e3); $this->_em->remove($e2); $this->_em->remove($e1); - + $this->_em->flush(); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php index 46f7cca7f..2e638278d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php @@ -72,7 +72,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($merc); $this->_em->persist($volvo); - return array($bimmer, $crysler, $merc, $volvo); + return [$bimmer, $crysler, $merc, $volvo]; } private function createDrivers($class) @@ -86,7 +86,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($foo); $this->_em->persist($john); - return array($john, $foo); + return [$john, $foo]; } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php index 91f49282e..356a2c881 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php @@ -22,11 +22,13 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), - )); + ] + ); } catch(\Exception $e) { } @@ -41,7 +43,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($user); $this->_em->flush(); $this->_em->clear(); - + } public function testCreateRetrieveUpdateDelete() @@ -60,7 +62,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); - + $this->assertCount(2, $user->groups); $g1 = $user->getGroups()->get(0); @@ -85,7 +87,7 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase // Delete $this->_em->remove($user); - + $this->_em->flush(); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php index 64b3ad48d..4b0c7eb91 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php @@ -19,7 +19,7 @@ class DDC1918Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testLastPageCorrect() { - $groups = array(); + $groups = []; for ($i = 0; $i < 3; $i++) { $group = new CmsGroup(); $group->name = "test"; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php index 4c50cf262..f42a3655f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -12,10 +12,12 @@ class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase { public function testIssue() { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925Product'), - )); + ] + ); $user = new DDC1925User(); $user->setTitle("Test User"); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php index f01a2abac..2627a17d8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -8,10 +8,12 @@ class DDC192Test extends OrmFunctionalTestCase { public function testSchemaCreation() { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192Phonenumber') - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php index 95e0a76f5..bc2fe26cf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php @@ -15,9 +15,11 @@ class DDC1998Test extends \Doctrine\Tests\OrmFunctionalTestCase { Type::addType('ddc1998', __NAMESPACE__ . '\\DDC1998Type'); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1998Entity'), - )); + ] + ); $entity = new DDC1998Entity(); $entity->id = new DDC1998Id("foo"); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php index 17a115d0f..9db6dad96 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php @@ -9,11 +9,13 @@ class DDC199Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ParentClass'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ChildClass'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199RelatedClass') - )); + ] + ); } public function testPolymorphicLoading() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php index 92510cb02..5d2be3bbc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php @@ -17,18 +17,20 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase Type::addType(DDC2012TsVectorType::MYTYPE, __NAMESPACE__ . '\DDC2012TsVectorType'); - DDC2012TsVectorType::$calls = array(); + DDC2012TsVectorType::$calls = []; - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012Item'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012ItemPerson'), - )); + ] + ); } public function testIssue() { $item = new DDC2012ItemPerson(); - $item->tsv = array('word1', 'word2', 'word3'); + $item->tsv = ['word1', 'word2', 'word3']; $this->_em->persist($item); $this->_em->flush(); @@ -45,10 +47,10 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertCount(1, DDC2012TsVectorType::$calls['convertToPHPValue']); $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item); - $this->assertEquals(array('word1', 'word2', 'word3'), $item->tsv); + $this->assertEquals(['word1', 'word2', 'word3'], $item->tsv); - $item->tsv = array('word1', 'word2'); + $item->tsv = ['word1', 'word2']; $this->_em->persist($item); $this->_em->flush(); @@ -61,7 +63,7 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertCount(2, DDC2012TsVectorType::$calls['convertToPHPValue']); $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item); - $this->assertEquals(array('word1', 'word2'), $item->tsv); + $this->assertEquals(['word1', 'word2'], $item->tsv); } } @@ -103,7 +105,7 @@ class DDC2012TsVectorType extends Type { const MYTYPE = 'tsvector'; - public static $calls = array(); + public static $calls = []; /** * {@inheritdoc} @@ -122,10 +124,10 @@ class DDC2012TsVectorType extends Type $value = implode(" ", $value); } - self::$calls[__FUNCTION__][] = array( + self::$calls[__FUNCTION__][] = [ 'value' => $value, 'platform' => $platform, - ); + ]; return $value; } @@ -135,10 +137,10 @@ class DDC2012TsVectorType extends Type */ public function convertToPHPValue($value, AbstractPlatform $platform) { - self::$calls[__FUNCTION__][] = array( + self::$calls[__FUNCTION__][] = [ 'value' => $value, 'platform' => $platform, - ); + ]; return explode(" ", strtolower($value)); } @@ -148,14 +150,14 @@ class DDC2012TsVectorType extends Type */ public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform) { - self::$calls[__FUNCTION__][] = array( + self::$calls[__FUNCTION__][] = [ 'sqlExpr' => $sqlExpr, 'platform' => $platform, - ); + ]; // changed to upper expression to keep the test compatible with other Databases //sprintf('to_tsvector(%s)', $sqlExpr); - + return $platform->getUpperExpression($sqlExpr); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php index f53857ab3..b0ae37e0e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php @@ -23,7 +23,7 @@ class DDC2074Test extends \Doctrine\Tests\OrmFunctionalTestCase $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); $product = new ECommerceProduct(); $category = new ECommerceCategory(); - $collection = new PersistentCollection($this->_em, $class, new ArrayCollection(array($category))); + $collection = new PersistentCollection($this->_em, $class, new ArrayCollection([$category])); $collection->setOwner($product, $class->associationMappings['categories']); $uow = $this->_em->getUnitOfWork(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php index abd0fe2d8..eadbc1caf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php @@ -12,10 +12,12 @@ class DDC2084Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2084\MyEntity1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2084\MyEntity2'), - )); + ] + ); } catch (\Exception $exc) { } } @@ -125,4 +127,4 @@ class MyEntity2 { $this->value = $value; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php index cd6db8857..dc7563c66 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php @@ -44,11 +44,13 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->set('e.startDate', ':date') ->set('e.salary', ':salary') ->where('e = :e') - ->setParameters(array( + ->setParameters( + [ 'e' => $employee1, 'date' => $date1, 'salary' => 101, - )) + ] + ) ->getQuery() ->useQueryCache(true) ->execute(); @@ -58,11 +60,13 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->set('e.startDate', ':date') ->set('e.salary', ':salary') ->where('e = :e') - ->setParameters(array( + ->setParameters( + [ 'e' => $employee2, 'date' => $date2, 'salary' => 102, - )) + ] + ) ->getQuery() ->useQueryCache(true) ->execute(); @@ -82,7 +86,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->set('e.startDate', '?1') ->set('e.salary', '?2') ->where('e = ?0') - ->setParameters(array($employee1, $date1, 101)) + ->setParameters([$employee1, $date1, 101]) ->getQuery() ->useQueryCache(true) ->execute(); @@ -92,7 +96,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->set('e.startDate', '?1') ->set('e.salary', '?2') ->where('e = ?0') - ->setParameters(array($employee2, $date2, 102)) + ->setParameters([$employee2, $date2, 102]) ->getQuery() ->useQueryCache(true) ->execute(); @@ -108,4 +112,4 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($date1, $e1->getStartDate()); $this->assertEquals($date2, $e2->getStartDate()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php index 925362b08..3e3e8670f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php @@ -12,9 +12,11 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2106Entity'), - )); + ] + ); } public function testDetachedEntityAsId() @@ -24,7 +26,7 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($entity); $this->_em->flush(); $this->_em->detach($entity); - $entity = $this->_em->getRepository(__NAMESPACE__ . '\DDC2106Entity')->findOneBy(array()); + $entity = $this->_em->getRepository(__NAMESPACE__ . '\DDC2106Entity')->findOneBy([]); // ... and a managed entity without id $entityWithoutId = new DDC2106Entity(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php index 728a393a0..cd94f75a5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php @@ -9,10 +9,12 @@ class DDC211Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211Group') - )); + ] + ); } public function testIssue() @@ -25,7 +27,7 @@ class DDC211Test extends OrmFunctionalTestCase $this->_em->persist($user); $this->_em->flush(); - $groupNames = array('group 1', 'group 2', 'group 3', 'group 4'); + $groupNames = ['group 1', 'group 2', 'group 3', 'group 4']; foreach ($groupNames as $name) { $group = new DDC211Group; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php index 97fdb3050..a0abb6754 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php @@ -16,21 +16,21 @@ class DDC2138Test extends OrmFunctionalTestCase $em = $this->_em; $schemaTool = new SchemaTool($em); - $classes = array( + $classes = [ $em->getClassMetadata(__NAMESPACE__ . '\DDC2138User'), $em->getClassMetadata(__NAMESPACE__ . '\DDC2138Structure'), $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedObject'), $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedStructure'), $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedUser') - ); + ]; $schema = $schemaTool->getSchemaFromMetadata($classes); $this->assertTrue($schema->hasTable('users_followed_objects'), "Table users_followed_objects should exist."); /* @var $table \Doctrine\DBAL\Schema\Table */ $table = ($schema->getTable('users_followed_objects')); - $this->assertTrue($table->columnsAreIndexed(array('object_id'))); - $this->assertTrue($table->columnsAreIndexed(array('user_id'))); + $this->assertTrue($table->columnsAreIndexed(['object_id'])); + $this->assertTrue($table->columnsAreIndexed(['user_id'])); $foreignKeys = $table->getForeignKeys(); $this->assertCount(1, $foreignKeys, 'user_id column has to have FK, but not object_id'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php index 178685b39..d1a2e27a9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php @@ -10,9 +10,11 @@ class DDC2175Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2175Entity'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php index 031156dcc..47e6671e8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php @@ -10,10 +10,12 @@ class DDC2182Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->markTestSkipped("This test is useful for all databases, but designed only for mysql."); } - $sql = $this->_schemaTool->getCreateSchemaSql(array( + $sql = $this->_schemaTool->getCreateSchemaSql( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionParent'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionChild'), - )); + ] + ); $this->assertEquals("CREATE TABLE DDC2182OptionParent (id INT UNSIGNED NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB", $sql[0]); $this->assertEquals("CREATE TABLE DDC2182OptionChild (id VARCHAR(255) NOT NULL, parent_id INT UNSIGNED DEFAULT NULL, INDEX IDX_B314D4AD727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB", $sql[1]); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php index 060b6ba33..03d9b8f5d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php @@ -17,10 +17,12 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Bar'), - )); + ] + ); } public function testIssue() @@ -44,7 +46,7 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase $related = $this ->_em ->createQuery('SELECT b FROM '.__NAMESPACE__ . '\DDC2214Bar b WHERE b.id IN(:ids)') - ->setParameter('ids', array($bar)) + ->setParameter('ids', [$bar]) ->getResult(); $query = end($logger->queries); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php index 8c2655d1b..accb24a7a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php @@ -17,10 +17,12 @@ class DDC2230Test extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230Address'), - )); + ] + ); } catch (ToolsException $e) {} } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php index d6ff17c55..1caeffcc7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php @@ -14,9 +14,11 @@ class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2231EntityY'), - )); + ] + ); } public function testInjectObjectManagerInProxyIfInitializedInUow() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php index 491cf3bd6..643c054ab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php @@ -12,18 +12,20 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase private $user; private $merchant; private $membership; - private $privileges = array(); + private $privileges = []; protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252User'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Privilege'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252MerchantAccount'), - )); + ] + ); $this->loadFixtures(); } @@ -56,10 +58,10 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIssue() { - $identifier = array( + $identifier = [ 'merchantAccount' => $this->merchant->getAccountid(), 'userAccount' => $this->user->getUid(), - ); + ]; $class = 'Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'; $membership = $this->_em->find($class, $identifier); @@ -226,4 +228,4 @@ class DDC2252Membership { return $this->privileges; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php index 42aeca43e..2ec88f9f3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php @@ -13,10 +13,12 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256Group') - )); + ] + ); } public function testIssue() @@ -53,7 +55,8 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase // Test ResultSetMappingBuilder. $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('MyNamespace:DDC2256User', 'u'); - $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', array('id' => 'group_id', 'name' => 'group_name')); + $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', ['id' => 'group_id', 'name' => 'group_name'] + ); $this->_em->createNativeQuery($sql, $rsm)->getResult(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php index ca3ee1a50..818443698 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php @@ -16,12 +16,14 @@ class DDC2306Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Zone'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Address'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306UserAddress'), - )); + ] + ); } /** @@ -148,4 +150,4 @@ class DDC2306UserAddress $user->addresses->add($this); $address->users->add($this); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php index 3d2781763..9172904c8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php @@ -22,11 +22,13 @@ class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Bar'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Baz'), - )); + ] + ); $this->logger = new DebugStack(); } @@ -106,4 +108,4 @@ class DDC2346Bar class DDC2346Baz extends DDC2346Bar { -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php index 145b17330..919f74cf7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php @@ -14,10 +14,12 @@ class DDC2350Test extends OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350Bug'), - )); + ] + ); } public function testEagerCollectionsAreOnlyRetrievedOnce() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php index 12be3241a..af51a2d7c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php @@ -27,11 +27,11 @@ class DDC2359Test extends \PHPUnit_Framework_TestCase /* @var $metadataFactory \Doctrine\ORM\Mapping\ClassMetadataFactory|\PHPUnit_Framework_MockObject_MockObject */ $metadataFactory = $this->getMockBuilder(ClassMetadataFactory::class) - ->setMethods(array('newClassMetadataInstance', 'wakeupReflection')) + ->setMethods(['newClassMetadataInstance', 'wakeupReflection']) ->getMock(); $configuration = $this->getMockBuilder(Configuration::class) - ->setMethods(array('getMetadataDriverImpl')) + ->setMethods(['getMetadataDriverImpl']) ->getMock(); $connection = $this->createMock(Connection::class); @@ -62,4 +62,4 @@ class DDC2359Foo { /** @Id @Column(type="integer") @GeneratedValue */ public $id; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php index 3ff5cd9b4..225369739 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php @@ -7,11 +7,13 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityX'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityY'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityZ') - )); + ] + ); } public function testUninitializedProxyIsInitializedOnFetchJoin() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php index f74d4e15c..de4e20589 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2387Test.php @@ -14,15 +14,15 @@ class DDC2387Test extends DatabaseDriverTestCase { $product = new \Doctrine\DBAL\Schema\Table('ddc2387_product'); $product->addColumn('id', 'integer'); - $product->setPrimaryKey(array('id')); + $product->setPrimaryKey(['id']); $attributes = new \Doctrine\DBAL\Schema\Table('ddc2387_attributes'); $attributes->addColumn('product_id', 'integer'); $attributes->addColumn('attribute_name', 'string'); - $attributes->setPrimaryKey(array('product_id', 'attribute_name')); - $attributes->addForeignKeyConstraint('ddc2387_product', array('product_id'), array('product_id')); + $attributes->setPrimaryKey(['product_id', 'attribute_name']); + $attributes->addForeignKeyConstraint('ddc2387_product', ['product_id'], ['product_id']); - $metadata = $this->convertToClassMetadata(array($product, $attributes), array()); + $metadata = $this->convertToClassMetadata([$product, $attributes], []); $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_NONE, $metadata['Ddc2387Attributes']->generatorType); $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_AUTO, $metadata['Ddc2387Product']->generatorType); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php index 0283e6457..aa29b9fea 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php @@ -16,12 +16,14 @@ class DDC2415Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - $this->_em->getConfiguration()->setMetadataDriverImpl(new StaticPHPDriver(array())); + $this->_em->getConfiguration()->setMetadataDriverImpl(new StaticPHPDriver([])); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ParentEntity'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ChildEntity'), - )); + ] + ); } public function testTicket() @@ -57,16 +59,20 @@ class DDC2415ParentEntity public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array ( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'string', - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM); - $metadata->setCustomGeneratorDefinition(array( + $metadata->setCustomGeneratorDefinition( + [ 'class' => 'Doctrine\Tests\ORM\Functional\Ticket\DDC2415Generator' - )); + ] + ); $metadata->isMappedSuperclass = true; } @@ -88,10 +94,12 @@ class DDC2415ChildEntity extends DDC2415ParentEntity public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array ( + $metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php index b5a09f922..7590a14f1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php @@ -15,14 +15,16 @@ class DDC2494Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - DDC2494TinyIntType::$calls = array(); + DDC2494TinyIntType::$calls = []; Type::addType('ddc2494_tinyint', __NAMESPACE__ . '\DDC2494TinyIntType'); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC2494Currency::CLASSNAME), $this->_em->getClassMetadata(DDC2494Campaign::CLASSNAME), - )); + ] + ); } public function testIssue() @@ -160,7 +162,7 @@ class DDC2494Campaign class DDC2494TinyIntType extends Type { - public static $calls = array(); + public static $calls = []; /** * {@inheritdoc} @@ -177,11 +179,11 @@ class DDC2494TinyIntType extends Type { $return = (string) $value; - self::$calls[__FUNCTION__][] = array( + self::$calls[__FUNCTION__][] = [ 'value' => $value, 'return' => $return, 'platform' => $platform, - ); + ]; return $return; } @@ -193,11 +195,11 @@ class DDC2494TinyIntType extends Type { $return = (integer) $value; - self::$calls[__FUNCTION__][] = array( + self::$calls[__FUNCTION__][] = [ 'value' => $value, 'return' => $return, 'platform' => $platform, - ); + ]; return $return; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php index 2f6b406d3..771b8b801 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php @@ -7,19 +7,21 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; */ class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase { - private $rootsEntities = array(); - private $aEntities = array(); - private $bEntities = array(); + private $rootsEntities = []; + private $aEntities = []; + private $bEntities = []; protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575Root'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575A'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575B'), - )); + ] + ); $entityRoot1 = new DDC2575Root(1); $entityB1 = new DDC2575B(2); @@ -61,7 +63,7 @@ class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase $query = $qb->getQuery(); $result = $query->getResult(); - + $this->assertCount(2, $result); $row = $result[0]; @@ -157,4 +159,4 @@ class DDC2575B $this->id = $id; $this->sampleField = $value; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php index fe68ff564..f80eba96c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php @@ -17,11 +17,13 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase Type::addType(DDC2579Type::NAME, DDC2579Type::CLASSNAME); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC2579Entity::CLASSNAME), $this->_em->getClassMetadata(DDC2579EntityAssoc::CLASSNAME), $this->_em->getClassMetadata(DDC2579AssocAssoc::CLASSNAME), - )); + ] + ); } public function testIssue() @@ -36,7 +38,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($assocAssoc); $this->_em->persist($entity); $this->_em->flush(); - + $entity->value++; $this->_em->persist($entity); @@ -45,7 +47,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase $id = $entity->id; $value = $entity->value; - $criteria = array('assoc' => $assoc, 'id' => $id); + $criteria = ['assoc' => $assoc, 'id' => $id]; $entity = $repository->findOneBy($criteria); $this->assertInstanceOf(DDC2579Entity::CLASSNAME, $entity); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index d9dca3752..e0cd3257b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -9,12 +9,14 @@ class DDC258Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Super'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class2'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class3'), - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php index 2ec46ba29..0a542b1af 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php @@ -17,11 +17,13 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Product'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Customer'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder') - )); + ] + ); } catch(\Exception $e) { return; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php index 437f89ffb..ff4739e48 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php @@ -18,9 +18,11 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2692Foo'), - )); + ] + ); } catch(\Exception $e) { return; } @@ -30,7 +32,7 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIsListenerCalledOnlyOnceOnPreFlush() { $listener = $this->getMockBuilder(DDC2692Listener::class) - ->setMethods(array('preFlush')) + ->setMethods(['preFlush']) ->getMock(); $listener->expects($this->once())->method('preFlush'); @@ -56,7 +58,7 @@ class DDC2692Foo class DDC2692Listener implements EventSubscriber { public function getSubscribedEvents() { - return array(\Doctrine\ORM\Events::preFlush); + return [\Doctrine\ORM\Events::preFlush]; } public function preFlush(PreFlushEventArgs $args) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php index 6198663e6..1ebb4e9c1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php @@ -15,12 +15,14 @@ class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Qualification'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Category'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759QualificationMetadata'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759MetadataCategory'), - )); + ] + ); } catch(\Exception $e) { return; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php index e98ff91a3..efc7a6286 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php @@ -15,12 +15,14 @@ class DDC2775Test extends OrmFunctionalTestCase { parent::setUp(); - $this->setUpEntitySchema(array( + $this->setUpEntitySchema( + [ 'Doctrine\Tests\ORM\Functional\Ticket\User', 'Doctrine\Tests\ORM\Functional\Ticket\Role', 'Doctrine\Tests\ORM\Functional\Ticket\AdminRole', 'Doctrine\Tests\ORM\Functional\Ticket\Authorization', - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php index 2f1be3d32..499b85b68 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php @@ -7,12 +7,14 @@ class DDC279Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityXAbstract'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityX'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityY'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityZ'), - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php index 87c94cb84..d5b287a73 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php @@ -67,7 +67,7 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testPersistenceOfEntityWithSchemaMapping($className) { try { - $this->_schemaTool->createSchema(array($this->_em->getClassMetadata($className))); + $this->_schemaTool->createSchema([$this->_em->getClassMetadata($className)]); } catch (ToolsException $e) { // table already exists } @@ -86,11 +86,11 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function getTestedClasses() { - return array( - array(ExplicitSchemaAndTable::CLASSNAME, 'explicit_schema', 'explicit_table'), - array(SchemaAndTableInTableName::CLASSNAME, 'implicit_schema', 'implicit_table'), - array(DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'), - ); + return [ + [ExplicitSchemaAndTable::CLASSNAME, 'explicit_schema', 'explicit_table'], + [SchemaAndTableInTableName::CLASSNAME, 'implicit_schema', 'implicit_table'], + [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'], + ]; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php index 28535a3d7..d772e441c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php @@ -16,10 +16,12 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC2862User::CLASSNAME), $this->_em->getClassMetadata(DDC2862Driver::CLASSNAME), - )); + ] + ); } catch (ToolsException $exc) { } } @@ -34,8 +36,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId()))); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId()))); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); $driver2 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); @@ -49,8 +51,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId()))); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId()))); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); $driver3 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); @@ -75,8 +77,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getCache()->evictEntityRegion(DDC2862User::CLASSNAME); $this->_em->getCache()->evictEntityRegion(DDC2862Driver::CLASSNAME); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId()))); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId()))); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); $driver2 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); @@ -87,8 +89,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, array('id' => $user1->getId()))); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, array('id' => $driver1->getId()))); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); $driver3 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php index 5eece3f9b..7f8451a29 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php @@ -13,9 +13,11 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895'), - )); + ] + ); } catch(\Exception $e) { } @@ -26,10 +28,10 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895'); $this->assertEquals( - array( - "prePersist" => array("setLastModifiedPreUpdate"), - "preUpdate" => array("setLastModifiedPreUpdate"), - ), + [ + "prePersist" => ["setLastModifiedPreUpdate"], + "preUpdate" => ["setLastModifiedPreUpdate"], + ], $cm->lifecycleCallbacks ); @@ -109,4 +111,4 @@ class DDC2895 extends AbstractDDC2895 { return $this->id; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php index 8923f2764..ff494225f 100755 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php @@ -14,9 +14,11 @@ class DDC2931Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2931User'), - )); + ] + ); } catch (\Exception $e) { // no action needed - schema seems to be already in place } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php index 19439c143..bf685328f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php @@ -15,18 +15,20 @@ class DDC2984Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - + if ( ! Type::hasType('ddc2984_domain_user_id')) { Type::addType( - 'ddc2984_domain_user_id', + 'ddc2984_domain_user_id', __NAMESPACE__ . '\DDC2984UserIdCustomDbalType' ); } try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2984User'), - )); + ] + ); } catch (\Exception $e) { // no action needed - schema seems to be already in place } @@ -36,10 +38,10 @@ class DDC2984Test extends \Doctrine\Tests\OrmFunctionalTestCase { $user = new DDC2984User(new DDC2984DomainUserId('unique_id_within_a_vo')); $user->applyName('Alex'); - + $this->_em->persist($user); $this->_em->flush($user); - + $repository = $this->_em->getRepository(__NAMESPACE__ . "\DDC2984User"); $sameUser = $repository->find(new DDC2984DomainUserId('unique_id_within_a_vo')); @@ -154,7 +156,7 @@ class DDC2984DomainUserId { return $this->toString() === $other->toString(); } -} +} /** * Class DDC2984UserIdCustomDbalType @@ -196,4 +198,4 @@ class DDC2984UserIdCustomDbalType extends StringType return $value->toString(); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php index 09d7415d2..897d3bfdf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php @@ -9,10 +9,12 @@ class DDC2996Test extends \Doctrine\Tests\OrmFunctionalTestCase { public function testIssue() { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996UserPreference'), - )); + ] + ); $pref = new DDC2996UserPreference(); $pref->user = new DDC2996User(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php index e79551191..153457805 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php @@ -12,10 +12,12 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase { public function testIssue() { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033Product'), - )); + ] + ); $user = new DDC3033User(); $user->name = "Test User"; @@ -38,12 +40,12 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($product); $this->_em->flush(); - $expect = array( - 'title' => array( + $expect = [ + 'title' => [ 0 => 'Test product', 1 => 'Test Change title', - ), - ); + ], + ]; $this->assertEquals($expect, $product->changeSet); } @@ -55,7 +57,7 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC3033Product { - public $changeSet = array(); + public $changeSet = []; /** * @var int $id diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php index fe84e11ff..222b30fc0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php @@ -13,10 +13,12 @@ class DDC3042Test extends OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Foo'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Bar'), - )); + ] + ); } public function testSQLGenerationDoesNotProvokeAliasCollisions() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php index d43e35563..83eb50aa9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php @@ -8,7 +8,7 @@ use Doctrine\Tests\Models\Taxi\Ride; /** * @group DDC-3068 - * + * * @author Giorgio Premi */ class DDC3068Test extends \Doctrine\Tests\OrmFunctionalTestCase @@ -40,17 +40,19 @@ class DDC3068Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindUsingAnArrayOfObjectAsPrimaryKey() { - $ride1 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', array( + $ride1 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [ 'driver' => $this->foo->getId(), - 'car' => $this->merc->getBrand()) + 'car' => $this->merc->getBrand() + ] ); $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride1); - $ride2 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', array( + $ride2 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [ 'driver' => $this->foo, 'car' => $this->merc - )); + ] + ); $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride2); $this->assertSame($ride1, $ride2); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php index 402c4374a..4d5583c75 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php @@ -9,10 +9,12 @@ class DDC309Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309Country'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309User'), - )); + ] + ); } public function testTwoIterateHydrations() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php index 7f82e6c89..515aa9feb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php @@ -26,10 +26,10 @@ class DDC3123Test extends \Doctrine\Tests\OrmFunctionalTestCase $user->username = 'ocramius'; $this->_em->persist($user); - $uow->scheduleExtraUpdate($user, array('name' => 'changed name')); + $uow->scheduleExtraUpdate($user, ['name' => 'changed name']); $listener = $this->getMockBuilder(\stdClass::class) - ->setMethods(array(Events::postFlush)) + ->setMethods([Events::postFlush]) ->getMock(); $listener diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php index 4924d39f9..92f2c1b27 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -18,12 +18,12 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( - array( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntityJoined'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductJoined'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntitySingleTable'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductSingleTable'), - ) + ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php index da6a8de1d..79dd4267e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php @@ -25,10 +25,12 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase Type::addType('ddc3192_currency_code', __NAMESPACE__ . '\DDC3192CurrencyCode'); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC3192Currency::CLASSNAME), $this->_em->getClassMetadata(DDC3192Transaction::CLASSNAME), - )); + ] + ); } public function testIssue() @@ -130,9 +132,9 @@ class DDC3192Transaction class DDC3192CurrencyCode extends Type { - private static $map = array( + private static $map = [ 'BYR' => 974, - ); + ]; /** * {@inheritdoc} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php index 541221aa0..be2c58617 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php @@ -15,12 +15,14 @@ class DDC3223Test extends OrmFunctionalTestCase { parent::setUp(); - $this->setUpEntitySchema(array( + $this->setUpEntitySchema( + [ 'Doctrine\Tests\ORM\Functional\Ticket\Journalist', 'Doctrine\Tests\ORM\Functional\Ticket\Participant', 'Doctrine\Tests\ORM\Functional\Ticket\Status', 'Doctrine\Tests\ORM\Functional\Ticket\ProfileStatus', - )); + ] + ); } public function testIssueGetId() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php index b7905ca3d..8014ae6f8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php @@ -16,20 +16,22 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase $resolveTargetEntity->addResolveTargetEntity( DDC3300BossInterface::INTERFACENAME, DDC3300Boss::CLASSNAME, - array() + [] ); $resolveTargetEntity->addResolveTargetEntity( DDC3300EmployeeInterface::INTERFACENAME, DDC3300Employee::CLASSNAME, - array() + [] ); $this->_em->getEventManager()->addEventSubscriber($resolveTargetEntity); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC3300Person::CLASSNAME), - )); + ] + ); $boss = new DDC3300Boss(); $employee = new DDC3300Employee(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php index a5ed25770..9edf58170 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php @@ -16,10 +16,12 @@ class DDC3330Test extends OrmFunctionalTestCase { parent::setUp(); - $this->setUpEntitySchema(array( + $this->setUpEntitySchema( + [ 'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Building', 'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Hall', - )); + ] + ); } public function testIssueCollectionOrderWithPaginator() @@ -29,7 +31,7 @@ class DDC3330Test extends OrmFunctionalTestCase $this->createBuildingAndHalls(); $this->_em->clear(); - + $query = $this->_em->createQuery( 'SELECT b, h'. ' FROM Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Building b'. @@ -37,32 +39,32 @@ class DDC3330Test extends OrmFunctionalTestCase ' ORDER BY b.id ASC, h.name DESC' ) ->setMaxResults(3); - + $paginator = new Paginator($query, true); - + /*foreach ($paginator as $building) { echo 'BUILDING ID: '.$building->id."\n"; foreach ($building->halls as $hall) { echo ' - HALL: '.$hall->id.' - '.$hall->name."\n"; } }*/ - + $this->assertEquals(3, count(iterator_to_array($paginator)), 'Count is not correct for pagination'); } - + /** * Create a building and 10 halls */ private function createBuildingAndHalls() { $building = new DDC3330_Building(); - + for ($i = 0; $i < 10; $i++) { $hall = new DDC3330_Hall(); $hall->name = 'HALL-'.$i; $building->addHall($hall); } - + $this->_em->persist($building); $this->_em->flush(); } @@ -78,7 +80,7 @@ class DDC3330_Building * @GeneratedValue */ public $id; - + /** * @OneToMany(targetEntity="DDC3330_Hall", mappedBy="building", cascade={"persist"}) */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php index ba286da24..85b2086c7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php @@ -23,7 +23,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase { /* @var DDC3346Author $author */ $author = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findOneBy( - array('username' => 'bwoogy') + ['username' => 'bwoogy'] ); $this->assertCount(2, $author->articles); @@ -33,7 +33,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase { /* @var DDC3346Author[] $authors */ $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy( - array('username' => 'bwoogy'), + ['username' => 'bwoogy'], null, 1 ); @@ -46,7 +46,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase { /* @var DDC3346Author[] $authors */ $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy( - array('username' => 'bwoogy'), + ['username' => 'bwoogy'], null, null, 0 // using an explicitly defined offset diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php index 255790d7c..ea4c37722 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php @@ -8,11 +8,13 @@ class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Group'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Membership'), - )); + ] + ); } public function testTwoIterateHydrations() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php index 03d28bb2e..5d9e8a014 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php @@ -10,10 +10,12 @@ class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353File'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353Picture'), - )); + ] + ); } catch(\Exception $ignored) {} } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php index e6f25b852..b4bb7891c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php @@ -13,11 +13,13 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(DDC3597Root::CLASSNAME), $this->_em->getClassMetadata(DDC3597Media::CLASSNAME), $this->_em->getClassMetadata(DDC3597Image::CLASSNAME) - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php index 46eeeab74..f4e338eac 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php @@ -16,12 +16,14 @@ class DDC3644Test extends OrmFunctionalTestCase { parent::setUp(); - $this->setUpEntitySchema(array( + $this->setUpEntitySchema( + [ 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644User', 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Address', 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Animal', 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Pet', - )); + ] + ); } /** @@ -33,7 +35,7 @@ class DDC3644Test extends OrmFunctionalTestCase $current = new DDC3644Address('Sao Paulo, SP, Brazil'); $previous = new DDC3644Address('Rio de Janeiro, RJ, Brazil'); $initial = new DDC3644Address('Sao Carlos, SP, Brazil'); - $addresses = new ArrayCollection(array($current, $previous, $initial)); + $addresses = new ArrayCollection([$current, $previous, $initial]); $user = new DDC3644User(); $user->name = 'Guilherme Blanco'; @@ -53,7 +55,7 @@ class DDC3644Test extends OrmFunctionalTestCase // Replace entire collection (this should trigger OneToManyPersister::remove()) $current = new DDC3644Address('Toronto, ON, Canada'); - $addresses = new ArrayCollection(array($current)); + $addresses = new ArrayCollection([$current]); $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); $user->setAddresses($addresses); @@ -84,7 +86,7 @@ class DDC3644Test extends OrmFunctionalTestCase // Define initial dataset $actual = new DDC3644Pet('Catharina'); $past = new DDC3644Pet('Nanny'); - $pets = new ArrayCollection(array($actual, $past)); + $pets = new ArrayCollection([$actual, $past]); $user = new DDC3644User(); $user->name = 'Guilherme Blanco'; @@ -103,7 +105,7 @@ class DDC3644Test extends OrmFunctionalTestCase // Replace entire collection (this should trigger OneToManyPersister::remove()) $actual = new DDC3644Pet('Valentina'); - $pets = new ArrayCollection(array($actual)); + $pets = new ArrayCollection([$actual]); $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); $user->setPets($pets); @@ -242,4 +244,4 @@ class DDC3644Pet extends DDC3644Animal * @JoinColumn(referencedColumnName="hash_id") */ public $owner; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php index 60d872b4a..6a08b49bc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php @@ -23,8 +23,8 @@ class DDC3711Test extends YamlMappingDriverTest $entityA = new ClassMetadata('Doctrine\Tests\Models\DDC3711\DDC3711EntityA'); $entityA = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3711\DDC3711EntityA'); - $this->assertEquals(array('link_a_id1' => "id1", 'link_a_id2' => "id2"), $entityA->associationMappings['entityB']['relationToSourceKeyColumns']); - $this->assertEquals(array('link_b_id1' => "id1", 'link_b_id2' => "id2"), $entityA->associationMappings['entityB']['relationToTargetKeyColumns']); + $this->assertEquals(['link_a_id1' => "id1", 'link_a_id2' => "id2"], $entityA->associationMappings['entityB']['relationToSourceKeyColumns']); + $this->assertEquals(['link_b_id1' => "id1", 'link_b_id2' => "id2"], $entityA->associationMappings['entityB']['relationToTargetKeyColumns']); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php index 37e94c542..f7013d6d8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php @@ -12,10 +12,12 @@ class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Parent'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Child') - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php index 4940c8abc..f5b8cac01 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php @@ -15,11 +15,13 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase Type::addType('ddc3785_asset_id', __NAMESPACE__ . '\\DDC3785_AssetIdType'); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Asset'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_AssetId'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Attribute') - )); + ] + ); } catch(\Exception $e) { } } @@ -30,10 +32,10 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testOwningValueObjectIdIsCorrectlyTransformedWhenRemovingOrphanedChildEntities() { $id = new DDC3785_AssetId("919609ba-57d9-4a13-be1d-d202521e858a"); - $attributes = array( - $attribute1 = new DDC3785_Attribute("foo1", "bar1"), + $attributes = [ + $attribute1 = new DDC3785_Attribute("foo1", "bar1"), $attribute2 = new DDC3785_Attribute("foo2", "bar2") - ); + ]; $this->_em->persist($asset = new DDC3785_Asset($id, $attributes)); $this->_em->flush(); @@ -64,7 +66,7 @@ class DDC3785_Asset **/ private $attributes; - public function __construct(DDC3785_AssetId $id, $attributes = array()) + public function __construct(DDC3785_AssetId $id, $attributes = []) { $this->id = $id; $this->attributes = new ArrayCollection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php index eb3b77f56..2bf52eb34 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php @@ -9,9 +9,11 @@ class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC381Entity'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php index 07f374b36..0325e1175 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php @@ -8,11 +8,13 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Guest'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Customer'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Contact') - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php index d3d3e27ba..e6389ebf9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php @@ -8,10 +8,12 @@ class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Entity'), //$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Other') - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php index f4f944ad5..7fa7b58bd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php @@ -9,10 +9,12 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Client') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php index 58ac8f20a..2615e37c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php @@ -8,9 +8,11 @@ class DDC444Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC444User'), - )); + ] + ); } public function testExplicitPolicy() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php index 3688a80d8..41d1fdee6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php @@ -9,11 +9,13 @@ class DDC448Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448MainTable'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448ConnectedClass'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448SubTable'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php index 1a8384f7d..5aebed107 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php @@ -7,11 +7,13 @@ class DDC493Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Customer'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Distributor'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Contact') - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php index 45c202ee5..3763b15d7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php @@ -89,13 +89,13 @@ class DDC501Test extends OrmFunctionalTestCase $user->username = 'lukacho'; $user->status = 'developer'; - foreach(array(1111,2222,3333,4444) as $number) { + foreach([1111,2222,3333,4444] as $number) { $phone = new CmsPhonenumber; $phone->phonenumber = $number; $user->addPhonenumber($phone); } - foreach(array('Moshers', 'Headbangers') as $groupName) { + foreach(['Moshers', 'Headbangers'] as $groupName) { $group = new CmsGroup; $group->setName($groupName); $user->addGroup($group); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php index c6d792d39..4cc5aee8c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php @@ -9,11 +9,13 @@ class DDC512Test extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Customer'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512OfferItem'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Item'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php index 36bb29c74..11a7d2f6f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php @@ -7,11 +7,13 @@ class DDC513Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513OfferItem'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Item'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Price'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index f87216a55..d8592b482 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -12,11 +12,13 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Customer'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Cart'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522ForeignKeyTest') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php index 50f96968d..f205ae697 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php @@ -7,10 +7,12 @@ class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531Item'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531SubItem'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php index b5ace06b0..055438359 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php @@ -7,9 +7,11 @@ class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC588Site'), - )); + ] + ); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php index ed91bd59d..fb596da52 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php @@ -9,11 +9,13 @@ class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Item'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Subitem'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Child'), - )); + ] + ); } catch (\Exception $ignored) {} } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php index 165a42b6d..5d5a6ac1e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php @@ -11,10 +11,12 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Author'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Book') - )); + ] + ); // Create author 10/Joe with two books 22/JoeA and 20/JoeB $author = new DDC618Author(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php index 0a538ee3e..b88b1b154 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php @@ -8,10 +8,12 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Patient'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Appointment'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php index eb368cd89..2ebffe340 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php @@ -8,9 +8,11 @@ class DDC656Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC656Entity') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php index cf15770a8..c9bb3f09e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php @@ -8,10 +8,12 @@ class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Role'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Privilege') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php index 428fe057a..1ae26394c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php @@ -8,9 +8,11 @@ class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC719Group'), - )); + ] + ); } public function testIsEmptySqlGeneration() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php index 0dc89a3b3..730eb99ee 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php @@ -10,10 +10,12 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em); - $schemaTool->createSchema(array( + $schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729A'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729B'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php index 41f7b293b..61babe8e6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php @@ -10,10 +10,12 @@ class DDC735Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Product'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Review') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php index a93c91c7e..5141e9f3a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php @@ -41,7 +41,7 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $cart2); $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer()); $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart2->getCustomer()); - $this->assertEquals(array('name' => 'roman', 'payment' => 'cash'), $result); + $this->assertEquals(['name' => 'roman', 'payment' => 'cash'], $result); } /** @@ -65,7 +65,8 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = "select c, c.name, ca, ca.payment from Doctrine\Tests\Models\ECommerce\ECommerceCart ca join ca.customer c"; $result = $this->_em->createQuery($dql) - ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Functional\Ticket\DisableFetchJoinTreeWalker')) + ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\Ticket\DisableFetchJoinTreeWalker'] + ) ->getResult(); /* @var $cart2 Doctrine\Tests\Models\ECommerce\ECommerceCart */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index 46dddff6b..773ad06a8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php @@ -25,10 +25,12 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getMetadataFactory()->setCacheDriver(new FilesystemCache($testDir)); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742Comment') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php index bcf72e4e9..8420db132 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php @@ -48,7 +48,7 @@ class DDC767Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotNull($pUser, "User not retrieved from database."); - $groups = array($group2->id, $group3->id); + $groups = [$group2->id, $group3->id]; try { $this->_em->beginTransaction(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php index a88bbad81..f6d7b95b9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php @@ -7,31 +7,33 @@ class DDC809Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809Variant'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809SpecificationValue') - )); + ] + ); $conn = $this->_em->getConnection(); - $conn->insert('specification_value_test', array('specification_value_id' => 94589)); - $conn->insert('specification_value_test', array('specification_value_id' => 94593)); - $conn->insert('specification_value_test', array('specification_value_id' => 94606)); - $conn->insert('specification_value_test', array('specification_value_id' => 94607)); - $conn->insert('specification_value_test', array('specification_value_id' => 94609)); - $conn->insert('specification_value_test', array('specification_value_id' => 94711)); + $conn->insert('specification_value_test', ['specification_value_id' => 94589]); + $conn->insert('specification_value_test', ['specification_value_id' => 94593]); + $conn->insert('specification_value_test', ['specification_value_id' => 94606]); + $conn->insert('specification_value_test', ['specification_value_id' => 94607]); + $conn->insert('specification_value_test', ['specification_value_id' => 94609]); + $conn->insert('specification_value_test', ['specification_value_id' => 94711]); - $conn->insert('variant_test', array('variant_id' => 545208)); - $conn->insert('variant_test', array('variant_id' => 545209)); + $conn->insert('variant_test', ['variant_id' => 545208]); + $conn->insert('variant_test', ['variant_id' => 545209]); - $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94606)); - $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94607)); - $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94609)); - $conn->insert('var_spec_value_test', array('variant_id' => 545208, 'specification_value_id' => 94711)); + $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94606]); + $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94607]); + $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94609]); + $conn->insert('var_spec_value_test', ['variant_id' => 545208, 'specification_value_id' => 94711]); - $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94589)); - $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94593)); - $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94606)); - $conn->insert('var_spec_value_test', array('variant_id' => 545209, 'specification_value_id' => 94607)); + $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94589]); + $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94593]); + $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94606]); + $conn->insert('var_spec_value_test', ['variant_id' => 545209, 'specification_value_id' => 94607]); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php index 219aed48d..6e7d4ea2c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php @@ -14,11 +14,13 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger()); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedIndex'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedTreeIndex'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832Like'), - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php index ef4484ee7..5cb8f925a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php @@ -7,13 +7,15 @@ class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Super'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class1'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class2'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class3'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Aggregate'), - )); + ] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php index 22e39f849..5bbeca210 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php @@ -10,11 +10,13 @@ class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonenumber'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonecall'), - )); + ] + ); } catch (\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php index a1634fe5d..7e10c2c2c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php @@ -29,8 +29,12 @@ class DDC949Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => true)); - $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => false)); + $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy( + ['booleanField' => true] + ); + $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy( + ['booleanField' => false] + ); $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true, "True model not found"); $this->assertTrue($true->booleanField, "True Boolean Model should be true."); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php index b1432ec8b..7f9167601 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php @@ -10,10 +10,12 @@ class DDC960Test extends OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Root'), $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Child') - )); + ] + ); } catch(\Exception $e) { } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php index 25363b0b3..e8849e10f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php @@ -13,11 +13,13 @@ class DDC992Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Role'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Parent'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Child'), - )); + ] + ); } catch(\Exception $e) { } @@ -65,7 +67,7 @@ class DDC992Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, count($parent->childs)); $this->assertEquals(0, count($parent->childs[0]->childs())); - $child = $parentRepository->findOneBy(array("id" => $child->id)); + $child = $parentRepository->findOneBy(["id" => $child->id]); $this->assertSame($parent->childs[0], $child); $this->_em->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php index b42dd6534..b7a748ddc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php @@ -15,11 +15,13 @@ class GH5762Test extends OrmFunctionalTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(GH5762Driver::class), $this->_em->getClassMetadata(GH5762DriverRide::class), $this->_em->getClassMetadata(GH5762Car::class), - )); + ] + ); } public function testIssue() @@ -31,7 +33,7 @@ class GH5762Test extends OrmFunctionalTestCase self::assertInstanceOf(GH5762DriverRide::class, $result->driverRides->get(0)); self::assertInstanceOf(GH5762Car::class, $result->driverRides->get(0)->car); - $cars = array(); + $cars = []; foreach ($result->driverRides as $ride) { $cars[] = $ride->car->brand; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php index 91521b5d5..86a7d641f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php @@ -9,9 +9,11 @@ class Ticket2481Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Ticket2481Product') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php index d9ac1cc6a..d04ac2730 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php @@ -14,11 +14,13 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase { { parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Lemma'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Relation'), $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\RelationType') - )); + ] + ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index c27e0dee6..a8afcf8ca 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -78,7 +78,7 @@ class TypeTest extends OrmFunctionalTestCase $dql = "SELECT s FROM Doctrine\Tests\Models\Generic\SerializationModel s"; $serialize = $this->_em->createQuery($dql)->getSingleResult(); - $this->assertEquals(array("foo" => "bar", "bar" => "baz"), $serialize->array); + $this->assertEquals(["foo" => "bar", "bar" => "baz"], $serialize->array); } public function testObject() @@ -125,7 +125,8 @@ class TypeTest extends OrmFunctionalTestCase $this->assertInstanceOf('DateTime', $dateTimeDb->datetime); $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); - $articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( array( 'datetime' => new \DateTime( "now" ) ) ); + $articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( ['datetime' => new \DateTime( "now" )] + ); $this->assertEquals( 0, count( $articles ) ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php index d5d559a4f..c722771da 100644 --- a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php @@ -15,9 +15,11 @@ class UUIDGeneratorTest extends OrmFunctionalTestCase $this->markTestSkipped('Currently restricted to MySQL platform.'); } - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\UUIDEntity') - )); + ] + ); } public function testGenerateUUID() diff --git a/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php index 3e8285e8f..8c4c500e7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php @@ -68,7 +68,7 @@ class UnitOfWorkLifecycleTest extends OrmFunctionalTestCase $this->expectException(ORMInvalidArgumentException::class); $this->expectExceptionMessage("The given entity of type 'Doctrine\Tests\Models\CMS\CmsUser' (Doctrine\Tests\Models\CMS\CmsUser@"); - $this->_em->getUnitOfWork()->registerManaged($user, array(), array()); + $this->_em->getUnitOfWork()->registerManaged($user, [], []); } public function testMarkReadOnlyNonManaged() @@ -80,4 +80,4 @@ class UnitOfWorkLifecycleTest extends OrmFunctionalTestCase $this->_em->getUnitOfWork()->markReadOnly($user); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php index a6ad68d0a..1094da877 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php @@ -81,7 +81,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -106,7 +106,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -132,7 +132,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => $auxiliary) + ['id1' => 'def', 'foreignEntity' => $auxiliary] ); $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', $inversed); @@ -158,7 +158,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $this->assertCount(1, $inversed->associatedEntities); @@ -176,7 +176,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); foreach ($inversed->associatedEntities as $owning) { diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php index 327791648..c7470a198 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php @@ -68,7 +68,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -87,7 +87,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -120,7 +120,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $this->assertCount(1, $inversed->associatedEntities); @@ -138,7 +138,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); foreach ($inversed->associatedEntities as $owning) { diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php index e899fbeb8..eb3de5f12 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php @@ -79,7 +79,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -104,7 +104,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -130,7 +130,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => $auxiliary) + ['id1' => 'def', 'foreignEntity' => $auxiliary] ); $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', $inversed); @@ -160,7 +160,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $this->assertCount(1, $inversed->associatedEntities); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php index eabf26a80..f68084eb5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php @@ -66,7 +66,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -85,7 +85,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -120,7 +120,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $this->assertCount(1, $inversed->associatedEntities); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php index 762cad2ee..e527ee2ef 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php @@ -78,7 +78,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -103,7 +103,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( @@ -129,7 +129,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => $auxiliary) + ['id1' => 'def', 'foreignEntity' => $auxiliary] ); $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', $inversed); @@ -157,7 +157,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - array('id1' => 'def', 'foreignEntity' => 'abc') + ['id1' => 'def', 'foreignEntity' => 'abc'] ); $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', $inversed->associatedEntity); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php index a179ab61a..2f944f235 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php @@ -65,7 +65,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -84,7 +84,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( @@ -119,7 +119,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase { $inversed = $this->_em->find( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', - array('id1' => 'abc', 'id2' => 'def') + ['id1' => 'abc', 'id2' => 'def'] ); $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $inversed->associatedEntity); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php index 47e98d25c..02b4748be 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php @@ -15,14 +15,16 @@ class ValueObjectsTest extends OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Person'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Address'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Vehicle'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'), - )); + ] + ); } catch(\Exception $e) { } } @@ -175,35 +177,35 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->clear(); $this->assertNull($this->_em->find(__NAMESPACE__.'\\DDC93Person', $person->id)); } - + public function testPartialDqlOnEmbeddedObjectsField() { $person = new DDC93Person('Karl', new DDC93Address('Foo', '12345', 'Gosport', new DDC93Country('England'))); $this->_em->persist($person); $this->_em->flush($person); $this->_em->clear(); - + // Prove that the entity was persisted correctly. $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name"; - + $person = $this->_em->createQuery($dql) ->setParameter('name', 'Karl') ->getSingleResult(); - + $this->assertEquals('Gosport', $person->address->city); $this->assertEquals('Foo', $person->address->street); $this->assertEquals('12345', $person->address->zip); $this->assertEquals('England', $person->address->country->name); - + // Clear the EM and prove that the embeddable can be the subject of a partial query. $this->_em->clear(); - + $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name"; - + $person = $this->_em->createQuery($dql) ->setParameter('name', 'Karl') ->getSingleResult(); - + // Selected field must be equal, all other fields must be null. $this->assertEquals('Gosport', $person->address->city); $this->assertNull($person->address->street); @@ -213,13 +215,13 @@ class ValueObjectsTest extends OrmFunctionalTestCase // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions. $this->_em->clear(); - + $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name"; - + $person = $this->_em->createQuery($dql) ->setParameter('name', 'Karl') ->getSingleResult(); - + // Selected field must be equal, all other fields must be null. $this->assertEquals('Gosport', $person->address->city); $this->assertNull($person->address->street); @@ -236,7 +238,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL") ->execute(); } - + public function testPartialDqlWithNonExistentEmbeddableField() { $this->expectException(QueryException::class); @@ -310,17 +312,19 @@ class ValueObjectsTest extends OrmFunctionalTestCase ) ); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName), - )); + ] + ); } public function getInfiniteEmbeddableNestingData() { - return array( - array('DDCInfiniteNestingEmbeddable', 'DDCInfiniteNestingEmbeddable'), - array('DDCNestingEmbeddable1', 'DDCNestingEmbeddable4'), - ); + return [ + ['DDCInfiniteNestingEmbeddable', 'DDCInfiniteNestingEmbeddable'], + ['DDCNestingEmbeddable1', 'DDCNestingEmbeddable4'], + ]; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php index f354be600..0fef61a48 100644 --- a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php @@ -22,10 +22,10 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( - array( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'), $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity') - ) + ] ); } catch (ORMException $e) { } @@ -51,10 +51,10 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase $this->_em->flush(); $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity') - ->findOneBy(array('name' => 'Fred')); + ->findOneBy(['name' => 'Fred']); $secondEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity') - ->findOneBy(array('name' => 'Bob')); + ->findOneBy(['name' => 'Bob']); $this->assertSame($firstRelatedEntity, $firstEntity); $this->assertSame($secondRelatedEntity, $secondEntity); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php index 0942a6051..4763ded58 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php @@ -9,12 +9,12 @@ class ArrayHydratorTest extends HydrationTestCase { public function provideDataForUserEntityResult() { - return array( - array(0), - array('user'), - array('scalars'), - array('newObjects'), - ); + return [ + [0], + ['user'], + ['scalars'], + ['newObjects'], + ]; } /** @@ -30,16 +30,16 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -72,18 +72,18 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 's__id' => '1', 's__name' => 'romanb', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 's__id' => '2', 's__name' => 'jwage', 'sclr0' => 'JWAGE', - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -122,16 +122,16 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -165,20 +165,20 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -215,20 +215,20 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -269,20 +269,20 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -323,20 +323,20 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -379,19 +379,19 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'numPhones', 'integer'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => '2', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => '1', - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -435,27 +435,27 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -508,27 +508,27 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addIndexBy('p', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); @@ -593,57 +593,57 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', 'a__id' => '1', 'a__topic' => 'Getting things done!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', 'a__id' => '1', 'a__topic' => 'Getting things done!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', 'a__id' => '2', 'a__topic' => 'ZendCon' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', 'a__id' => '2', 'a__topic' => 'ZendCon' - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91', 'a__id' => '3', 'a__topic' => 'LINQ' - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91', 'a__id' => '4', 'a__topic' => 'PHP7' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -720,9 +720,9 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('c', 'c__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -731,8 +731,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'Getting things done!', 'c__id' => '1', 'c__topic' => 'First!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -741,8 +741,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'Getting things done!', 'c__id' => '1', 'c__topic' => 'First!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -751,8 +751,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'ZendCon', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -761,8 +761,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'ZendCon', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', @@ -771,8 +771,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'LINQ', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', @@ -781,8 +781,8 @@ class ArrayHydratorTest extends HydrationTestCase 'a__topic' => 'PHP7', 'c__id' => null, 'c__topic' => null - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -863,40 +863,40 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('b', 'b__position', 'position'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '1', 'b__position' => '0', //'b__category_id' => '1' - ), - array( + ], + [ 'c__id' => '2', 'c__position' => '0', 'c__name' => 'Second', 'b__id' => '2', 'b__position' => '0', //'b__category_id' => '2' - ), - array( + ], + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '3', 'b__position' => '1', //'b__category_id' => '1' - ), - array( + ], + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '4', 'b__position' => '2', //'b__category_id' => '1' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -933,33 +933,33 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addScalarResult('c__topic', 'ctopic', 'string'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'a__id' => '1', 'a__topic' => 'The First', 'c__id' => '1', 'c__topic' => 'First Comment' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'a__id' => '1', 'a__topic' => 'The First', 'c__id' => '2', 'c__topic' => 'Second Comment' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'a__id' => '42', 'a__topic' => 'The Answer', 'c__id' => null, 'c__topic' => null - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -999,16 +999,16 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -1044,16 +1044,16 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -1092,13 +1092,13 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'foo' => 'bar', // unknown! - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -1127,29 +1127,29 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => null, 'u__status' => null, 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', - ), - array( + ], + [ 'u__id' => null, 'u__status' => null, 'sclr0' => 'JWAGE', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); @@ -1162,9 +1162,9 @@ class ArrayHydratorTest extends HydrationTestCase $this->assertEquals('JWAGE', $result[2]['nameUpper']); $this->assertEquals('JWAGE', $result[3]['nameUpper']); - $this->assertEquals(array('id' => 1, 'status' => 'developer'), $result[0][$userEntityKey]); + $this->assertEquals(['id' => 1, 'status' => 'developer'], $result[0][$userEntityKey]); $this->assertNull($result[1][$userEntityKey]); - $this->assertEquals(array('id' => 2, 'status' => 'developer'), $result[2][$userEntityKey]); + $this->assertEquals(['id' => 2, 'status' => 'developer'], $result[2][$userEntityKey]); $this->assertNull($result[3][$userEntityKey]); } @@ -1187,19 +1187,19 @@ class ArrayHydratorTest extends HydrationTestCase $rsm->addIndexBy('u', 'id'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ArrayHydrator($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index 22cf3b598..7a4c8aaed 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -14,28 +14,28 @@ class ObjectHydratorTest extends HydrationTestCase { public function provideDataForUserEntityResult() { - return array( - array(0), - array('user'), - ); + return [ + [0], + ['user'], + ]; } public function provideDataForMultipleRootEntityResult() { - return array( - array(0, 0), - array('user', 0), - array(0, 'article'), - array('user', 'article'), - ); + return [ + [0, 0], + ['user', 0], + [0, 'article'], + ['user', 'article'], + ]; } public function provideDataForProductEntityResult() { - return array( - array(0), - array('product'), - ); + return [ + [0], + ['product'], + ]; } /** @@ -50,20 +50,20 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -89,20 +89,20 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -134,24 +134,24 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(4, count($result)); @@ -188,24 +188,24 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(4, count($result)); @@ -249,24 +249,24 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(4, count($result)); @@ -310,24 +310,24 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'a__id' => '1', 'a__topic' => 'Cool things.' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'a__id' => '2', 'a__topic' => 'Cool things II.' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(4, count($result)); @@ -373,23 +373,23 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'numPhones', 'integer'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => '2', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => '1', - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -429,31 +429,31 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'p__phonenumber' => '42', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'p__phonenumber' => '43', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'p__phonenumber' => '91', 'sclr0' => 'JWAGE', - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -509,32 +509,32 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addIndexBy('p', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -594,61 +594,61 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('a', 'a__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', 'a__id' => '1', 'a__topic' => 'Getting things done!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', 'a__id' => '1', 'a__topic' => 'Getting things done!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', 'a__id' => '2', 'a__topic' => 'ZendCon' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', 'a__id' => '2', 'a__topic' => 'ZendCon' - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91', 'a__id' => '3', 'a__topic' => 'LINQ' - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91', 'a__id' => '4', 'a__topic' => 'PHP7' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -712,9 +712,9 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('c', 'c__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -723,8 +723,8 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'Getting things done!', 'c__id' => '1', 'c__topic' => 'First!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -733,8 +733,8 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'Getting things done!', 'c__id' => '1', 'c__topic' => 'First!' - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -743,8 +743,8 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'ZendCon', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', @@ -753,8 +753,8 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'ZendCon', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', @@ -763,8 +763,8 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'LINQ', 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', @@ -773,12 +773,12 @@ class ObjectHydratorTest extends HydrationTestCase 'a__topic' => 'PHP7', 'c__id' => null, 'c__topic' => null - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -854,44 +854,44 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('b', 'b__position', 'position'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '1', 'b__position' => '0', //'b__category_id' => '1' - ), - array( + ], + [ 'c__id' => '2', 'c__position' => '0', 'c__name' => 'Second', 'b__id' => '2', 'b__position' => '0', //'b__category_id' => '2' - ), - array( + ], + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '3', 'b__position' => '1', //'b__category_id' => '1' - ), - array( + ], + [ 'c__id' => '1', 'c__position' => '0', 'c__name' => 'First', 'b__id' => '4', 'b__position' => '2', //'b__category_id' => '1' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -924,17 +924,17 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'foo' => 'bar', // unknown! - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(1, count($result)); $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); @@ -954,20 +954,20 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr1', 'name', 'string'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'sclr0' => '1', 'sclr1' => 'romanb' - ), - array( + ], + [ 'sclr0' => '2', 'sclr1' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -994,25 +994,25 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'p__id' => '1', 'p__name' => 'Doctrine Book', 'p__shipping_id' => 42 - ) - ); + ] + ]; $proxyInstance = new \Doctrine\Tests\Models\ECommerce\ECommerceShipping(); // mocking the proxy factory $proxyFactory = $this->getMockBuilder(ProxyFactory::class) - ->setMethods(array('getProxy')) + ->setMethods(['getProxy']) ->disableOriginalConstructor() ->getMock(); $proxyFactory->expects($this->once()) ->method('getProxy') - ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), array('id' => 42)) + ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42]) ->will($this->returnValue($proxyInstance)); $this->_em->setProxyFactory($proxyFactory); @@ -1043,25 +1043,25 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'p__id' => '1', 'p__name' => 'Doctrine Book', 'p__shipping_id' => 42 - ) - ); + ] + ]; $proxyInstance = new \Doctrine\Tests\Models\ECommerce\ECommerceShipping(); // mocking the proxy factory $proxyFactory = $this->getMockBuilder(ProxyFactory::class) - ->setMethods(array('getProxy')) + ->setMethods(['getProxy']) ->disableOriginalConstructor() ->getMock(); $proxyFactory->expects($this->once()) ->method('getProxy') - ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), array('id' => 42)) + ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42]) ->will($this->returnValue($proxyInstance)); $this->_em->setProxyFactory($proxyFactory); @@ -1110,29 +1110,29 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('c', 'c__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'a__id' => null, 'a__topic' => null, 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'a__id' => null, 'a__topic' => null, 'c__id' => null, 'c__topic' => null - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1173,29 +1173,29 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('c', 'c__topic', 'topic'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'a__id' => null, 'a__topic' => null, 'c__id' => null, 'c__topic' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'a__id' => null, 'a__topic' => null, 'c__id' => null, 'c__topic' => null - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1285,20 +1285,20 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $iterableResult = $hydrator->iterate($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $iterableResult = $hydrator->iterate($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $rowNum = 0; while (($row = $iterableResult->next()) !== false) { @@ -1329,20 +1329,20 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $iterableResult = $hydrator->iterate($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $iterableResult = $hydrator->iterate($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $rowNum = 0; while (($row = $iterableResult->next()) !== false) { @@ -1384,96 +1384,96 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 1111, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 1111, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 2222, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 2222, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '2', 'g__name' => 'TestGroupA', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '4', 'g__name' => 'TestGroupC', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '2', 'g__name' => 'TestGroupA', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '4', 'g__name' => 'TestGroupC', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 4444, - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1507,96 +1507,96 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 1111, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 1111, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 2222, - ), - array( + ], + [ 'u__id' => '1', 'u__name' => 'romanb', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 2222, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '2', 'g__name' => 'TestGroupA', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '4', 'g__name' => 'TestGroupC', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 3333, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '2', 'g__name' => 'TestGroupA', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '3', 'g__name' => 'TestGroupB', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '4', 'g__name' => 'TestGroupC', 'p__phonenumber' => 4444, - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage', 'g__id' => '5', 'g__name' => 'TestGroupD', 'p__phonenumber' => 4444, - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1628,33 +1628,33 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => null, 'u__status' => null, 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', - ), - array( + ], + [ 'u__id' => null, 'u__status' => null, 'sclr0' => 'JWAGE', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(4, count($result), "Should hydrate four results."); @@ -1694,37 +1694,37 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'p__phonenumber' => null - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', 'p__phonenumber' => null - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1758,27 +1758,27 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('a', 'user_id', 'user_id', false, 'string'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', 'a__id' => 1, 'a__city' => 'Berlin', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'BENJAMIN', 'a__id' => null, 'a__city' => null, - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1804,23 +1804,23 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addIndexBy('u', 'id'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'sclr0' => 'JWAGE', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(2, count($result)); @@ -1846,25 +1846,25 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addIndexByScalar('sclr0'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'sclr0' => 'ROMANB', - ), - array( + ], + [ 'sclr0' => 'JWAGE', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals( - array( - 'ROMANB' => array('nameUpper' => 'ROMANB'), - 'JWAGE' => array('nameUpper' => 'JWAGE') - ), + [ + 'ROMANB' => ['nameUpper' => 'ROMANB'], + 'JWAGE' => ['nameUpper' => 'JWAGE'] + ], $result ); } @@ -1885,12 +1885,12 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('c', 'c__id', 'id'); $rsm->setDiscriminatorColumn('c', 'c_discr'); - $resultSet = array( - array( + $resultSet = [ + [ 'c__id' => '1', 'c_discr' => 'fix', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); @@ -1917,14 +1917,14 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('e ', 'e_discr', 'discr', false, 'string'); $rsm->setDiscriminatorColumn('e', 'e_discr'); - $resultSet = array( - array( + $resultSet = [ + [ 'c__id' => '1', 'c_discr' => 'fix', 'e__id' => '1', 'e__name' => 'Fabio B. Silva' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); @@ -1947,13 +1947,13 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('p', 'discr', 'discr', false, 'string'); $rsm->setDiscriminatorColumn('p', 'discr'); - $resultSet = array( - array( + $resultSet = [ + [ 'p__id' => '1', 'p__name' => 'Fabio B. Silva', 'discr' => 'subworker' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); @@ -1969,12 +1969,12 @@ class ObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('e1', 'a1__id', 'id'); $rsm->addFieldResult('e2', 'e2__id', 'id'); - $resultSet = array( - array( + $resultSet = [ + [ 'a1__id' => '1', 'e2__id' => '1', - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php index 2ce9ae789..745f30ec0 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php @@ -99,61 +99,68 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'fieldName' => 'email', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsEmail', - 'cascade' => array('persist'), + 'cascade' => ['persist'], 'inversedBy' => 'user', 'orphanRemoval' => false, - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'nullable' => true, 'referencedColumnName' => 'id', - ) - ) - )); + ] + ] + ] + ); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT u.id AS user_id, e.id AS email_id, u.name, e.email, u.id + e.id AS scalarColumn FROM cms_users u INNER JOIN cms_emails e ON e.id = u.email_id', 'resultSetMapping' => 'find-all', - )); + ] + ); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => '__CLASS__', - 'fields' => array( - array( + 'fields' => [ + [ 'name' => 'id', 'column'=> 'user_id' - ), - array( + ], + [ 'name' => 'name', 'column'=> 'name' - ) - ) - ), - array( + ] + ] + ], + [ 'entityClass' => 'CmsEmail', - 'fields' => array( - array( + 'fields' => [ + [ 'name' => 'id', 'column'=> 'email_id' - ), - array( + ], + [ 'name' => 'email', 'column'=> 'email' - ) - ) - ) - ), - 'columns' => array( - array( + ] + ] + ] + ], + 'columns' => [ + [ 'name' => 'scalarColumn' - ) - ) - )); + ] + ] + ] + ); $queryMapping = $cm->getNamedNativeQuery('find-all'); @@ -184,25 +191,29 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT u.id AS user_id, e.id AS email_id, u.name, e.email, u.id + e.id AS scalarColumn FROM cms_users u INNER JOIN cms_emails e ON e.id = u.email_id', 'resultSetMapping' => 'find-all', - )); + ] + ); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => '__CLASS__', - ) - ), - 'columns' => array( - array( + ] + ], + 'columns' => [ + [ 'name' => 'scalarColumn' - ) - ) - )); + ] + ] + ] + ); $queryMapping = $cm->getNamedNativeQuery('find-all'); $rsm = new \Doctrine\ORM\Query\ResultSetMappingBuilder($this->_em); @@ -230,11 +241,13 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'resultClass' => '__CLASS__', 'query' => 'SELECT * FROM cms_users', - )); + ] + ); $queryMapping = $cm->getNamedNativeQuery('find-all'); $rsm = new \Doctrine\ORM\Query\ResultSetMappingBuilder($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 5c5f55f40..6cce68811 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -18,16 +18,16 @@ class ScalarHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ), - array( + ], + [ 'u__id' => '2', 'u__name' => 'jwage' - ) - ); + ] + ]; $stmt = new HydratorMockStatement($resultSet); @@ -53,13 +53,13 @@ class ScalarHydratorTest extends HydrationTestCase $rsm->addScalarResult('bar2', 'bar', 'string'); $rsm->addScalarResult('baz3', 'baz', 'string'); - $resultSet = array( - array( + $resultSet = [ + [ 'foo1' => 'A', 'bar2' => 'B', 'baz3' => 'C', - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); @@ -80,16 +80,16 @@ class ScalarHydratorTest extends HydrationTestCase $rsm->addScalarResult('bar2', 'bar', 'string'); $rsm->addScalarResult('baz3', 'baz', 'string'); - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'romanb', 'foo1' => 'A', 'bar2' => 'B', 'baz3' => 'C', 'foo' => 'bar', // Unknown! - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php index d56718834..d6eaeb10c 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php @@ -21,12 +21,12 @@ class SimpleObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'p__name', 'name'); $rsm->addMetaResult('p ', 'discr', 'discr', false, 'string'); $rsm->setDiscriminatorColumn('p', 'discr'); - $resultSet = array( - array( + $resultSet = [ + [ 'u__id' => '1', 'u__name' => 'Fabio B. Silva' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em); @@ -39,13 +39,13 @@ class SimpleObjectHydratorTest extends HydrationTestCase $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); $rsm->addFieldResult('a', 'a__id', 'id'); $rsm->addFieldResult('a', 'a__city', 'city'); - $resultSet = array( - array( + $resultSet = [ + [ 'a__id' => '1', 'a__city' => 'Cracow', 'doctrine_rownum' => '1' - ), - ); + ], + ]; $expectedEntity = new \Doctrine\Tests\Models\CMS\CmsAddress(); $expectedEntity->id = 1; @@ -74,13 +74,13 @@ class SimpleObjectHydratorTest extends HydrationTestCase $rsm->addMetaResult('p', 'discr', 'discr', false, 'string'); $rsm->setDiscriminatorColumn('p', 'discr'); - $resultSet = array( - array( + $resultSet = [ + [ 'p__id' => '1', 'p__name' => 'Fabio B. Silva', 'discr' => 'subworker' - ), - ); + ], + ]; $stmt = new HydratorMockStatement($resultSet); $hydrator = new \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator($this->_em); @@ -98,14 +98,14 @@ class SimpleObjectHydratorTest extends HydrationTestCase $rsm->addFieldResult('p', 'm__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Manager'); $rsm->addFieldResult('p', 'e__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Employee'); $rsm->addMetaResult('p', 'discr', 'discr', false, 'string'); - $resultSet = array( - array( + $resultSet = [ + [ 'p__id' => '1', 'm__tags' => 'tag1,tag2', 'e__tags' => null, 'discr' => 'manager' - ), - ); + ], + ]; $expectedEntity = new \Doctrine\Tests\Models\Issue5989\Issue5989Manager(); $expectedEntity->id = 1; diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index 219c7384c..fa98dd070 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -9,40 +9,48 @@ class SingleScalarHydratorTest extends HydrationTestCase { /** Result set provider for the HYDRATE_SINGLE_SCALAR tests */ public static function singleScalarResultSetProvider() { - return array( + return [ // valid - array('name' => 'result1', - 'resultSet' => array( - array( + [ + 'name' => 'result1', + 'resultSet' => [ + [ 'u__name' => 'romanb' - ) - )), + ] + ] + ], // valid - array('name' => 'result2', - 'resultSet' => array( - array( + [ + 'name' => 'result2', + 'resultSet' => [ + [ 'u__id' => '1' - ) - )), + ] + ] + ], // invalid - array('name' => 'result3', - 'resultSet' => array( - array( + [ + 'name' => 'result3', + 'resultSet' => [ + [ 'u__id' => '1', 'u__name' => 'romanb' - ) - )), + ] + ] + ], // invalid - array('name' => 'result4', - 'resultSet' => array( - array( + [ + 'name' => 'result4', + 'resultSet' => [ + [ 'u__id' => '1' - ), - array( + ], + [ 'u__id' => '2' - ) - )), - ); + ] + ] + ], + ]; } /** diff --git a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php index 855a9256f..acc951c16 100644 --- a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php @@ -42,13 +42,13 @@ class AssignedGeneratorTest extends OrmTestCase $entity = new AssignedSingleIdEntity; $entity->myId = 1; $id = $this->_assignedGen->generate($this->_em, $entity); - $this->assertEquals(array('myId' => 1), $id); + $this->assertEquals(['myId' => 1], $id); $entity = new AssignedCompositeIdEntity; $entity->myId2 = 2; $entity->myId1 = 4; $id = $this->_assignedGen->generate($this->_em, $entity); - $this->assertEquals(array('myId1' => 4, 'myId2' => 2), $id); + $this->assertEquals(['myId1' => 4, 'myId2' => 2], $id); } } diff --git a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php index 1063b5aca..851cc2ae3 100644 --- a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php +++ b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php @@ -158,7 +158,7 @@ class HydrationCompleteHandlerTest extends PHPUnit_Framework_TestCase Events::postLoad, $this->logicalOr($entity1, $entity2), $this->callback(function (LifecycleEventArgs $args) use ($entityManager, $entity1, $entity2) { - return in_array($args->getEntity(), array($entity1, $entity2), true) + return in_array($args->getEntity(), [$entity1, $entity2], true) && $entityManager === $args->getObjectManager(); }), $listenersFlag @@ -189,13 +189,13 @@ class HydrationCompleteHandlerTest extends PHPUnit_Framework_TestCase public function testGetValidListenerInvocationFlags() { - return array( - array(ListenersInvoker::INVOKE_LISTENERS), - array(ListenersInvoker::INVOKE_CALLBACKS), - array(ListenersInvoker::INVOKE_MANAGER), - array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS), - array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_MANAGER), - array(ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS | ListenersInvoker::INVOKE_MANAGER), - ); + return [ + [ListenersInvoker::INVOKE_LISTENERS], + [ListenersInvoker::INVOKE_CALLBACKS], + [ListenersInvoker::INVOKE_MANAGER], + [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS], + [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_MANAGER], + [ListenersInvoker::INVOKE_LISTENERS | ListenersInvoker::INVOKE_CALLBACKS | ListenersInvoker::INVOKE_MANAGER], + ]; } } diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php index 512b21115..1f667b464 100644 --- a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php @@ -64,12 +64,12 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase ->expects($this->once()) ->method('loadCriteria') ->with($this->criteria) - ->will($this->returnValue(array('foo', 'bar', 'baz'))); + ->will($this->returnValue(['foo', 'bar', 'baz'])); // should never call the persister's count $this->persister->expects($this->never())->method('count'); - $this->assertSame(array('foo', 'bar', 'baz'), $this->lazyCriteriaCollection->toArray()); + $this->assertSame(['foo', 'bar', 'baz'], $this->lazyCriteriaCollection->toArray()); $this->assertSame(3, $this->lazyCriteriaCollection->count()); } @@ -89,7 +89,7 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase ->expects($this->once()) ->method('loadCriteria') ->with($this->criteria) - ->will($this->returnValue(array($foo, $bar, $baz))); + ->will($this->returnValue([$foo, $bar, $baz])); $criteria = new Criteria(); @@ -98,9 +98,9 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase $filtered = $this->lazyCriteriaCollection->matching($criteria); $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $filtered); - $this->assertEquals(array($foo), $filtered->toArray()); + $this->assertEquals([$foo], $filtered->toArray()); - $this->assertEquals(array($foo), $this->lazyCriteriaCollection->matching($criteria)->toArray()); + $this->assertEquals([$foo], $this->lazyCriteriaCollection->matching($criteria)->toArray()); } public function testIsEmptyUsesCountWhenNotInitialized() @@ -124,12 +124,12 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase ->expects($this->once()) ->method('loadCriteria') ->with($this->criteria) - ->will($this->returnValue(array('foo', 'bar', 'baz'))); + ->will($this->returnValue(['foo', 'bar', 'baz'])); // should never call the persister's count $this->persister->expects($this->never())->method('count'); - $this->assertSame(array('foo', 'bar', 'baz'), $this->lazyCriteriaCollection->toArray()); + $this->assertSame(['foo', 'bar', 'baz'], $this->lazyCriteriaCollection->toArray()); $this->assertFalse($this->lazyCriteriaCollection->isEmpty()); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index c4fd1381d..4e9546daa 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -72,10 +72,11 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testEntityIndexes($class) { $this->assertArrayHasKey('indexes', $class->table, 'ClassMetadata should have indexes key in table property.'); - $this->assertEquals(array( - 'name_idx' => array('columns' => array('name')), - 0 => array('columns' => array('user_email')) - ), $class->table['indexes']); + $this->assertEquals( + [ + 'name_idx' => ['columns' => ['name']], + 0 => ['columns' => ['user_email']] + ], $class->table['indexes']); return $class; } @@ -84,13 +85,14 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Comment'); - $this->assertEquals(array( - 0 => array( - 'columns' => array('content'), - 'flags' => array('fulltext'), - 'options' => array('where' => 'content IS NOT NULL'), - ) - ), $class->table['indexes']); + $this->assertEquals( + [ + 0 => [ + 'columns' => ['content'], + 'flags' => ['fulltext'], + 'options' => ['where' => 'content IS NOT NULL'], + ] + ], $class->table['indexes']); } /** @@ -102,9 +104,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertArrayHasKey('uniqueConstraints', $class->table, 'ClassMetadata should have uniqueConstraints key in table property when Unique Constraints are set.'); - $this->assertEquals(array( - "search_idx" => array("columns" => array("name", "user_email"), 'options' => array('where' => 'name IS NOT NULL')) - ), $class->table['uniqueConstraints']); + $this->assertEquals( + [ + "search_idx" => ["columns" => ["name", "user_email"], 'options' => ['where' => 'name IS NOT NULL']] + ], $class->table['uniqueConstraints']); return $class; } @@ -117,9 +120,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $this->assertArrayHasKey('options', $class->table, 'ClassMetadata should have options key in table property.'); - $this->assertEquals(array( - 'foo' => 'bar', 'baz' => array('key' => 'val') - ), $class->table['options']); + $this->assertEquals( + [ + 'foo' => 'bar', 'baz' => ['key' => 'val'] + ], $class->table['options']); return $class; } @@ -132,11 +136,11 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $this->assertInternalType('array', $class->sequenceGeneratorDefinition, 'No Sequence Definition set on this driver.'); $this->assertEquals( - array( + [ 'sequenceName' => 'tablename_seq', 'allocationSize' => 100, 'initialValue' => 1, - ), + ], $class->sequenceGeneratorDefinition ); } @@ -148,7 +152,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertEquals(ClassMetadata::GENERATOR_TYPE_CUSTOM, $class->generatorType, "Generator Type"); $this->assertEquals( - array("class" => "stdClass"), + ["class" => "stdClass"], $class->customGeneratorDefinition, "Custom Generator Definition"); } @@ -240,7 +244,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase */ public function testIdentifier($class) { - $this->assertEquals(array('id'), $class->identifier); + $this->assertEquals(['id'], $class->identifier); $this->assertEquals('integer', $class->fieldMappings['id']['type']); $this->assertEquals(ClassMetadata::GENERATOR_TYPE_AUTO, $class->generatorType, "ID-Generator is not ClassMetadata::GENERATOR_TYPE_AUTO"); @@ -313,7 +317,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertTrue($class->associationMappings['phonenumbers']['orphanRemoval']); // Test Order By - $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); + $this->assertEquals(['number' => 'ASC'], $class->associationMappings['phonenumbers']['orderBy']); return $class; } @@ -411,7 +415,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal'); $this->assertEquals( - array('name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null), + ['name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null], $class->discriminatorColumn ); } @@ -609,18 +613,18 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all'); $this->assertEquals('mapping-find-all', $findAllMapping['name']); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $findAllMapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'city','column'=>'city'), $findAllMapping['entities'][0]['fields'][1]); - $this->assertEquals(array('name'=>'country','column'=>'country'), $findAllMapping['entities'][0]['fields'][2]); + $this->assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]); $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields'); $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']); - $this->assertEquals(array(), $withoutFieldsMapping['entities'][0]['fields']); + $this->assertEquals([], $withoutFieldsMapping['entities'][0]['fields']); $countMapping = $class->getSqlResultSetMapping('mapping-count'); $this->assertEquals('mapping-count', $countMapping['name']); - $this->assertEquals(array('name'=>'count'), $countMapping['columns'][0]); + $this->assertEquals(['name'=>'count'], $countMapping['columns'][0]); } @@ -637,61 +641,61 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertCount(4, $userMetadata->getSqlResultSetMappings()); $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress'); - $this->assertEquals(array(),$mapping['columns']); + $this->assertEquals([],$mapping['columns']); $this->assertEquals('mappingJoinedAddress', $mapping['name']); $this->assertNull($mapping['entities'][0]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]); - $this->assertEquals(array('name'=>'status','column'=>'status'), $mapping['entities'][0]['fields'][2]); - $this->assertEquals(array('name'=>'address.zip','column'=>'zip'), $mapping['entities'][0]['fields'][3]); - $this->assertEquals(array('name'=>'address.city','column'=>'city'), $mapping['entities'][0]['fields'][4]); - $this->assertEquals(array('name'=>'address.country','column'=>'country'), $mapping['entities'][0]['fields'][5]); - $this->assertEquals(array('name'=>'address.id','column'=>'a_id'), $mapping['entities'][0]['fields'][6]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); + $this->assertEquals(['name'=>'address.zip','column'=>'zip'], $mapping['entities'][0]['fields'][3]); + $this->assertEquals(['name'=>'address.city','column'=>'city'], $mapping['entities'][0]['fields'][4]); + $this->assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]); + $this->assertEquals(['name'=>'address.id','column'=>'a_id'], $mapping['entities'][0]['fields'][6]); $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']); $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber'); - $this->assertEquals(array(),$mapping['columns']); + $this->assertEquals([],$mapping['columns']); $this->assertEquals('mappingJoinedPhonenumber', $mapping['name']); $this->assertNull($mapping['entities'][0]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]); - $this->assertEquals(array('name'=>'status','column'=>'status'), $mapping['entities'][0]['fields'][2]); - $this->assertEquals(array('name'=>'phonenumbers.phonenumber','column'=>'number'), $mapping['entities'][0]['fields'][3]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); + $this->assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'], $mapping['entities'][0]['fields'][3]); $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']); $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount'); - $this->assertEquals(array('name'=>'numphones'),$mapping['columns'][0]); + $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]); $this->assertEquals('mappingUserPhonenumberCount', $mapping['name']); $this->assertNull($mapping['entities'][0]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]); - $this->assertEquals(array('name'=>'status','column'=>'status'), $mapping['entities'][0]['fields'][2]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']); $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults'); - $this->assertEquals(array('name'=>'numphones'),$mapping['columns'][0]); + $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]); $this->assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']); $this->assertNull($mapping['entities'][0]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'u_id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'u_name'), $mapping['entities'][0]['fields'][1]); - $this->assertEquals(array('name'=>'status','column'=>'u_status'), $mapping['entities'][0]['fields'][2]); + $this->assertEquals(['name'=>'id','column'=>'u_id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'u_name'], $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'status','column'=>'u_status'], $mapping['entities'][0]['fields'][2]); $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']); $this->assertNull($mapping['entities'][1]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'a_id'), $mapping['entities'][1]['fields'][0]); - $this->assertEquals(array('name'=>'zip','column'=>'a_zip'), $mapping['entities'][1]['fields'][1]); - $this->assertEquals(array('name'=>'country','column'=>'a_country'), $mapping['entities'][1]['fields'][2]); + $this->assertEquals(['name'=>'id','column'=>'a_id'], $mapping['entities'][1]['fields'][0]); + $this->assertEquals(['name'=>'zip','column'=>'a_zip'], $mapping['entities'][1]['fields'][1]); + $this->assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $mapping['entities'][1]['entityClass']); //person asserts $this->assertCount(1, $personMetadata->getSqlResultSetMappings()); $mapping = $personMetadata->getSqlResultSetMapping('mappingFetchAll'); - $this->assertEquals(array(),$mapping['columns']); + $this->assertEquals([],$mapping['columns']); $this->assertEquals('mappingFetchAll', $mapping['name']); $this->assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); $this->assertEquals($personMetadata->name, $mapping['entities'][0]['entityClass']); } @@ -731,18 +735,18 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertEquals('user_id', $guestGroups['joinTable']['joinColumns'][0]['name']); $this->assertEquals('group_id', $guestGroups['joinTable']['inverseJoinColumns'][0]['name']); - $this->assertEquals(array('user_id'=>'id'), $guestGroups['relationToSourceKeyColumns']); - $this->assertEquals(array('group_id'=>'id'), $guestGroups['relationToTargetKeyColumns']); - $this->assertEquals(array('user_id','group_id'), $guestGroups['joinTableColumns']); + $this->assertEquals(['user_id'=>'id'], $guestGroups['relationToSourceKeyColumns']); + $this->assertEquals(['group_id'=>'id'], $guestGroups['relationToTargetKeyColumns']); + $this->assertEquals(['user_id','group_id'], $guestGroups['joinTableColumns']); $this->assertEquals('ddc964_users_admingroups', $adminGroups['joinTable']['name']); $this->assertEquals('adminuser_id', $adminGroups['joinTable']['joinColumns'][0]['name']); $this->assertEquals('admingroup_id', $adminGroups['joinTable']['inverseJoinColumns'][0]['name']); - $this->assertEquals(array('adminuser_id'=>'id'), $adminGroups['relationToSourceKeyColumns']); - $this->assertEquals(array('admingroup_id'=>'id'), $adminGroups['relationToTargetKeyColumns']); - $this->assertEquals(array('adminuser_id','admingroup_id'), $adminGroups['joinTableColumns']); + $this->assertEquals(['adminuser_id'=>'id'], $adminGroups['relationToSourceKeyColumns']); + $this->assertEquals(['admingroup_id'=>'id'], $adminGroups['relationToTargetKeyColumns']); + $this->assertEquals(['adminuser_id','admingroup_id'], $adminGroups['joinTableColumns']); // assert address association mappings @@ -767,15 +771,15 @@ abstract class AbstractMappingDriverTest extends OrmTestCase // assert override $this->assertEquals('address_id', $guestAddress['joinColumns'][0]['name']); - $this->assertEquals(array('address_id'=>'id'), $guestAddress['sourceToTargetKeyColumns']); - $this->assertEquals(array('address_id'=>'address_id'), $guestAddress['joinColumnFieldNames']); - $this->assertEquals(array('id'=>'address_id'), $guestAddress['targetToSourceKeyColumns']); + $this->assertEquals(['address_id'=>'id'], $guestAddress['sourceToTargetKeyColumns']); + $this->assertEquals(['address_id'=>'address_id'], $guestAddress['joinColumnFieldNames']); + $this->assertEquals(['id'=>'address_id'], $guestAddress['targetToSourceKeyColumns']); $this->assertEquals('adminaddress_id', $adminAddress['joinColumns'][0]['name']); - $this->assertEquals(array('adminaddress_id'=>'id'), $adminAddress['sourceToTargetKeyColumns']); - $this->assertEquals(array('adminaddress_id'=>'adminaddress_id'), $adminAddress['joinColumnFieldNames']); - $this->assertEquals(array('id'=>'adminaddress_id'), $adminAddress['targetToSourceKeyColumns']); + $this->assertEquals(['adminaddress_id'=>'id'], $adminAddress['sourceToTargetKeyColumns']); + $this->assertEquals(['adminaddress_id'=>'adminaddress_id'], $adminAddress['joinColumnFieldNames']); + $this->assertEquals(['id'=>'adminaddress_id'], $adminAddress['targetToSourceKeyColumns']); } /* @@ -808,8 +812,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertTrue($adminMetadata->fieldMappings['id']['id']); $this->assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']); $this->assertEquals('user_id', $adminMetadata->fieldMappings['id']['columnName']); - $this->assertEquals(array('user_id'=>'id','user_name'=>'name'), $adminMetadata->fieldNames); - $this->assertEquals(array('id'=>'user_id','name'=>'user_name'), $adminMetadata->columnNames); + $this->assertEquals(['user_id'=>'id','user_name'=>'name'], $adminMetadata->fieldNames); + $this->assertEquals(['id'=>'user_id','name'=>'user_name'], $adminMetadata->columnNames); $this->assertEquals(150, $adminMetadata->fieldMappings['id']['length']); @@ -823,8 +827,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertTrue($guestMetadata->fieldMappings['id']['id']); $this->assertEquals('guest_id', $guestMetadata->fieldMappings['id']['columnName']); $this->assertEquals('id', $guestMetadata->fieldMappings['id']['fieldName']); - $this->assertEquals(array('guest_id'=>'id','guest_name'=>'name'), $guestMetadata->fieldNames); - $this->assertEquals(array('id'=>'guest_id','name'=>'guest_name'), $guestMetadata->columnNames); + $this->assertEquals(['guest_id'=>'id','guest_name'=>'name'], $guestMetadata->fieldNames); + $this->assertEquals(['id'=>'guest_id','name'=>'guest_name'], $guestMetadata->columnNames); $this->assertEquals(140, $guestMetadata->fieldMappings['id']['length']); $this->assertEquals('name', $guestMetadata->fieldMappings['name']['fieldName']); @@ -1139,126 +1143,144 @@ class User public static function loadMetadata(ClassMetadataInfo $metadata) { $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); - $metadata->setPrimaryTable(array( + $metadata->setPrimaryTable( + [ 'name' => 'cms_users', - 'options' => array('foo' => 'bar', 'baz' => array('key' => 'val')), - )); + 'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']], + ] + ); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist'); $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist'); $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist'); - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', - 'options' => array('foo' => 'bar', 'unsigned' => false), - )); - $metadata->mapField(array( + 'options' => ['foo' => 'bar', 'unsigned' => false], + ] + ); + $metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'length' => 50, 'unique' => true, 'nullable' => true, 'columnName' => 'name', - 'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false), - )); - $metadata->mapField(array( + 'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false], + ] + ); + $metadata->mapField( + [ 'fieldName' => 'email', 'type' => 'string', 'columnName' => 'user_email', 'columnDefinition' => 'CHAR(32) NOT NULL', - )); - $mapping = array('fieldName' => 'version', 'type' => 'integer'); + ] + ); + $mapping = ['fieldName' => 'version', 'type' => 'integer']; $metadata->setVersionMapping($mapping); $metadata->mapField($mapping); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); - $metadata->mapOneToOne(array( + $metadata->mapOneToOne( + [ 'fieldName' => 'address', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address', 'cascade' => - array( + [ 0 => 'remove', - ), + ], 'mappedBy' => NULL, 'inversedBy' => 'user', 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - ), - ), + ], + ], 'orphanRemoval' => false, - )); - $metadata->mapOneToMany(array( + ] + ); + $metadata->mapOneToMany( + [ 'fieldName' => 'phonenumbers', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber', 'cascade' => - array( + [ 1 => 'persist', - ), + ], 'mappedBy' => 'user', 'orphanRemoval' => true, 'orderBy' => - array( + [ 'number' => 'ASC', - ), - )); - $metadata->mapManyToMany(array( + ], + ] + ); + $metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group', 'cascade' => - array( + [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'mappedBy' => NULL, 'joinTable' => - array( + [ 'name' => 'cms_users_groups', 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'user_id', 'referencedColumnName' => 'id', 'unique' => false, 'nullable' => false, - ), - ), + ], + ], 'inverseJoinColumns' => - array( + [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'columnDefinition' => 'INT NULL', - ), - ), - ), + ], + ], + ], 'orderBy' => NULL, - )); - $metadata->table['uniqueConstraints'] = array( - 'search_idx' => array('columns' => array('name', 'user_email'), 'options'=> array('where' => 'name IS NOT NULL')), + ] ); - $metadata->table['indexes'] = array( - 'name_idx' => array('columns' => array('name')), 0 => array('columns' => array('user_email')) - ); - $metadata->setSequenceGeneratorDefinition(array( + $metadata->table['uniqueConstraints'] = [ + 'search_idx' => ['columns' => ['name', 'user_email'], 'options'=> ['where' => 'name IS NOT NULL']], + ]; + $metadata->table['indexes'] = [ + 'name_idx' => ['columns' => ['name']], 0 => ['columns' => ['user_email']] + ]; + $metadata->setSequenceGeneratorDefinition( + [ 'sequenceName' => 'tablename_seq', 'allocationSize' => 100, 'initialValue' => 1, - )); - $metadata->addNamedQuery(array( + ] + ); + $metadata->addNamedQuery( + [ 'name' => 'all', 'query' => 'SELECT u FROM __CLASS__ u' - )); + ] + ); } } @@ -1279,7 +1301,7 @@ abstract class Animal public static function loadMetadata(ClassMetadataInfo $metadata) { $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM); - $metadata->setCustomGeneratorDefinition(array("class" => "stdClass")); + $metadata->setCustomGeneratorDefinition(["class" => "stdClass"]); } } @@ -1346,16 +1368,20 @@ class DDC1170Entity public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'columnDefinition' => 'INT unsigned NOT NULL', - )); + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'value', 'columnDefinition' => 'VARCHAR(255) NOT NULL' - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); } @@ -1379,16 +1405,20 @@ class DDC807Entity public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', - )); + ] + ); - $metadata->setDiscriminatorColumn(array( + $metadata->setDiscriminatorColumn( + [ 'name' => "dtype", 'type' => "string", 'columnDefinition' => "ENUM('ONE','TWO')" - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); } @@ -1415,13 +1445,16 @@ class Comment public static function loadMetadata(ClassMetadataInfo $metadata) { $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); - $metadata->setPrimaryTable(array( - 'indexes' => array( - array('columns' => array('content'), 'flags' => array('fulltext'), 'options' => array('where' => 'content IS NOT NULL')) - ) - )); + $metadata->setPrimaryTable( + [ + 'indexes' => [ + ['columns' => ['content'], 'flags' => ['fulltext'], 'options' => ['where' => 'content IS NOT NULL']] + ] + ] + ); - $metadata->mapField(array( + $metadata->mapField( + [ 'fieldName' => 'content', 'type' => 'text', 'scale' => 0, @@ -1430,7 +1463,8 @@ class Comment 'nullable' => false, 'precision' => 0, 'columnName' => 'content', - )); + ] + ); } } @@ -1453,10 +1487,12 @@ class SingleTableEntityNoDiscriminatorColumnMapping public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); } @@ -1485,10 +1521,12 @@ class SingleTableEntityIncompleteDiscriminatorColumnMapping public static function loadMetadata(ClassMetadataInfo $metadata) { - $metadata->mapField(array( + $metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index ac17b63a2..e87412d3e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -111,7 +111,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest protected function _loadDriverForCMSModels() { $annotationDriver = $this->_loadDriver(); - $annotationDriver->addPaths(array(__DIR__ . '/../../Models/CMS/')); + $annotationDriver->addPaths([__DIR__ . '/../../Models/CMS/']); return $annotationDriver; } @@ -133,7 +133,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest public function testJoinTablesWithMappedSuperclassForAnnotationDriver() { $annotationDriver = $this->_loadDriver(); - $annotationDriver->addPaths(array(__DIR__ . '/../../Models/DirectoryTree/')); + $annotationDriver->addPaths([__DIR__ . '/../../Models/DirectoryTree/']); $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); @@ -202,10 +202,10 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory->setEntityManager($em); $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationChild'); - $this->assertEquals(array("postLoad" => array("postLoad"), "preUpdate" => array("preUpdate")), $cm->lifecycleCallbacks); + $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks); $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationParent'); - $this->assertEquals(array("postLoad" => array("postLoad"), "preUpdate" => array("preUpdate")), $cm->lifecycleCallbacks); + $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks); } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php index d5f2a9738..497e2a005 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php @@ -48,8 +48,8 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testGetColumnName() { $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $class->mapField(array('fieldName' => 'name', 'columnName' => 'name')); - $class->mapField(array('fieldName' => 'id', 'columnName' => 'id', 'id' => true)); + $class->mapField(['fieldName' => 'name', 'columnName' => 'name']); + $class->mapField(['fieldName' => 'id', 'columnName' => 'id', 'id' => true]); $this->assertEquals('id' ,$this->strategy->getColumnName('id', $class, $this->platform)); $this->assertEquals('name' ,$this->strategy->getColumnName('name', $class, $this->platform)); @@ -59,38 +59,42 @@ class AnsiQuoteStrategyTest extends OrmTestCase { $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $class->setPrimaryTable(array('name'=>'cms_user')); + $class->setPrimaryTable(['name'=>'cms_user']); $this->assertEquals('cms_user' ,$this->strategy->getTableName($class, $this->platform)); } public function testJoinTableName() { $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - - $class->mapManyToMany(array( + + $class->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', - 'joinTable' => array( + 'joinTable' => [ 'name' => 'cmsaddress_cmsuser' - ) - )); - + ] + ] + ); + $this->assertEquals('cmsaddress_cmsuser', $this->strategy->getJoinTableName($class->associationMappings['user'], $class, $this->platform)); - + } public function testIdentifierColumnNames() { $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - $class->mapField(array( + $class->mapField( + [ 'id' => true, 'fieldName' => 'id', 'columnName' => 'id', - )); + ] + ); - $this->assertEquals(array('id'), $this->strategy->getIdentifierColumnNames($class, $this->platform)); + $this->assertEquals(['id'], $this->strategy->getIdentifierColumnNames($class, $this->platform)); } @@ -103,14 +107,18 @@ class AnsiQuoteStrategyTest extends OrmTestCase { $class = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); - $class->mapOneToOne(array( + $class->mapOneToOne( + [ 'id' => true, 'fieldName' => 'article', 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => 'article' - )), - )); + ] + ], + ] + ); $joinColumn = $class->associationMappings['article']['joinColumns'][0]; $this->assertEquals('article',$this->strategy->getJoinColumnName($joinColumn, $class, $this->platform)); @@ -120,14 +128,18 @@ class AnsiQuoteStrategyTest extends OrmTestCase { $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'id' => true, 'fieldName' => 'article', 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => 'article' - )), - )); + ] + ], + ] + ); $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; $this->assertEquals('id',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); @@ -136,14 +148,14 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testGetSequenceName() { $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $definition = array( + $definition = [ 'sequenceName' => 'user_id_seq', 'allocationSize' => 1, 'initialValue' => 2 - ); + ]; $class->setSequenceGeneratorDefinition($definition); $this->assertEquals('user_id_seq',$this->strategy->getSequenceName($definition, $class, $this->platform)); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index be2bee9f5..7cd1247dd 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -156,7 +156,7 @@ class BasicInheritanceMappingTest extends OrmTestCase $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertEquals( - array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), + ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition ); } @@ -172,7 +172,7 @@ class BasicInheritanceMappingTest extends OrmTestCase $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertEquals( - array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), + ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition ); } @@ -188,7 +188,7 @@ class BasicInheritanceMappingTest extends OrmTestCase $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertEquals( - array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), + ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition ); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php index da4f4abf5..e19687c84 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php @@ -51,14 +51,15 @@ class ClassMetadataBuilderTest extends OrmTestCase ) ); - $this->assertEquals(array( - 'name' => array( + $this->assertEquals( + [ + 'name' => [ 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', 'columnPrefix' => null, 'declaredField' => null, 'originalField' => null, - ) - ), $this->cm->embeddedClasses); + ] + ], $this->cm->embeddedClasses); } public function testAddEmbeddedWithPrefix() @@ -71,14 +72,15 @@ class ClassMetadataBuilderTest extends OrmTestCase ) ); - $this->assertEquals(array( - 'name' => array( + $this->assertEquals( + [ + 'name' => [ 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null, - ) - ), $this->cm->embeddedClasses); + ] + ], $this->cm->embeddedClasses); } public function testCreateEmbeddedWithoutExtraParams() @@ -90,12 +92,12 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent($embeddedBuilder->build()); $this->assertEquals( - array( + [ 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', 'columnPrefix' => null, 'declaredField' => null, 'originalField' => null - ), + ], $this->cm->embeddedClasses['name'] ); } @@ -109,12 +111,12 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent($embeddedBuilder->build()); $this->assertEquals( - array( + [ 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null - ), + ], $this->cm->embeddedClasses['name'] ); } @@ -139,28 +141,28 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testAddIndex() { - $this->assertIsFluent($this->builder->addIndex(array('username', 'name'), 'users_idx')); - $this->assertEquals(array('users_idx' => array('columns' => array('username', 'name'))), $this->cm->table['indexes']); + $this->assertIsFluent($this->builder->addIndex(['username', 'name'], 'users_idx')); + $this->assertEquals(['users_idx' => ['columns' => ['username', 'name']]], $this->cm->table['indexes']); } public function testAddUniqueConstraint() { - $this->assertIsFluent($this->builder->addUniqueConstraint(array('username', 'name'), 'users_idx')); - $this->assertEquals(array('users_idx' => array('columns' => array('username', 'name'))), $this->cm->table['uniqueConstraints']); + $this->assertIsFluent($this->builder->addUniqueConstraint(['username', 'name'], 'users_idx')); + $this->assertEquals(['users_idx' => ['columns' => ['username', 'name']]], $this->cm->table['uniqueConstraints']); } public function testSetPrimaryTableRelated() { - $this->builder->addUniqueConstraint(array('username', 'name'), 'users_idx'); - $this->builder->addIndex(array('username', 'name'), 'users_idx'); + $this->builder->addUniqueConstraint(['username', 'name'], 'users_idx'); + $this->builder->addIndex(['username', 'name'], 'users_idx'); $this->builder->setTable('users'); $this->assertEquals( - array( + [ 'name' => 'users', - 'indexes' => array('users_idx' => array('columns' => array('username', 'name'))), - 'uniqueConstraints' => array('users_idx' => array('columns' => array('username', 'name'))), - ), + 'indexes' => ['users_idx' => ['columns' => ['username', 'name']]], + 'uniqueConstraints' => ['users_idx' => ['columns' => ['username', 'name']]], + ], $this->cm->table ); } @@ -180,7 +182,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testSetDiscriminatorColumn() { $this->assertIsFluent($this->builder->setDiscriminatorColumn('discr', 'string', '124')); - $this->assertEquals(array('fieldName' => 'discr', 'name' => 'discr', 'type' => 'string', 'length' => '124'), $this->cm->discriminatorColumn); + $this->assertEquals(['fieldName' => 'discr', 'name' => 'discr', 'type' => 'string', 'length' => '124'], $this->cm->discriminatorColumn); } public function testAddDiscriminatorMapClass() @@ -188,7 +190,8 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test', 'Doctrine\Tests\Models\CMS\CmsUser')); $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test2', 'Doctrine\Tests\Models\CMS\CmsGroup')); - $this->assertEquals(array('test' => 'Doctrine\Tests\Models\CMS\CmsUser', 'test2' => 'Doctrine\Tests\Models\CMS\CmsGroup'), $this->cm->discriminatorMap); + $this->assertEquals( + ['test' => 'Doctrine\Tests\Models\CMS\CmsUser', 'test2' => 'Doctrine\Tests\Models\CMS\CmsGroup'], $this->cm->discriminatorMap); $this->assertEquals('test', $this->cm->discriminatorValue); } @@ -207,7 +210,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testAddField() { $this->assertIsFluent($this->builder->addField('name', 'string')); - $this->assertEquals(array('columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'), $this->cm->fieldMappings['name']); + $this->assertEquals(['columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'], $this->cm->fieldMappings['name']); } public function testCreateField() @@ -217,13 +220,14 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertFalse(isset($this->cm->fieldMappings['name'])); $this->assertIsFluent($fieldBuilder->build()); - $this->assertEquals(array('columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'), $this->cm->fieldMappings['name']); + $this->assertEquals(['columnName' => 'name', 'fieldName' => 'name', 'type' => 'string'], $this->cm->fieldMappings['name']); } public function testCreateVersionedField() { $this->builder->createField('name', 'integer')->columnName('username')->length(124)->nullable()->columnDefinition('foobar')->unique()->isVersionField()->build(); - $this->assertEquals(array( + $this->assertEquals( + [ 'columnDefinition' => 'foobar', 'columnName' => 'username', 'default' => 1, @@ -232,29 +236,30 @@ class ClassMetadataBuilderTest extends OrmTestCase 'type' => 'integer', 'nullable' => true, 'unique' => true, - ), $this->cm->fieldMappings['name']); + ], $this->cm->fieldMappings['name']); } public function testCreatePrimaryField() { $this->builder->createField('id', 'integer')->makePrimaryKey()->generatedValue()->build(); - $this->assertEquals(array('id'), $this->cm->identifier); - $this->assertEquals(array('columnName' => 'id', 'fieldName' => 'id', 'id' => true, 'type' => 'integer'), $this->cm->fieldMappings['id']); + $this->assertEquals(['id'], $this->cm->identifier); + $this->assertEquals(['columnName' => 'id', 'fieldName' => 'id', 'id' => true, 'type' => 'integer'], $this->cm->fieldMappings['id']); } public function testCreateUnsignedOptionField() { $this->builder->createField('state', 'integer')->option('unsigned', true)->build(); - $this->assertEquals(array('fieldName' => 'state', 'type' => 'integer', 'options' => array('unsigned' => true), 'columnName' => 'state'), $this->cm->fieldMappings['state']); + $this->assertEquals( + ['fieldName' => 'state', 'type' => 'integer', 'options' => ['unsigned' => true], 'columnName' => 'state'], $this->cm->fieldMappings['state']); } public function testAddLifecycleEvent() { $this->builder->addLifecycleEvent('getStatus', 'postLoad'); - $this->assertEquals(array('postLoad' => array('getStatus')), $this->cm->lifecycleCallbacks); + $this->assertEquals(['postLoad' => ['getStatus']], $this->cm->lifecycleCallbacks); } public function testCreateManyToOne() @@ -267,28 +272,30 @@ class ClassMetadataBuilderTest extends OrmTestCase ->build() ); - $this->assertEquals(array('groups' => array ( + $this->assertEquals( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array ( + 'cascade' => [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'fetch' => 4, - 'joinColumns' => array ( + 'joinColumns' => [ 0 => - array ( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'type' => 2, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -300,20 +307,20 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => true, 'isCascadeDetach' => true, 'sourceToTargetKeyColumns' => - array ( + [ 'group_id' => 'id', - ), + ], 'joinColumnFieldNames' => - array ( + [ 'group_id' => 'group_id', - ), + ], 'targetToSourceKeyColumns' => - array ( + [ 'id' => 'group_id', - ), + ], 'orphanRemoval' => false, - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testCreateManyToOneWithIdentity() @@ -330,29 +337,29 @@ class ClassMetadataBuilderTest extends OrmTestCase ); $this->assertEquals( - array( - 'groups' => array( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array( + 'cascade' => [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'fetch' => 4, - 'joinColumns' => array( + 'joinColumns' => [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'type' => 2, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -364,21 +371,21 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => true, 'isCascadeDetach' => true, 'sourceToTargetKeyColumns' => - array( + [ 'group_id' => 'id', - ), + ], 'joinColumnFieldNames' => - array( + [ 'group_id' => 'group_id', - ), + ], 'targetToSourceKeyColumns' => - array( + [ 'id' => 'group_id', - ), + ], 'orphanRemoval' => false, 'id' => true - ), - ), + ], + ], $this->cm->associationMappings ); } @@ -393,28 +400,30 @@ class ClassMetadataBuilderTest extends OrmTestCase ->build() ); - $this->assertEquals(array('groups' => array ( + $this->assertEquals( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array ( + 'cascade' => [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'fetch' => 4, - 'joinColumns' => array ( + 'joinColumns' => [ 0 => - array ( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => true, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'type' => 1, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -426,20 +435,20 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => true, 'isCascadeDetach' => true, 'sourceToTargetKeyColumns' => - array ( + [ 'group_id' => 'id', - ), + ], 'joinColumnFieldNames' => - array ( + [ 'group_id' => 'group_id', - ), + ], 'targetToSourceKeyColumns' => - array ( + [ 'id' => 'group_id', - ), + ], 'orphanRemoval' => false - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testCreateOneToOneWithIdentity() @@ -456,30 +465,30 @@ class ClassMetadataBuilderTest extends OrmTestCase ); $this->assertEquals( - array( - 'groups' => array( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array( + 'cascade' => [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'fetch' => 4, 'id' => true, - 'joinColumns' => array( + 'joinColumns' => [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'type' => 1, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -491,20 +500,20 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => true, 'isCascadeDetach' => true, 'sourceToTargetKeyColumns' => - array( + [ 'group_id' => 'id', - ), + ], 'joinColumnFieldNames' => - array( + [ 'group_id' => 'group_id', - ), + ], 'targetToSourceKeyColumns' => - array( + [ 'id' => 'group_id', - ), + ], 'orphanRemoval' => false - ), - ), + ], + ], $this->cm->associationMappings ); } @@ -534,48 +543,49 @@ class ClassMetadataBuilderTest extends OrmTestCase ->build() ); - $this->assertEquals(array( + $this->assertEquals( + [ 'groups' => - array( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', 'cascade' => - array( + [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'fetch' => 4, 'joinTable' => - array( + [ 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'inverseJoinColumns' => - array( + [ 0 => - array( + [ 'name' => 'user_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => NULL, 'columnDefinition' => NULL, - ), - ), + ], + ], 'name' => 'groups_users', - ), + ], 'type' => 8, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -588,21 +598,21 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeDetach' => true, 'isOnDeleteCascade' => true, 'relationToSourceKeyColumns' => - array( + [ 'group_id' => 'id', - ), + ], 'joinTableColumns' => - array( + [ 0 => 'group_id', 1 => 'user_id', - ), + ], 'relationToTargetKeyColumns' => - array( + [ 'user_id' => 'id', - ), + ], 'orphanRemoval' => false, - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testThrowsExceptionOnCreateManyToManyWithIdentity() @@ -624,21 +634,22 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent( $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') ->mappedBy('test') - ->setOrderBy(array('test')) + ->setOrderBy(['test']) ->setIndexBy('test') ->build() ); - $this->assertEquals(array( + $this->assertEquals( + [ 'groups' => - array( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', 'mappedBy' => 'test', 'orderBy' => - array( + [ 0 => 'test', - ), + ], 'indexBy' => 'test', 'type' => 4, 'inversedBy' => NULL, @@ -646,16 +657,16 @@ class ClassMetadataBuilderTest extends OrmTestCase 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', 'fetch' => 2, 'cascade' => - array( - ), + [ + ], 'isCascadeRemove' => false, 'isCascadePersist' => false, 'isCascadeRefresh' => false, 'isCascadeMerge' => false, 'isCascadeDetach' => false, 'orphanRemoval' => false, - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testThrowsExceptionOnCreateOneToManyWithIdentity() @@ -665,7 +676,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') ->makePrimaryKey() ->mappedBy('test') - ->setOrderBy(array('test')) + ->setOrderBy(['test']) ->setIndexBy('test') ->build(); } @@ -680,23 +691,24 @@ class ClassMetadataBuilderTest extends OrmTestCase ->build() ); - $this->assertEquals(array( - 'groups' => array( + $this->assertEquals( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array (), + 'cascade' => [], 'fetch' => 2, - 'joinColumns' => array ( + 'joinColumns' => [ 0 => - array ( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => true, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), + ], + ], 'type' => 1, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -708,20 +720,20 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => false, 'isCascadeDetach' => false, 'sourceToTargetKeyColumns' => - array ( + [ 'group_id' => 'id', - ), + ], 'joinColumnFieldNames' => - array ( + [ 'group_id' => 'group_id', - ), + ], 'targetToSourceKeyColumns' => - array ( + [ 'id' => 'group_id', - ), + ], 'orphanRemoval' => true - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testOrphanRemovalOnCreateOneToMany() @@ -734,9 +746,10 @@ class ClassMetadataBuilderTest extends OrmTestCase ->build() ); - $this->assertEquals(array( + $this->assertEquals( + [ 'groups' => - array( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', 'mappedBy' => 'test', @@ -745,15 +758,15 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isOwningSide' => false, 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', 'fetch' => 2, - 'cascade' => array(), + 'cascade' => [], 'isCascadeRemove' => true, 'isCascadePersist' => false, 'isCascadeRefresh' => false, 'isCascadeMerge' => false, 'isCascadeDetach' => false, 'orphanRemoval' => true, - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function testExceptionOnOrphanRemovalOnManyToOne() @@ -775,32 +788,33 @@ class ClassMetadataBuilderTest extends OrmTestCase ->orphanRemoval() ->build(); - $this->assertEquals(array( - 'groups' => array( + $this->assertEquals( + [ + 'groups' => [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', - 'cascade' => array(), + 'cascade' => [], 'fetch' => 2, - 'joinTable' => array( - 'joinColumns' => array( - 0 => array( + 'joinTable' => [ + 'joinColumns' => [ + 0 => [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'nullable' => true, 'unique' => false, 'onDelete' => 'CASCADE', 'columnDefinition' => NULL, - ), - ), - 'inverseJoinColumns' => array( - 0 => array( + ], + ], + 'inverseJoinColumns' => [ + 0 => [ 'name' => 'cmsgroup_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE' - ) - ), + ] + ], 'name' => 'cmsuser_cmsgroup', - ), + ], 'type' => 8, 'mappedBy' => NULL, 'inversedBy' => NULL, @@ -812,19 +826,19 @@ class ClassMetadataBuilderTest extends OrmTestCase 'isCascadeMerge' => false, 'isCascadeDetach' => false, 'isOnDeleteCascade' => true, - 'relationToSourceKeyColumns' => array( + 'relationToSourceKeyColumns' => [ 'group_id' => 'id', - ), - 'joinTableColumns' => array( + ], + 'joinTableColumns' => [ 0 => 'group_id', 1 => 'cmsgroup_id', - ), - 'relationToTargetKeyColumns' => array( + ], + 'relationToTargetKeyColumns' => [ 'cmsgroup_id' => 'id', - ), + ], 'orphanRemoval' => true, - ), - ), $this->cm->associationMappings); + ], + ], $this->cm->associationMappings); } public function assertIsFluent($ret) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index f40d657b5..bdfd6893d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -42,7 +42,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $cmf->setMetadataFor($cm1->name, $cm1); // Prechecks - $this->assertEquals(array(), $cm1->parentClasses); + $this->assertEquals([], $cm1->parentClasses); $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $cm1->inheritanceType); $this->assertTrue($cm1->hasField('name')); $this->assertEquals(2, count($cm1->associationMappings)); @@ -55,7 +55,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $this->assertSame($cm1, $cmMap1); $this->assertEquals('group', $cmMap1->table['name']); $this->assertTrue($cmMap1->table['quoted']); - $this->assertEquals(array(), $cmMap1->parentClasses); + $this->assertEquals([], $cmMap1->parentClasses); $this->assertTrue($cmMap1->hasField('name')); } @@ -63,8 +63,9 @@ class ClassMetadataFactoryTest extends OrmTestCase { $cm1 = $this->_createValidClassMetadata(); $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_CUSTOM); - $cm1->customGeneratorDefinition = array( - "class" => "Doctrine\Tests\ORM\Mapping\CustomIdGenerator"); + $cm1->customGeneratorDefinition = [ + "class" => "Doctrine\Tests\ORM\Mapping\CustomIdGenerator" + ]; $cmf = $this->_createTestFactory(); $cmf->setMetadataForClass($cm1->name, $cm1); @@ -80,7 +81,7 @@ class ClassMetadataFactoryTest extends OrmTestCase { $cm1 = $this->_createValidClassMetadata(); $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_CUSTOM); - $cm1->customGeneratorDefinition = array("class" => "NotExistingGenerator"); + $cm1->customGeneratorDefinition = ["class" => "NotExistingGenerator"]; $cmf = $this->_createTestFactory(); $cmf->setMetadataForClass($cm1->name, $cm1); $this->expectException(ORMException::class); @@ -103,7 +104,7 @@ class ClassMetadataFactoryTest extends OrmTestCase { require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php"; - $metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/')); + $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']); $entityManager = $this->_createEntityManager($metadataDriver); @@ -166,7 +167,7 @@ class ClassMetadataFactoryTest extends OrmTestCase public function testAddDefaultDiscriminatorMap() { $cmf = new ClassMetadataFactory(); - $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/JoinedInheritanceType/')); + $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']); $em = $this->_createEntityManager($driver); $cmf->setEntityManager($em); @@ -194,7 +195,7 @@ class ClassMetadataFactoryTest extends OrmTestCase // ClassMetadataFactory::addDefaultDiscriminatorMap shouldn't be called again, because the // discriminator map is already cached - $cmf = $this->getMockBuilder(ClassMetadataFactory::class)->setMethods(array('addDefaultDiscriminatorMap'))->getMock(); + $cmf = $this->getMockBuilder(ClassMetadataFactory::class)->setMethods(['addDefaultDiscriminatorMap'])->getMock(); $cmf->setEntityManager($em); $cmf->expects($this->never()) ->method('addDefaultDiscriminatorMap'); @@ -219,7 +220,7 @@ class ClassMetadataFactoryTest extends OrmTestCase // getting all the metadata should work, even if get DatabasePlatform blows up $metadata = $cmf->getAllMetadata(); // this will just be an empty array - there was no error - $this->assertEquals(array(), $metadata); + $this->assertEquals([], $metadata); } protected function _createEntityManager($metadataDriver, $conn = null) @@ -230,7 +231,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); if (!$conn) { - $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager); + $conn = new ConnectionMock([], $driverMock, $config, $eventManager); } $config->setMetadataDriverImpl($metadataDriver); @@ -258,18 +259,20 @@ class ClassMetadataFactoryTest extends OrmTestCase // Self-made metadata $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1'); $cm1->initializeReflection(new RuntimeReflectionService()); - $cm1->setPrimaryTable(array('name' => '`group`')); + $cm1->setPrimaryTable(['name' => '`group`']); // Add a mapped field - $cm1->mapField(array('fieldName' => 'name', 'type' => 'string')); + $cm1->mapField(['fieldName' => 'name', 'type' => 'string']); // Add a mapped field - $cm1->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true)); + $cm1->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); // and a mapped association - $cm1->mapOneToOne(array('fieldName' => 'other', 'targetEntity' => 'TestEntity1', 'mappedBy' => 'this')); + $cm1->mapOneToOne(['fieldName' => 'other', 'targetEntity' => 'TestEntity1', 'mappedBy' => 'this']); // and an association on the owning side - $joinColumns = array( - array('name' => 'other_id', 'referencedColumnName' => 'id') + $joinColumns = [ + ['name' => 'other_id', 'referencedColumnName' => 'id'] + ]; + $cm1->mapOneToOne( + ['fieldName' => 'association', 'targetEntity' => 'TestEntity1', 'joinColumns' => $joinColumns] ); - $cm1->mapOneToOne(array('fieldName' => 'association', 'targetEntity' => 'TestEntity1', 'joinColumns' => $joinColumns)); // and an id generator type $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO); return $cm1; @@ -281,7 +284,7 @@ class ClassMetadataFactoryTest extends OrmTestCase public function testQuoteMetadata() { $cmf = new ClassMetadataFactory(); - $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Quote/')); + $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']); $em = $this->_createEntityManager($driver); $cmf->setEntityManager($em); @@ -368,7 +371,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $cmf = new ClassMetadataFactory(); $mockDriver = new MetadataDriverMock(); $em = $this->_createEntityManager($mockDriver); - $listener = $this->getMockBuilder(\stdClass::class)->setMethods(array('onClassMetadataNotFound'))->getMock(); + $listener = $this->getMockBuilder(\stdClass::class)->setMethods(['onClassMetadataNotFound'])->getMock(); $eventManager = $em->getEventManager(); $cmf->setEntityManager($em); @@ -384,7 +387,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $args->setFoundMetadata($metadata); })); - $eventManager->addEventListener(array(Events::onClassMetadataNotFound), $listener); + $eventManager->addEventListener([Events::onClassMetadataNotFound], $listener); $this->assertSame($metadata, $cmf->getMetadataFor('Foo')); } @@ -412,11 +415,13 @@ class ClassMetadataFactoryTest extends OrmTestCase { $metadata = $this->_createValidClassMetadata(); - $metadata->mapEmbedded(array( + $metadata->mapEmbedded( + [ 'fieldName' => 'embedded', 'class' => '', 'columnPrefix' => false, - )); + ] + ); $cmf = $this->_createTestFactory(); @@ -434,7 +439,7 @@ class ClassMetadataFactoryTest extends OrmTestCase public function testInheritsIdGeneratorMappingFromEmbeddable() { $cmf = new ClassMetadataFactory(); - $driver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/DDC4006/')); + $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']); $em = $this->_createEntityManager($driver); $cmf->setEntityManager($em); @@ -447,8 +452,8 @@ class ClassMetadataFactoryTest extends OrmTestCase /* Test subject class with overridden factory method for mocking purposes */ class ClassMetadataFactoryTestSubject extends ClassMetadataFactory { - private $mockMetadata = array(); - private $requestedClasses = array(); + private $mockMetadata = []; + private $requestedClasses = []; /** @override */ protected function newClassMetadataInstance($className) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php index 04cea3894..424cafb94 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php @@ -26,11 +26,11 @@ class ClassMetadataLoadEventTest extends OrmTestCase public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) { $classMetadata = $eventArgs->getClassMetadata(); - $field = array( + $field = [ 'fieldName' => 'about', 'type' => 'string', 'length' => 255 - ); + ]; $classMetadata->mapField($field); } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 44243e113..bfaec8041 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -26,19 +26,19 @@ class ClassMetadataTest extends OrmTestCase $this->assertInstanceOf('ReflectionClass', $cm->reflClass); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->rootEntityName); - $this->assertEquals(array(), $cm->subClasses); - $this->assertEquals(array(), $cm->parentClasses); + $this->assertEquals([], $cm->subClasses); + $this->assertEquals([], $cm->parentClasses); $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $cm->inheritanceType); // Customize state $cm->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_SINGLE_TABLE); - $cm->setSubclasses(array("One", "Two", "Three")); - $cm->setParentClasses(array("UserParent")); + $cm->setSubclasses(["One", "Two", "Three"]); + $cm->setParentClasses(["UserParent"]); $cm->setCustomRepositoryClass("UserRepository"); - $cm->setDiscriminatorColumn(array('name' => 'disc', 'type' => 'integer')); - $cm->mapOneToOne(array('fieldName' => 'phonenumbers', 'targetEntity' => 'CmsAddress', 'mappedBy' => 'foo')); + $cm->setDiscriminatorColumn(['name' => 'disc', 'type' => 'integer']); + $cm->mapOneToOne(['fieldName' => 'phonenumbers', 'targetEntity' => 'CmsAddress', 'mappedBy' => 'foo']); $cm->markReadOnly(); - $cm->addNamedQuery(array('name' => 'dql', 'query' => 'foo')); + $cm->addNamedQuery(['name' => 'dql', 'query' => 'foo']); $this->assertEquals(1, count($cm->associationMappings)); $serialized = serialize($cm); @@ -51,10 +51,11 @@ class ClassMetadataTest extends OrmTestCase $this->assertInstanceOf('ReflectionClass', $cm->reflClass); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); $this->assertEquals('UserParent', $cm->rootEntityName); - $this->assertEquals(array('Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'), $cm->subClasses); - $this->assertEquals(array('UserParent'), $cm->parentClasses); + $this->assertEquals( + ['Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'], $cm->subClasses); + $this->assertEquals(['UserParent'], $cm->parentClasses); $this->assertEquals('Doctrine\Tests\Models\CMS\UserRepository', $cm->customRepositoryClassName); - $this->assertEquals(array('name' => 'disc', 'type' => 'integer', 'fieldName' => 'disc'), $cm->discriminatorColumn); + $this->assertEquals(['name' => 'disc', 'type' => 'integer', 'fieldName' => 'disc'], $cm->discriminatorColumn); $this->assertTrue($cm->associationMappings['phonenumbers']['type'] == ClassMetadata::ONE_TO_ONE); $this->assertEquals(1, count($cm->associationMappings)); $oneOneMapping = $cm->getAssociationMapping('phonenumbers'); @@ -62,7 +63,7 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals('phonenumbers', $oneOneMapping['fieldName']); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $oneOneMapping['targetEntity']); $this->assertTrue($cm->isReadOnly); - $this->assertEquals(array('dql' => array('name'=>'dql','query'=>'foo','dql'=>'foo')), $cm->namedQueries); + $this->assertEquals(['dql' => ['name'=>'dql','query'=>'foo','dql'=>'foo']], $cm->namedQueries); } public function testFieldIsNullable() @@ -71,15 +72,15 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); // Explicit Nullable - $cm->mapField(array('fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50)); + $cm->mapField(['fieldName' => 'status', 'nullable' => true, 'type' => 'string', 'length' => 50]); $this->assertTrue($cm->isNullable('status')); // Explicit Not Nullable - $cm->mapField(array('fieldName' => 'username', 'nullable' => false, 'type' => 'string', 'length' => 50)); + $cm->mapField(['fieldName' => 'username', 'nullable' => false, 'type' => 'string', 'length' => 50]); $this->assertFalse($cm->isNullable('username')); // Implicit Not Nullable - $cm->mapField(array('fieldName' => 'name', 'type' => 'string', 'length' => 50)); + $cm->mapField(['fieldName' => 'name', 'type' => 'string', 'length' => 50]); $this->assertFalse($cm->isNullable('name'), "By default a field should not be nullable."); } @@ -92,15 +93,17 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_Article'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToMany(array( + $cm->mapManyToMany( + [ 'fieldName' => 'author', 'targetEntity' => 'DoctrineGlobal_User', - 'joinTable' => array( + 'joinTable' => [ 'name' => 'bar', - 'joinColumns' => array(array('name' => 'bar_id', 'referencedColumnName' => 'id')), - 'inverseJoinColumns' => array(array('name' => 'baz_id', 'referencedColumnName' => 'id')), - ), - )); + 'joinColumns' => [['name' => 'bar_id', 'referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['name' => 'baz_id', 'referencedColumnName' => 'id']], + ], + ] + ); $this->assertEquals("DoctrineGlobal_User", $cm->associationMappings['author']['targetEntity']); } @@ -110,18 +113,20 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( - array( + [ 'fieldName' => 'groups', 'targetEntity' => 'CmsGroup' - )); + ] + ); $assoc = $cm->associationMappings['groups']; //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $assoc); - $this->assertEquals(array( + $this->assertEquals( + [ 'name' => 'cmsuser_cmsgroup', - 'joinColumns' => array(array('name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')), - 'inverseJoinColumns' => array(array('name' => 'cmsgroup_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')) - ), $assoc['joinTable']); + 'joinColumns' => [['name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']], + 'inverseJoinColumns' => [['name' => 'cmsgroup_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']] + ], $assoc['joinTable']); $this->assertTrue($assoc['isOnDeleteCascade']); } @@ -130,10 +135,11 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( - array( + [ 'fieldName' => 'groups', 'targetEntity' => 'CmsGroup' - )); + ] + ); /* @var $assoc \Doctrine\ORM\Mapping\ManyToManyMapping */ $assoc = $cm->associationMappings['groups']; @@ -151,7 +157,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_User'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setDiscriminatorMap(array('descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User')); + $cm->setDiscriminatorMap(['descr' => 'DoctrineGlobal_Article', 'foo' => 'DoctrineGlobal_User']); $this->assertEquals("DoctrineGlobal_Article", $cm->discriminatorMap['descr']); $this->assertEquals("DoctrineGlobal_User", $cm->discriminatorMap['foo']); @@ -166,7 +172,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_User'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setSubclasses(array('DoctrineGlobal_Article')); + $cm->setSubclasses(['DoctrineGlobal_Article']); $this->assertEquals("DoctrineGlobal_Article", $cm->subClasses[0]); } @@ -176,7 +182,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testSetInvalidVersionMapping_ThrowsException() { - $field = array(); + $field = []; $field['fieldName'] = 'foo'; $field['type'] = 'string'; @@ -202,8 +208,8 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $a1 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo'); - $a2 = array('fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo'); + $a1 = ['fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo']; + $a2 = ['fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo']; $cm->addInheritedAssociationMapping($a1); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); @@ -215,10 +221,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->mapField(array('fieldName' => 'username', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'username', 'columnName' => 'name']); } public function testDuplicateColumnName_DiscriminatorColumn_ThrowsMappingException() @@ -226,10 +232,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->setDiscriminatorColumn(array('name' => 'name')); + $cm->setDiscriminatorColumn(['name' => 'name']); } public function testDuplicateColumnName_DiscriminatorColumn2_ThrowsMappingException() @@ -237,10 +243,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setDiscriminatorColumn(array('name' => 'name')); + $cm->setDiscriminatorColumn(['name' => 'name']); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); } public function testDuplicateFieldAndAssociationMapping1_ThrowsException() @@ -248,10 +254,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser')); + $cm->mapOneToOne(['fieldName' => 'name', 'targetEntity' => 'CmsUser']); } public function testDuplicateFieldAndAssociationMapping2_ThrowsException() @@ -259,10 +265,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapOneToOne(array('fieldName' => 'name', 'targetEntity' => 'CmsUser')); + $cm->mapOneToOne(['fieldName' => 'name', 'targetEntity' => 'CmsUser']); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); + $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); } /** @@ -284,7 +290,7 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); // When table's name is not given - $primaryTable = array(); + $primaryTable = []; $cm->setPrimaryTable($primaryTable); $this->assertEquals('CmsUser', $cm->getTableName()); @@ -293,12 +299,17 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $cm->initializeReflection(new RuntimeReflectionService()); // When joinTable's name is not given - $cm->mapManyToMany(array( + $cm->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', - 'joinTable' => array('joinColumns' => array(array('referencedColumnName' => 'id')), - 'inverseJoinColumns' => array(array('referencedColumnName' => 'id'))))); + 'joinTable' => [ + 'joinColumns' => [['referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['referencedColumnName' => 'id']] + ] + ] + ); $this->assertEquals('cmsaddress_cmsuser', $cm->associationMappings['user']['joinTable']['name']); } @@ -309,21 +320,29 @@ class ClassMetadataTest extends OrmTestCase // this is really dirty, but it's the simplest way to test whether // joinColumn's name will be automatically set to user_id - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', - 'joinColumns' => array(array('referencedColumnName' => 'id')))); + 'joinColumns' => [['referencedColumnName' => 'id']] + ] + ); $this->assertEquals('user_id', $cm->associationMappings['user']['joinColumns'][0]['name']); $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToMany(array( + $cm->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', - 'joinTable' => array('name' => 'user_CmsUser', - 'joinColumns' => array(array('referencedColumnName' => 'id')), - 'inverseJoinColumns' => array(array('referencedColumnName' => 'id'))))); + 'joinTable' => [ + 'name' => 'user_CmsUser', + 'joinColumns' => [['referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['referencedColumnName' => 'id']] + ] + ] + ); $this->assertEquals('cmsaddress_id', $cm->associationMappings['user']['joinTable']['joinColumns'][0]['name']); $this->assertEquals('cmsuser_id', $cm->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']); } @@ -337,19 +356,23 @@ class ClassMetadataTest extends OrmTestCase $oneToOneMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); - $oneToOneMetadata->mapOneToOne(array( + $oneToOneMetadata->mapOneToOne( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser' - )); + ] + ); - $manyToManyMetadata->mapManyToMany(array( + $manyToManyMetadata->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser' - )); + ] + ); - $this->assertEquals(array('USER_ID'=>'ID'), $oneToOneMetadata->associationMappings['user']['sourceToTargetKeyColumns']); - $this->assertEquals(array('USER_ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['joinColumnFieldNames']); - $this->assertEquals(array('ID'=>'USER_ID'), $oneToOneMetadata->associationMappings['user']['targetToSourceKeyColumns']); + $this->assertEquals(['USER_ID'=>'ID'], $oneToOneMetadata->associationMappings['user']['sourceToTargetKeyColumns']); + $this->assertEquals(['USER_ID'=>'USER_ID'], $oneToOneMetadata->associationMappings['user']['joinColumnFieldNames']); + $this->assertEquals(['ID'=>'USER_ID'], $oneToOneMetadata->associationMappings['user']['targetToSourceKeyColumns']); $this->assertEquals('USER_ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['name']); $this->assertEquals('ID', $oneToOneMetadata->associationMappings['user']['joinColumns'][0]['referencedColumnName']); @@ -357,9 +380,9 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals('CMS_ADDRESS_CMS_USER', $manyToManyMetadata->associationMappings['user']['joinTable']['name']); - $this->assertEquals(array('CMS_ADDRESS_ID','CMS_USER_ID'), $manyToManyMetadata->associationMappings['user']['joinTableColumns']); - $this->assertEquals(array('CMS_ADDRESS_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']); - $this->assertEquals(array('CMS_USER_ID'=>'ID'), $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']); + $this->assertEquals(['CMS_ADDRESS_ID','CMS_USER_ID'], $manyToManyMetadata->associationMappings['user']['joinTableColumns']); + $this->assertEquals(['CMS_ADDRESS_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']); + $this->assertEquals(['CMS_USER_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']); $this->assertEquals('CMS_ADDRESS_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['joinColumns'][0]['name']); $this->assertEquals('CMS_USER_ID', $manyToManyMetadata->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']); @@ -369,7 +392,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_Article', $namingStrategy); - $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser')); + $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']); $this->assertEquals('DOCTRINE_GLOBAL_ARTICLE_CMS_USER', $cm->associationMappings['author']['joinTable']['name']); } @@ -381,10 +404,10 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name')); - $cm->mapField(array('fieldName' => 'username')); + $cm->mapField(['fieldName' => 'name']); + $cm->mapField(['fieldName' => 'username']); - $cm->setIdentifier(array('name', 'username')); + $cm->setIdentifier(['name', 'username']); $this->assertTrue($cm->isIdentifierComposite); } @@ -410,7 +433,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_Article'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToMany(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser')); + $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']); $this->assertEquals('doctrineglobal_article_cmsuser', $cm->associationMappings['author']['joinTable']['name']); } @@ -423,15 +446,17 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'fieldName' => 'article', 'id' => true, 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(), - )); + 'joinColumns' => [], + ] + ); $this->assertTrue($cm->containsForeignIdentifier, "Identifier Association should set 'containsForeignIdentifier' boolean flag."); - $this->assertEquals(array("article"), $cm->identifier); + $this->assertEquals(["article"], $cm->identifier); } /** @@ -445,13 +470,15 @@ class ClassMetadataTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('The orphan removal option is not allowed on an association that'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'fieldName' => 'article', 'id' => true, 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', 'orphanRemoval' => true, - 'joinColumns' => array(), - )); + 'joinColumns' => [], + ] + ); } /** @@ -465,13 +492,15 @@ class ClassMetadataTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('An inverse association is not allowed to be identifier in'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'fieldName' => 'article', 'id' => true, 'mappedBy' => 'details', // INVERSE! 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(), - )); + 'joinColumns' => [], + ] + ); } /** @@ -485,12 +514,14 @@ class ClassMetadataTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('Many-to-many or one-to-many associations are not allowed to be identifier in'); - $cm->mapManyToMany(array( + $cm->mapManyToMany( + [ 'fieldName' => 'article', 'id' => true, 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(), - )); + 'joinColumns' => [], + ] + ); } /** @@ -504,7 +535,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => '')); + $cm->mapField(['fieldName' => '']); } public function testRetrievalOfNamedQueries() @@ -515,10 +546,12 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals(0, count($cm->getNamedQueries())); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'name' => 'userById', 'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1' - )); + ] + ); $this->assertEquals(1, count($cm->getNamedQueries())); } @@ -534,14 +567,16 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals(0, count($cm->getSqlResultSetMappings())); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', - ), - ), - )); + ], + ], + ] + ); $this->assertEquals(1, count($cm->getSqlResultSetMappings())); } @@ -552,10 +587,12 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'name' => 'all', 'query' => 'SELECT u FROM __CLASS__ u' - )); + ] + ); $this->assertTrue($cm->hasNamedQuery('all')); $this->assertFalse($cm->hasNamedQuery('userById')); @@ -569,19 +606,23 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultSetMapping' => 'result-mapping-name', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', - )); + ] + ); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-by-id', 'query' => 'SELECT * FROM cms_users WHERE id = ?', 'resultClass' => '__CLASS__', 'resultSetMapping' => 'result-mapping-name', - )); + ] + ); $mapping = $cm->getNamedNativeQuery('find-all'); $this->assertEquals('SELECT * FROM cms_users', $mapping['query']); @@ -602,52 +643,54 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => '__CLASS__', - 'fields' => array( - array( + 'fields' => [ + [ 'name' => 'id', 'column'=> 'id' - ), - array( + ], + [ 'name' => 'name', 'column'=> 'name' - ) - ) - ), - array( + ] + ] + ], + [ 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsEmail', - 'fields' => array( - array( + 'fields' => [ + [ 'name' => 'id', 'column'=> 'id' - ), - array( + ], + [ 'name' => 'email', 'column'=> 'email' - ) - ) - ) - ), - 'columns' => array( - array( + ] + ] + ] + ], + 'columns' => [ + [ 'name' => 'scalarColumn' - ) - ) - )); + ] + ] + ] + ); $mapping = $cm->getSqlResultSetMapping('find-all'); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $mapping['entities'][0]['entityClass']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][0]['fields'][0]); - $this->assertEquals(array('name'=>'name','column'=>'name'), $mapping['entities'][0]['fields'][1]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); + $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $mapping['entities'][1]['entityClass']); - $this->assertEquals(array('name'=>'id','column'=>'id'), $mapping['entities'][1]['fields'][0]); - $this->assertEquals(array('name'=>'email','column'=>'email'), $mapping['entities'][1]['fields'][1]); + $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]); + $this->assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]); $this->assertEquals('scalarColumn', $mapping['columns'][0]['name']); } @@ -660,14 +703,16 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', - ), - ), - )); + ], + ], + ] + ); $this->assertTrue($cm->hasSqlResultSetMapping('find-all')); $this->assertFalse($cm->hasSqlResultSetMapping('find-by-id')); @@ -682,12 +727,14 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'resultSetMapping' => 'result-mapping-name' - )); + ] + ); $this->assertTrue($cm->hasNamedNativeQuery('find-all')); $this->assertFalse($cm->hasNamedNativeQuery('find-by-id')); @@ -699,10 +746,12 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'name' => 'userById', 'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1' - )); + ] + ); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1', $cm->getNamedQuery('userById')); } @@ -717,12 +766,14 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals(0, count($cm->getNamedNativeQueries())); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'resultSetMapping' => 'result-mapping-name' - )); + ] + ); $this->assertEquals(1, count($cm->getNamedNativeQueries())); } @@ -753,15 +804,19 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'name' => 'userById', 'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1' - )); + ] + ); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'name' => 'userById', 'query' => 'SELECT u FROM __CLASS__ u WHERE u.id = ?1' - )); + ] + ); } /** @@ -775,19 +830,23 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'resultSetMapping' => 'result-mapping-name' - )); + ] + ); - $cm->addNamedNativeQuery(array( + $cm->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'resultSetMapping' => 'result-mapping-name' - )); + ] + ); } /** @@ -801,23 +860,27 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', - ), - ), - )); + ], + ], + ] + ); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( + 'entities' => [ + [ 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', - ), - ), - )); + ], + ], + ] + ); } /** @@ -854,7 +917,7 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass')); + $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass']); $this->expectException(MappingException::class); $this->expectExceptionMessage("The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'."); @@ -872,9 +935,11 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'query' => 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', - )); + ] + ); } /** @@ -887,11 +952,13 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addNamedQuery(array( + $cm->addNamedQuery( + [ 'query' => 'SELECT * FROM cms_users', 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'resultSetMapping' => 'result-mapping-name' - )); + ] + ); } /** @@ -904,14 +971,16 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->addSqlResultSetMapping(array( + $cm->addSqlResultSetMapping( + [ 'name' => 'find-all', - 'entities' => array( - array( - 'fields' => array() - ) - ), - )); + 'entities' => [ + [ + 'fields' => [] + ] + ], + ] + ); } /** @@ -922,7 +991,7 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setDiscriminatorColumn(array()); + $cm->setDiscriminatorColumn([]); } /** @@ -941,15 +1010,19 @@ class ClassMetadataTest extends OrmTestCase $articleMetadata->initializeReflection(new RuntimeReflectionService()); $routingMetadata->initializeReflection(new RuntimeReflectionService()); - $addressMetadata->mapManyToMany(array( + $addressMetadata->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser' - )); + ] + ); - $articleMetadata->mapManyToMany(array( + $articleMetadata->mapManyToMany( + [ 'fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser' - )); + ] + ); $this->assertEquals('routing_routingleg', $routingMetadata->table['name']); $this->assertEquals('cms_cmsaddress_cms_cmsuser', $addressMetadata->associationMappings['user']['joinTable']['name']); @@ -967,13 +1040,14 @@ class ClassMetadataTest extends OrmTestCase $metadata->initializeReflection(new RuntimeReflectionService()); - $metadata->mapField(array('fieldName'=>'country')); - $metadata->mapField(array('fieldName'=>'city')); + $metadata->mapField(['fieldName'=>'country']); + $metadata->mapField(['fieldName'=>'city']); - $this->assertEquals($metadata->fieldNames, array( + $this->assertEquals($metadata->fieldNames, [ 'cmsaddress_country' => 'country', 'cmsaddress_city' => 'city' - )); + ] + ); } /** @@ -987,7 +1061,7 @@ class ClassMetadataTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage("You have specified invalid cascade options for Doctrine\Tests\Models\CMS\CmsUser::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'"); - $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => array('invalid'))); + $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => ['invalid']]); } /** @@ -999,9 +1073,9 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Admin'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'DDC964Address')); + $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'DDC964Address']); - $cm->setAssociationOverride('invalidPropertyName', array()); + $cm->setAssociationOverride('invalidPropertyName', []); } /** @@ -1013,9 +1087,9 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name')); + $cm->mapField(['fieldName' => 'name']); - $cm->setAttributeOverride('invalidPropertyName', array()); + $cm->setAttributeOverride('invalidPropertyName', []); } /** @@ -1027,9 +1101,9 @@ class ClassMetadataTest extends OrmTestCase { $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapField(array('fieldName' => 'name', 'type'=>'string')); + $cm->mapField(['fieldName' => 'name', 'type'=>'string']); - $cm->setAttributeOverride('name', array('type'=>'date')); + $cm->setAttributeOverride('name', ['type'=>'date']); } /** @@ -1065,23 +1139,23 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CustomType\CustomTypeParent'); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( - array( + [ 'fieldName' => 'friendsWithMe', 'targetEntity' => 'CustomTypeParent' - ) + ] ); $this->assertEquals( - array( + [ 'name' => 'customtypeparent_customtypeparent', - 'joinColumns' => array(array('name' => 'customtypeparent_source', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')), - 'inverseJoinColumns' => array(array('name' => 'customtypeparent_target', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')), - ), + 'joinColumns' => [['name' => 'customtypeparent_source', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']], + 'inverseJoinColumns' => [['name' => 'customtypeparent_target', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE']], + ], $cm->associationMappings['friendsWithMe']['joinTable'] ); - $this->assertEquals(array('customtypeparent_source', 'customtypeparent_target'), $cm->associationMappings['friendsWithMe']['joinTableColumns']); - $this->assertEquals(array('customtypeparent_source' => 'id'), $cm->associationMappings['friendsWithMe']['relationToSourceKeyColumns']); - $this->assertEquals(array('customtypeparent_target' => 'id'), $cm->associationMappings['friendsWithMe']['relationToTargetKeyColumns']); + $this->assertEquals(['customtypeparent_source', 'customtypeparent_target'], $cm->associationMappings['friendsWithMe']['joinTableColumns']); + $this->assertEquals(['customtypeparent_source' => 'id'], $cm->associationMappings['friendsWithMe']['relationToSourceKeyColumns']); + $this->assertEquals(['customtypeparent_target' => 'id'], $cm->associationMappings['friendsWithMe']['relationToTargetKeyColumns']); } /** @@ -1093,7 +1167,7 @@ class ClassMetadataTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $cm->setSequenceGeneratorDefinition(array()); + $cm->setSequenceGeneratorDefinition([]); } /** @@ -1104,9 +1178,9 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setSequenceGeneratorDefinition(array('sequenceName' => '`foo`')); + $cm->setSequenceGeneratorDefinition(['sequenceName' => '`foo`']); - $this->assertEquals(array('sequenceName' => 'foo', 'quoted' => true), $cm->sequenceGeneratorDefinition); + $this->assertEquals(['sequenceName' => 'foo', 'quoted' => true], $cm->sequenceGeneratorDefinition); } /** @@ -1146,24 +1220,26 @@ class ClassMetadataTest extends OrmTestCase { $classMetadata = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1'); - $classMetadata->mapEmbedded(array( + $classMetadata->mapEmbedded( + [ 'fieldName' => 'test', 'class' => 'Doctrine\Tests\ORM\Mapping\TestEntity1', 'columnPrefix' => false, - )); + ] + ); - $field = array( + $field = [ 'fieldName' => 'test.embeddedProperty', 'type' => 'string', 'originalClass' => 'Doctrine\Tests\ORM\Mapping\TestEntity1', 'declaredField' => 'test', 'originalField' => 'embeddedProperty' - ); + ]; $classMetadata->mapField($field); $classMetadata->wakeupReflection(new StaticReflectionService()); - $this->assertEquals(array('test' => null, 'test.embeddedProperty' => null), $classMetadata->getReflectionProperties()); + $this->assertEquals(['test' => null, 'test.embeddedProperty' => null], $classMetadata->getReflectionProperties()); } public function testGetColumnNamesWithGivenFieldNames() @@ -1171,9 +1247,9 @@ class ClassMetadataTest extends OrmTestCase $metadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $metadata->initializeReflection(new RuntimeReflectionService()); - $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'columnName' => 'foo')); - $metadata->mapField(array('fieldName' => 'username', 'type' => 'string', 'columnName' => 'bar')); - $metadata->mapField(array('fieldName' => 'name', 'type' => 'string', 'columnName' => 'baz')); + $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'columnName' => 'foo']); + $metadata->mapField(['fieldName' => 'username', 'type' => 'string', 'columnName' => 'bar']); + $metadata->mapField(['fieldName' => 'name', 'type' => 'string', 'columnName' => 'baz']); self::assertSame(['foo', 'baz'], $metadata->getColumnNames(['status', 'name'])); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php index 6274a1468..220a26363 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php @@ -44,32 +44,39 @@ class NamingStrategyTest extends OrmTestCase */ static public function dataClassToTableName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'SomeClassName', + [ + self::defaultNaming(), 'SomeClassName', 'SomeClassName' - ), - array(self::defaultNaming(), 'SomeClassName', + ], + [ + self::defaultNaming(), 'SomeClassName', '\SomeClassName' - ), - array(self::defaultNaming(), 'Name', + ], + [ + self::defaultNaming(), 'Name', '\Some\Class\Name' - ), + ], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_class_name', + [ + self::underscoreNamingLower(), 'some_class_name', '\Name\Space\SomeClassName' - ), - array(self::underscoreNamingLower(), 'name', + ], + [ + self::underscoreNamingLower(), 'name', '\Some\Class\Name' - ), - array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME', + ], + [ + self::underscoreNamingUpper(), 'SOME_CLASS_NAME', '\Name\Space\SomeClassName' - ), - array(self::underscoreNamingUpper(), 'NAME', + ], + [ + self::underscoreNamingUpper(), 'NAME', '\Some\Class\Name' - ), - ); + ], + ]; } /** @@ -82,39 +89,46 @@ class NamingStrategyTest extends OrmTestCase /** * Data Provider for NamingStrategy#propertyToColumnName - * + * * @return array */ static public function dataPropertyToColumnName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'someProperty', + [ + self::defaultNaming(), 'someProperty', 'someProperty' - ), - array(self::defaultNaming(), 'SOME_PROPERTY', + ], + [ + self::defaultNaming(), 'SOME_PROPERTY', 'SOME_PROPERTY' - ), - array(self::defaultNaming(), 'some_property', + ], + [ + self::defaultNaming(), 'some_property', 'some_property' - ), + ], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_property', + [ + self::underscoreNamingLower(), 'some_property', 'someProperty' - ), - array(self::underscoreNamingUpper(), 'SOME_PROPERTY', + ], + [ + self::underscoreNamingUpper(), 'SOME_PROPERTY', 'someProperty' - ), - array(self::underscoreNamingUpper(), 'SOME_PROPERTY', + ], + [ + self::underscoreNamingUpper(), 'SOME_PROPERTY', 'some_property' - ), - array(self::underscoreNamingUpper(), 'SOME_PROPERTY', + ], + [ + self::underscoreNamingUpper(), 'SOME_PROPERTY', 'SOME_PROPERTY' - ), - ); + ], + ]; } - + /** * @dataProvider dataPropertyToColumnName * @@ -134,14 +148,14 @@ class NamingStrategyTest extends OrmTestCase */ static public function dataReferenceColumnName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'id'), + [self::defaultNaming(), 'id'], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'id'), - array(self::underscoreNamingUpper(), 'ID'), - ); + [self::underscoreNamingLower(), 'id'], + [self::underscoreNamingUpper(), 'ID'], + ]; } /** @@ -162,18 +176,18 @@ class NamingStrategyTest extends OrmTestCase */ static public function dataJoinColumnName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'someColumn_id', 'someColumn', null), - array(self::defaultNaming(), 'some_column_id', 'some_column', null), + [self::defaultNaming(), 'someColumn_id', 'someColumn', null], + [self::defaultNaming(), 'some_column_id', 'some_column', null], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_column_id', 'someColumn', null), - array(self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null), + [self::underscoreNamingLower(), 'some_column_id', 'someColumn', null], + [self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null], // JoinColumnClassNamingStrategy - array(new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'), - array(new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'), - ); + [new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'], + [new JoinColumnClassNamingStrategy(), 'classname_some_column_id', 'some_column', 'ClassName'], + ]; } /** @@ -195,39 +209,48 @@ class NamingStrategyTest extends OrmTestCase */ static public function dataJoinTableName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'someclassname_classname', + [ + self::defaultNaming(), 'someclassname_classname', 'SomeClassName', 'Some\ClassName', null, - ), - array(self::defaultNaming(), 'someclassname_classname', + ], + [ + self::defaultNaming(), 'someclassname_classname', '\SomeClassName', 'ClassName', null, - ), - array(self::defaultNaming(), 'name_classname', + ], + [ + self::defaultNaming(), 'name_classname', '\Some\Class\Name', 'ClassName', null, - ), + ], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_class_name_class_name', + [ + self::underscoreNamingLower(), 'some_class_name_class_name', 'SomeClassName', 'Some\ClassName', null, - ), - array(self::underscoreNamingLower(), 'some_class_name_class_name', + ], + [ + self::underscoreNamingLower(), 'some_class_name_class_name', '\SomeClassName', 'ClassName', null, - ), - array(self::underscoreNamingLower(), 'name_class_name', + ], + [ + self::underscoreNamingLower(), 'name_class_name', '\Some\Class\Name', 'ClassName', null, - ), + ], - array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME', + [ + self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME', 'SomeClassName', 'Some\ClassName', null, - ), - array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME', + ], + [ + self::underscoreNamingUpper(), 'SOME_CLASS_NAME_CLASS_NAME', '\SomeClassName', 'ClassName', null, - ), - array(self::underscoreNamingUpper(), 'NAME_CLASS_NAME', + ], + [ + self::underscoreNamingUpper(), 'NAME_CLASS_NAME', '\Some\Class\Name', 'ClassName', null, - ), - ); + ], + ]; } /** @@ -251,30 +274,36 @@ class NamingStrategyTest extends OrmTestCase */ static public function dataJoinKeyColumnName() { - return array( + return [ // DefaultNamingStrategy - array(self::defaultNaming(), 'someclassname_id', + [ + self::defaultNaming(), 'someclassname_id', 'SomeClassName', null, null, - ), - array(self::defaultNaming(), 'name_identifier', + ], + [ + self::defaultNaming(), 'name_identifier', '\Some\Class\Name', 'identifier', null, - ), + ], // UnderscoreNamingStrategy - array(self::underscoreNamingLower(), 'some_class_name_id', + [ + self::underscoreNamingLower(), 'some_class_name_id', 'SomeClassName', null, null, - ), - array(self::underscoreNamingLower(), 'class_name_identifier', + ], + [ + self::underscoreNamingLower(), 'class_name_identifier', '\Some\Class\ClassName', 'identifier', null, - ), + ], - array(self::underscoreNamingUpper(), 'SOME_CLASS_NAME_ID', + [ + self::underscoreNamingUpper(), 'SOME_CLASS_NAME_ID', 'SomeClassName', null, null, - ), - array(self::underscoreNamingUpper(), 'CLASS_NAME_IDENTIFIER', + ], + [ + self::underscoreNamingUpper(), 'CLASS_NAME_IDENTIFIER', '\Some\Class\ClassName', 'IDENTIFIER', null, - ), - ); + ], + ]; } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php index 0b736dd0b..0afb3698d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php @@ -60,9 +60,9 @@ class QuoteStrategyTest extends OrmTestCase public function testGetColumnName() { $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $cm->mapField(array('fieldName' => 'name', 'columnName' => '`name`')); - $cm->mapField(array('fieldName' => 'id', 'columnName' => 'id')); - + $cm->mapField(['fieldName' => 'name', 'columnName' => '`name`']); + $cm->mapField(['fieldName' => 'id', 'columnName' => 'id']); + $this->assertEquals('id' ,$this->strategy->getColumnName('id', $cm, $this->platform)); $this->assertEquals('"name"' ,$this->strategy->getColumnName('name', $cm, $this->platform)); } @@ -70,42 +70,45 @@ class QuoteStrategyTest extends OrmTestCase public function testGetTableName() { $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $cm->setPrimaryTable(array('name'=>'`cms_user`')); + $cm->setPrimaryTable(['name'=>'`cms_user`']); $this->assertEquals('"cms_user"' ,$this->strategy->getTableName($cm, $this->platform)); $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->setPrimaryTable(array('name'=>'cms_user')); + $cm->setPrimaryTable(['name'=>'cms_user']); $this->assertEquals('cms_user' ,$this->strategy->getTableName($cm, $this->platform)); } - + public function testJoinTableName() { $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - - $cm1->mapManyToMany(array( + + $cm1->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', - 'joinTable' => array( + 'joinTable' => [ 'name' => '`cmsaddress_cmsuser`' - ) - )); - - $cm2->mapManyToMany(array( + ] + ] + ); + + $cm2->mapManyToMany( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', - 'joinTable' => array( + 'joinTable' => [ 'name' => 'cmsaddress_cmsuser' - ) - ) + ] + ] ); $this->assertEquals('"cmsaddress_cmsuser"', $this->strategy->getJoinTableName($cm1->associationMappings['user'], $cm1, $this->platform)); $this->assertEquals('cmsaddress_cmsuser', $this->strategy->getJoinTableName($cm2->associationMappings['user'], $cm2, $this->platform)); - + } public function testIdentifierColumnNames() @@ -113,20 +116,24 @@ class QuoteStrategyTest extends OrmTestCase $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - $cm1->mapField(array( + $cm1->mapField( + [ 'id' => true, 'fieldName' => 'id', 'columnName' => '`id`', - )); + ] + ); - $cm2->mapField(array( + $cm2->mapField( + [ 'id' => true, 'fieldName' => 'id', 'columnName' => 'id', - )); + ] + ); - $this->assertEquals(array('"id"'), $this->strategy->getIdentifierColumnNames($cm1, $this->platform)); - $this->assertEquals(array('id'), $this->strategy->getIdentifierColumnNames($cm2, $this->platform)); + $this->assertEquals(['"id"'], $this->strategy->getIdentifierColumnNames($cm1, $this->platform)); + $this->assertEquals(['id'], $this->strategy->getIdentifierColumnNames($cm2, $this->platform)); } @@ -143,30 +150,38 @@ class QuoteStrategyTest extends OrmTestCase { $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'id' => true, 'fieldName' => 'article', 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => '`article`' - )), - )); + ] + ], + ] + ); - $this->assertEquals(array('"article"'), $this->strategy->getIdentifierColumnNames($cm, $this->platform)); + $this->assertEquals(['"article"'], $this->strategy->getIdentifierColumnNames($cm, $this->platform)); } public function testJoinColumnName() { $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'id' => true, 'fieldName' => 'article', 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => '`article`' - )), - )); + ] + ], + ] + ); $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; $this->assertEquals('"article"',$this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform)); @@ -176,14 +191,18 @@ class QuoteStrategyTest extends OrmTestCase { $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); - $cm->mapOneToOne(array( + $cm->mapOneToOne( + [ 'id' => true, 'fieldName' => 'article', 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => '`article`' - )), - )); + ] + ], + ] + ); $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; $this->assertEquals('"id"',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index 9be006e5a..d6f629149 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -69,8 +69,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase */ public function getTestedReflectionProperties() { - return array( - array( + return [ + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', 'id' @@ -80,9 +80,9 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'id' ), 'Doctrine\\Tests\\Models\\Generic\\BooleanModel' - ), + ], // reflection on embeddables that have properties defined in abstract ancestors: - array( + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', 'id' @@ -92,8 +92,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'propertyInAbstractClass' ), 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' - ), - array( + ], + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', 'id' @@ -103,9 +103,9 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'propertyInConcreteClass' ), 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' - ), + ], // reflection on classes extending internal PHP classes: - array( + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'publicProperty' @@ -115,8 +115,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'privateProperty' ), 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' - ), - array( + ], + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'publicProperty' @@ -126,8 +126,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'protectedProperty' ), 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' - ), - array( + ], + [ $this->getReflectionProperty( 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', 'publicProperty' @@ -137,8 +137,8 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase 'publicProperty' ), 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' - ), - ); + ], + ]; } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php index ac8f1d695..082ebaf94 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php @@ -10,10 +10,12 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase { public function testFindMappingFile() { - $driver = $this->getDriver(array( + $driver = $this->getDriver( + [ 'MyNamespace\MySubnamespace\EntityFoo' => 'foo', 'MyNamespace\MySubnamespace\Entity' => $this->dir, - )); + ] + ); touch($filename = $this->dir.'/Foo'.$this->getFileExtension()); $this->assertEquals($filename, $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo')); @@ -21,9 +23,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase public function testFindMappingFileInSubnamespace() { - $driver = $this->getDriver(array( + $driver = $this->getDriver( + [ 'MyNamespace\MySubnamespace\Entity' => $this->dir, - )); + ] + ); touch($filename = $this->dir.'/Foo.Bar'.$this->getFileExtension()); $this->assertEquals($filename, $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo\Bar')); @@ -34,9 +38,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('No mapping file found named'); - $driver = $this->getDriver(array( + $driver = $this->getDriver( + [ 'MyNamespace\MySubnamespace\Entity' => $this->dir, - )); + ] + ); $driver->getLocator()->findMappingFile('MyNamespace\MySubnamespace\Entity\Foo'); } @@ -46,9 +52,11 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase $this->expectException(MappingException::class); $this->expectExceptionMessage("No mapping file found named 'Foo" . $this->getFileExtension() . "' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'."); - $driver = $this->getDriver(array( + $driver = $this->getDriver( + [ 'MyNamespace\MySubnamespace\Entity' => $this->dir, - )); + ] + ); $driver->getLocator()->findMappingFile('MyOtherNamespace\MySubnamespace\Entity\Foo'); } @@ -75,5 +83,5 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase } abstract protected function getFileExtension(); - abstract protected function getDriver(array $paths = array()); + abstract protected function getDriver(array $paths = []); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php index f32d9f2ad..2fa836813 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php @@ -14,7 +14,7 @@ class XmlDriverTest extends AbstractDriverTest return '.orm.xml'; } - protected function getDriver(array $paths = array()) + protected function getDriver(array $paths = []) { $driver = new SimplifiedXmlDriver(array_flip($paths)); diff --git a/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php index 5b7f38ead..f9c8a839b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/Symfony/YamlDriverTest.php @@ -14,7 +14,7 @@ class YamlDriverTest extends AbstractDriverTest return '.orm.yml'; } - protected function getDriver(array $paths = array()) + protected function getDriver(array $paths = []) { $driver = new SimplifiedYamlDriver(array_flip($paths)); diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index ae188057d..6d5dde331 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -23,11 +23,11 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $class->initializeReflection(new RuntimeReflectionService()); $mappingDriver->loadMetadataForClass($className, $class); - $expectedMap = array( + $expectedMap = [ 'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo', 'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar', 'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz', - ); + ]; $this->assertEquals(3, count($class->discriminatorMap)); $this->assertEquals($expectedMap, $class->discriminatorMap); @@ -57,7 +57,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC117\DDC117Translation'); - $this->assertEquals(array('language', 'article'), $class->identifier); + $this->assertEquals(['language', 'article'], $class->identifier); $this->assertArrayHasKey('article', $class->associationMappings); $this->assertArrayHasKey('id', $class->associationMappings['article']); @@ -117,14 +117,14 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $class = $this->createClassMetadata('Doctrine\Tests\Models\ValueObjects\Person'); $this->assertEquals( - array( - 'name' => array( + [ + 'name' => [ 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null, - ) - ), + ] + ], $class->embeddedClasses ); } @@ -158,16 +158,16 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest static public function dataValidSchema() { $list = glob(__DIR__ . '/xml/*.xml'); - $invalid = array( + $invalid = [ 'Doctrine.Tests.Models.DDC889.DDC889Class.dcm' - ); + ]; $list = array_filter($list, function($item) use ($invalid){ return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid); }); return array_map(function($item){ - return array($item); + return [$item]; }, $list); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php index c752c6a82..a739c2b61 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php @@ -25,7 +25,7 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest public function testJoinTablesWithMappedSuperclassForYamlDriver() { $yamlDriver = $this->_loadDriver(); - $yamlDriver->getLocator()->addPaths(array(__DIR__ . DIRECTORY_SEPARATOR . 'yaml')); + $yamlDriver->getLocator()->addPaths([__DIR__ . DIRECTORY_SEPARATOR . 'yaml']); $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($yamlDriver); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php index b0ac6cade..2dce0c416 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php @@ -1,91 +1,115 @@ setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'company_person', -)); + ] +); -$metadata->mapField(array ( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', -)); + ] +); -$metadata->mapField(array ( +$metadata->mapField( + [ 'fieldName' => 'zip', 'length' => 50, -)); + ] +); -$metadata->mapField(array ( +$metadata->mapField( + [ 'fieldName' => 'city', 'length' => 50, -)); + ] +); -$metadata->mapOneToOne(array( +$metadata->mapOneToOne( + [ 'fieldName' => 'user', 'targetEntity' => 'CmsUser', - 'joinColumns' => array(array('referencedColumnName' => 'id')) -)); + 'joinColumns' => [['referencedColumnName' => 'id']] + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'find-all', 'query' => 'SELECT id, country, city FROM cms_addresses', 'resultSetMapping' => 'mapping-find-all', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'find-by-id', 'query' => 'SELECT * FROM cms_addresses WHERE id = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'count', 'query' => 'SELECT COUNT(*) AS count FROM cms_addresses', 'resultSetMapping' => 'mapping-count', -)); + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-find-all', - 'columns' => array(), - 'entities' => array ( array ( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'city', 'column' => 'city', - ), - array ( + ], + [ 'name' => 'country', 'column' => 'country', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', - ), - ), -)); + ], + ], + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-without-fields', - 'columns' => array(), - 'entities' => array(array ( + 'columns' => [], + 'entities' => [ + [ 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', - 'fields' => array() - ) - ) -)); + 'fields' => [] + ] + ] + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mapping-count', - 'columns' =>array ( - array ( + 'columns' => [ + [ 'name' => 'count', - ), - ) -)); + ], + ] + ] +); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CmsAddressListener', 'postPersist'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CmsAddressListener', 'prePersist'); @@ -97,4 +121,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::postRemove, 'CmsAddressListen $metadata->addEntityListener(\Doctrine\ORM\Events::preRemove, 'CmsAddressListener', 'preRemove'); $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CmsAddressListener', 'preFlush'); -$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad'); \ No newline at end of file +$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php index dfa89851a..c707f3fdf 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php @@ -1,184 +1,210 @@ setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'cms_users', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchIdAndUsernameWithResultClass', 'query' => 'SELECT id, username FROM cms_users WHERE username = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllColumns', 'query' => 'SELECT * FROM cms_users WHERE username = ?', 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchJoinedAddress', 'query' => 'SELECT u.id, u.name, u.status, a.id AS a_id, a.country, a.zip, a.city FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', 'resultSetMapping' => 'mappingJoinedAddress', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchJoinedPhonenumber', 'query' => 'SELECT id, name, status, phonenumber AS number FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', 'resultSetMapping' => 'mappingJoinedPhonenumber', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchUserPhonenumberCount', 'query' => 'SELECT id, name, status, COUNT(phonenumber) AS numphones FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username IN (?) GROUP BY id, name, status, username ORDER BY username', 'resultSetMapping' => 'mappingUserPhonenumberCount', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ "name" => "fetchMultipleJoinsEntityResults", "resultSetMapping" => "mappingMultipleJoinsEntityResults", "query" => "SELECT u.id AS u_id, u.name AS u_name, u.status AS u_status, a.id AS a_id, a.zip AS a_zip, a.country AS a_country, COUNT(p.phonenumber) AS numphones FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id INNER JOIN cms_phonenumbers p ON u.id = p.user_id GROUP BY u.id, u.name, u.status, u.username, a.id, a.zip, a.country ORDER BY u.username" -)); + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mappingJoinedAddress', - 'columns' => array(), - 'entities' => array(array ( - 'fields'=> array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields'=> [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ), - array ( + ], + [ 'name' => 'address.zip', 'column' => 'zip', - ), - array ( + ], + [ 'name' => 'address.city', 'column' => 'city', - ), - array ( + ], + [ 'name' => 'address.country', 'column' => 'country', - ), - array ( + ], + [ 'name' => 'address.id', 'column' => 'a_id', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null - ), - ), -)); + ], + ], + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mappingJoinedPhonenumber', - 'columns' => array(), - 'entities' => array(array( - 'fields'=> array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields'=> [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ), - array ( + ], + [ 'name' => 'phonenumbers.phonenumber', 'column' => 'number', - ), - ), + ], + ], 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', 'discriminatorColumn' => null - ), - ), -)); + ], + ], + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mappingUserPhonenumberCount', - 'columns' => array(), - 'entities' => array ( - array( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - array ( + ], + [ 'name' => 'status', 'column' => 'status', - ) - ), + ] + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null - ) - ), - 'columns' => array ( - array ( + ] + ], + 'columns' => [ + [ 'name' => 'numphones', - ) - ) -)); + ] + ] + ] +); -$metadata->addSqlResultSetMapping(array( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mappingMultipleJoinsEntityResults', - 'entities' => array(array( - 'fields' => array( - array( + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'u_id', - ), - array( + ], + [ 'name' => 'name', 'column' => 'u_name', - ), - array( + ], + [ 'name' => 'status', 'column' => 'u_status', - ) - ), + ] + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', 'discriminatorColumn' => null, - ), - array( - 'fields' => array( - array( + ], + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'a_id', - ), - array( + ], + [ 'name' => 'zip', 'column' => 'a_zip', - ), - array( + ], + [ 'name' => 'country', 'column' => 'a_country', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', 'discriminatorColumn' => null, - ), - ), - 'columns' => array(array( + ], + ], + 'columns' => [ + [ 'name' => 'numphones', - ) - ) -)); \ No newline at end of file + ] + ] + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php index 6dd477fa6..4626cd46b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php @@ -3,52 +3,68 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); -$metadata->setPrimaryTable(array('name' => 'cache_city')); +$metadata->setPrimaryTable(['name' => 'cache_city']); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_IDENTITY); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); -$metadata->enableCache(array( +$metadata->enableCache( + [ 'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'id', 'type' => 'integer', 'id' => true, - )); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', -)); + ] +); -$metadata->mapOneToOne(array( +$metadata->mapOneToOne( + [ 'fieldName' => 'state', 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\State', 'inversedBy' => 'cities', 'joinColumns' => - array(array( + [ + [ 'name' => 'state_id', 'referencedColumnName' => 'id', - )) -)); -$metadata->enableAssociationCache('state', array( + ] + ] + ] +); +$metadata->enableAssociationCache('state', [ 'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY -)); +] +); -$metadata->mapManyToMany(array( +$metadata->mapManyToMany( + [ 'fieldName' => 'travels', 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Travel', 'mappedBy' => 'visitedCities', -)); + ] +); -$metadata->mapOneToMany(array( +$metadata->mapOneToMany( + [ 'fieldName' => 'attractions', 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Attraction', 'mappedBy' => 'city', - 'orderBy' => array('name' => 'ASC',), -)); -$metadata->enableAssociationCache('attractions', array( + 'orderBy' => ['name' => 'ASC',], + ] +); +$metadata->enableAssociationCache('attractions', [ 'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY -)); \ No newline at end of file +] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php index d307ba7f1..33389ce95 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyContract.php @@ -4,28 +4,36 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_JOINED); $metadata->setTableName( 'company_contracts'); -$metadata->setDiscriminatorColumn(array( +$metadata->setDiscriminatorColumn( + [ 'name' => 'discr', 'type' => 'string', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'name' => 'id', 'fieldName' => 'id', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'type' => 'boolean', 'name' => 'completed', 'fieldName' => 'completed', -)); + ] +); -$metadata->setDiscriminatorMap(array( +$metadata->setDiscriminatorMap( + [ "fix" => "CompanyFixContract", "flexible" => "CompanyFlexContract", "flexultra" => "CompanyFlexUltraContract" -)); + ] +); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); @@ -37,4 +45,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::postRemove, 'CompanyContractL $metadata->addEntityListener(\Doctrine\ORM\Events::preRemove, 'CompanyContractListener', 'preRemoveHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractListener', 'preFlushHandler'); -$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler'); \ No newline at end of file +$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php index 79b117729..3ea44ee73 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFixContract.php @@ -1,7 +1,9 @@ mapField(array( +$metadata->mapField( + [ 'type' => 'integer', 'name' => 'fixPrice', 'fieldName' => 'fixPrice', -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php index 5f1542dde..7cc2b5504 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexContract.php @@ -1,13 +1,17 @@ mapField(array( +$metadata->mapField( + [ 'type' => 'integer', 'name' => 'hoursWorked', 'fieldName' => 'hoursWorked', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'type' => 'integer', 'name' => 'pricePerHour', 'fieldName' => 'pricePerHour', -)); + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php index d16d4f3f5..9e392416d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyFlexUltraContract.php @@ -1,10 +1,12 @@ mapField(array( +$metadata->mapField( + [ 'type' => 'integer', 'name' => 'maxPrice', 'fieldName' => 'maxPrice', -)); + ] +); $metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CompanyContractListener', 'postPersistHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); @@ -18,4 +20,4 @@ $metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CompanyContractLis $metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CompanyContractListener', 'postLoadHandler'); $metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler1'); -$metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2'); \ No newline at end of file +$metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CompanyFlexUltraContractListener', 'prePersistHandler2'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php index 32cc813da..9402cc1ed 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php @@ -1,37 +1,46 @@ setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'company_person', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllWithResultClass', 'query' => 'SELECT id, name, discr FROM company_persons ORDER BY name', 'resultClass' => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson', -)); + ] +); -$metadata->addNamedNativeQuery(array ( +$metadata->addNamedNativeQuery( + [ 'name' => 'fetchAllWithSqlResultSetMapping', 'query' => 'SELECT id, name, discr AS discriminator FROM company_persons ORDER BY name', 'resultSetMapping' => 'mappingFetchAll', -)); + ] +); -$metadata->addSqlResultSetMapping(array ( +$metadata->addSqlResultSetMapping( + [ 'name' => 'mappingFetchAll', - 'columns' => array(), - 'entities' => array ( array ( - 'fields' => array ( - array ( + 'columns' => [], + 'entities' => [ + [ + 'fields' => [ + [ 'name' => 'id', 'column' => 'id', - ), - array ( + ], + [ 'name' => 'name', 'column' => 'name', - ), - ), + ], + ], 'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson', 'discriminatorColumn' => 'discriminator', - ), - ), -)); \ No newline at end of file + ], + ], + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php index 56a99633a..62459aad0 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php @@ -2,11 +2,15 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', -)); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'name' -)); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); \ No newline at end of file + ] +); +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php index 4a163c9bd..85128c9ae 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php @@ -4,14 +4,18 @@ use Doctrine\ORM\Mapping\ClassMetadata; /* @var $metadata ClassMetadata */ -$metadata->setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'explicit_table', 'schema' => 'explicit_schema', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', -)); + ] +); $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php index 045a97858..fb2edfcfb 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php @@ -4,13 +4,17 @@ use Doctrine\ORM\Mapping\ClassMetadata; /* @var $metadata ClassMetadata */ -$metadata->setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'implicit_schema.implicit_table', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', -)); + ] +); $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php index dd59e65fa..9b7c87b3e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579Admin.php @@ -1,5 +1,6 @@ setAssociationOverride('groups', array( +$metadata->setAssociationOverride('groups', [ 'inversedBy' => 'admins' -)); +] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php index 1eb3555ec..49aeacb1e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php @@ -2,26 +2,32 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'user_id', 'length' => 150, -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'columnName'=> 'user_name', 'nullable' => true, 'unique' => false, 'length' => 250, -)); + ] +); -$metadata->mapManyToMany(array( +$metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'DDC3579Group' -)); + ] +); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php index ad8b86d9e..e97e16f95 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php @@ -1,5 +1,7 @@ mapField(array( +$metadata->mapField( + [ 'fieldName' => 'serialNumber', 'type' => 'string', -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php index 1318333a8..de9d8dae0 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869CreditCardPayment.php @@ -1,5 +1,7 @@ mapField(array( +$metadata->mapField( + [ 'fieldName' => 'creditCardNumber', 'type' => 'string', -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php index 1d1f551ba..3a9b84793 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php @@ -2,16 +2,20 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', -)); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'value', 'type' => 'float', - )); + ] +); $metadata->isMappedSuperclass = true; $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); \ No newline at end of file +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php index 90cfdc10b..e1161da13 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889Class.php @@ -2,11 +2,13 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', -)); + ] +); -//$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); \ No newline at end of file +//$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php index e56cc9bfd..c3ee069df 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php @@ -2,10 +2,12 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', - )); + ] +); $metadata->isMappedSuperclass = true; $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC889\DDC889SuperClass"); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); \ No newline at end of file +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php index bb8920e76..10175feca 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Admin.php @@ -1,21 +1,29 @@ setAssociationOverride('address',array( - 'joinColumns'=>array(array( +$metadata->setAssociationOverride('address', + [ + 'joinColumns'=> [ + [ 'name' => 'adminaddress_id', 'referencedColumnName' => 'id', - )) -)); + ] + ] + ] +); -$metadata->setAssociationOverride('groups',array( - 'joinTable' => array ( +$metadata->setAssociationOverride('groups', + [ + 'joinTable' => [ 'name' => 'ddc964_users_admingroups', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name' => 'adminuser_id', - )), + ] + ], - 'inverseJoinColumns' =>array (array ( + 'inverseJoinColumns' => [[ 'name' => 'admingroup_id', - )) - ) -)); \ No newline at end of file + ]] + ] + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php index 5094ecddf..28f6f48c5 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964Guest.php @@ -1,13 +1,16 @@ setAttributeOverride('id', array( +$metadata->setAttributeOverride('id', [ 'columnName' => 'guest_id', 'type' => 'integer', 'length' => 140, -)); +] +); -$metadata->setAttributeOverride('name',array( +$metadata->setAttributeOverride('name', + [ 'columnName' => 'guest_name', 'nullable' => false, 'unique' => true, 'length' => 240, -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php index 7b66deef0..dc445f1ca 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php @@ -2,45 +2,57 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'user_id', 'length' => 150, -)); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'columnName'=> 'user_name', 'nullable' => true, 'unique' => false, 'length' => 250, -)); + ] +); -$metadata->mapManyToOne(array( +$metadata->mapManyToOne( + [ 'fieldName' => 'address', 'targetEntity' => 'DDC964Address', - 'cascade' => array('persist','merge'), - 'joinColumn' => array('name'=>'address_id', 'referencedColumnMame'=>'id'), -)); + 'cascade' => ['persist','merge'], + 'joinColumn' => ['name'=>'address_id', 'referencedColumnMame'=>'id'], + ] +); -$metadata->mapManyToMany(array( +$metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'DDC964Group', 'inversedBy' => 'users', - 'cascade' => array('persist','merge','detach'), - 'joinTable' => array( + 'cascade' => ['persist','merge','detach'], + 'joinTable' => [ 'name' => 'ddc964_users_groups', - 'joinColumns' => array(array( + 'joinColumns' => [ + [ 'name'=>'user_id', 'referencedColumnName'=>'id', - )), - 'inverseJoinColumns'=>array(array( + ] + ], + 'inverseJoinColumns'=> [ + [ 'name'=>'group_id', 'referencedColumnName'=>'id', - )) - ) -)); + ] + ] + ] + ] +); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); \ No newline at end of file +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php index 005178eed..3adc2a7a6 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php @@ -4,18 +4,23 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; /* @var $metadata ClassMetadataInfo */ $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE); -$metadata->setDiscriminatorColumn(array( +$metadata->setDiscriminatorColumn( + [ 'name' => 'dtype', 'type' => 'string', 'length' => 255, 'fieldName' => 'dtype', - )); -$metadata->setDiscriminatorMap(array( + ] +); +$metadata->setDiscriminatorMap( + [ 'cat' => 'Doctrine\\Tests\\ORM\\Mapping\\Cat', 'dog' => 'Doctrine\\Tests\\ORM\\Mapping\\Dog', - )); + ] +); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'id', 'type' => 'string', 'length' => NULL, @@ -25,6 +30,7 @@ $metadata->mapField(array( 'unique' => false, 'id' => true, 'columnName' => 'id', - )); + ] +); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM); -$metadata->setCustomGeneratorDefinition(array("class" => "stdClass")); +$metadata->setCustomGeneratorDefinition(["class" => "stdClass"]); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php index 85cbed4dc..a33ebbaeb 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php @@ -3,13 +3,16 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); -$metadata->setPrimaryTable(array( - 'indexes' => array( - array('columns' => array('content'), 'flags' => array('fulltext'), 'options'=> array('where' => 'content IS NOT NULL')) - ) - )); +$metadata->setPrimaryTable( + [ + 'indexes' => [ + ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']] + ] + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'content', 'type' => 'text', 'scale' => 0, @@ -18,4 +21,5 @@ $metadata->mapField(array( 'nullable' => false, 'precision' => 0, 'columnName' => 'content', -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php index 97f4624ba..dd442ceb0 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC1170Entity.php @@ -2,15 +2,19 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'columnDefinition' => 'INT unsigned NOT NULL', -)); + ] +); -$metadata->mapField(array( +$metadata->mapField( + [ 'fieldName' => 'value', 'columnDefinition' => 'VARCHAR(255) NOT NULL' -)); + ] +); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); \ No newline at end of file +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php index 1682d7a0d..c9d8ad9f2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.DDC807Entity.php @@ -2,14 +2,18 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', -)); + ] +); -$metadata->setDiscriminatorColumn(array( +$metadata->setDiscriminatorColumn( + [ 'name' => "dtype", 'columnDefinition' => "ENUM('ONE','TWO')" -)); + ] +); -$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); \ No newline at end of file +$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php index c9341958a..ad1ed23bf 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.PHPSLC.php @@ -2,11 +2,15 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; -$metadata->enableCache(array( +$metadata->enableCache( + [ 'usage' => ClassMetadataInfo::CACHE_USAGE_READ_ONLY -)); -$metadata->mapManyToOne(array( + ] +); +$metadata->mapManyToOne( + [ 'fieldName' => 'foo', 'id' => true, 'targetEntity' => 'PHPSLCFoo' -)); \ No newline at end of file + ] +); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php index 5bcc6d029..cc23c3992 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php @@ -3,126 +3,144 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); -$metadata->setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'cms_users', - )); + ] +); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist'); $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist'); $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist'); -$metadata->addNamedQuery(array( +$metadata->addNamedQuery( + [ 'name' => 'all', 'query' => 'SELECT u FROM __CLASS__ u' -)); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', - 'options' => array('foo' => 'bar', 'unsigned' => false), - )); -$metadata->mapField(array( + 'options' => ['foo' => 'bar', 'unsigned' => false], + ] +); +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'length' => 50, 'unique' => true, 'nullable' => true, 'columnName' => 'name', - 'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false), - )); -$metadata->mapField(array( + 'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false], + ] +); +$metadata->mapField( + [ 'fieldName' => 'email', 'type' => 'string', 'columnName' => 'user_email', 'columnDefinition' => 'CHAR(32) NOT NULL', - )); -$mapping = array('fieldName' => 'version', 'type' => 'integer'); + ] +); +$mapping = ['fieldName' => 'version', 'type' => 'integer']; $metadata->setVersionMapping($mapping); $metadata->mapField($mapping); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); -$metadata->mapOneToOne(array( +$metadata->mapOneToOne( + [ 'fieldName' => 'address', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address', 'cascade' => - array( + [ 0 => 'remove', - ), + ], 'mappedBy' => NULL, 'inversedBy' => 'user', 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - ), - ), + ], + ], 'orphanRemoval' => false, - )); -$metadata->mapOneToMany(array( + ] +); +$metadata->mapOneToMany( + [ 'fieldName' => 'phonenumbers', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber', 'cascade' => - array( + [ 1 => 'persist', - ), + ], 'mappedBy' => 'user', 'orphanRemoval' => true, 'orderBy' => - array( + [ 'number' => 'ASC', - ), - )); -$metadata->mapManyToMany(array( + ], + ] +); +$metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group', 'cascade' => - array( + [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'mappedBy' => NULL, 'joinTable' => - array( + [ 'name' => 'cms_users_groups', 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'user_id', 'referencedColumnName' => 'id', 'unique' => false, 'nullable' => false, - ), - ), + ], + ], 'inverseJoinColumns' => - array( + [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'columnDefinition' => 'INT NULL', - ), - ), - ), + ], + ], + ], 'orderBy' => NULL, - )); -$metadata->table['options'] = array( + ] +); +$metadata->table['options'] = [ 'foo' => 'bar', - 'baz' => array('key' => 'val') -); -$metadata->table['uniqueConstraints'] = array( - 'search_idx' => array('columns' => array('name', 'user_email'), 'options' => array('where' => 'name IS NOT NULL')), -); -$metadata->table['indexes'] = array( - 'name_idx' => array('columns' => array('name')), 0 => array('columns' => array('user_email')) -); -$metadata->setSequenceGeneratorDefinition(array( + 'baz' => ['key' => 'val'] +]; +$metadata->table['uniqueConstraints'] = [ + 'search_idx' => ['columns' => ['name', 'user_email'], 'options' => ['where' => 'name IS NOT NULL']], +]; +$metadata->table['indexes'] = [ + 'name_idx' => ['columns' => ['name']], 0 => ['columns' => ['user_email']] +]; +$metadata->setSequenceGeneratorDefinition( + [ 'sequenceName' => 'tablename_seq', 'allocationSize' => 100, 'initialValue' => 1, - )); + ] +); diff --git a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php index 210f72c80..4c992a870 100644 --- a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php +++ b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php @@ -17,12 +17,14 @@ class DDC2602Test extends OrmPerformanceTestCase { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'), - )); + ] + ); $this->loadFixture(); } @@ -31,18 +33,20 @@ class DDC2602Test extends OrmPerformanceTestCase { parent::tearDown(); - $this->_schemaTool->dropSchema(array( + $this->_schemaTool->dropSchema( + [ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'), $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'), - )); + ] + ); } public function testIssue() { $eventManager = $this->_em->getEventManager(); - $eventManager->addEventListener(array(Events::postLoad), new DDC2602PostLoadListener()); + $eventManager->addEventListener([Events::postLoad], new DDC2602PostLoadListener()); // Set maximum seconds this can run $this->setMaxRunningTime(1); @@ -232,7 +236,7 @@ class DDC2602Biography /** * @var array */ - public $fieldList = array(); + public $fieldList = []; } /** diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php index e4d65e1e7..0846ca4de 100644 --- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php @@ -38,35 +38,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ) - ); + ] + ]; for ($i = 4; $i < 10000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -96,35 +96,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ) - ); + ] + ]; for ($i = 4; $i < 10000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -162,43 +162,43 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); + ] + ]; for ($i = 4; $i < 10000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', 'sclr0' => 'JWAGE' . $i, 'p__phonenumber' => '91' - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -226,35 +226,35 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('u', 'u__name', 'name'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', - ) - ); + ] + ]; for ($i = 4; $i < 10000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -262,7 +262,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $this->setMaxRunningTime(3); $s = microtime(true); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $e = microtime(true); echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL; } @@ -292,25 +292,25 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase //$rsm->addFieldResult('a', 'a__city', 'city'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'a__id' => '1' - ) - ); + ] + ]; for ($i = 2; $i < 10000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', 'a__id' => $i - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -346,43 +346,43 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', - ), - array( + ], + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'ROMANB', 'p__phonenumber' => '43', - ), - array( + ], + [ 'u__id' => '2', 'u__status' => 'developer', 'u__username' => 'romanb', 'u__name' => 'Roman', 'sclr0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); + ] + ]; for ($i = 4; $i < 2000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', 'u__name' => 'Jonathan', 'sclr0' => 'JWAGE' . $i, 'p__phonenumber' => '91' - ); + ]; } $stmt = new HydratorMockStatement($resultSet); @@ -390,7 +390,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $this->setMaxRunningTime(1); $s = microtime(true); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $e = microtime(true); echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL; } @@ -425,9 +425,9 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase $rsm->addFieldResult('a', 'a__id', 'id'); // Faked result set - $resultSet = array( + $resultSet = [ //row1 - array( + [ 'u__id' => '1', 'u__status' => 'developer', 'u__username' => 'romanb', @@ -435,11 +435,11 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase 'sclr0' => 'ROMANB', 'p__phonenumber' => '42', 'a__id' => '1' - ) - ); + ] + ]; for ($i = 2; $i < 2000; ++$i) { - $resultSet[] = array( + $resultSet[] = [ 'u__id' => $i, 'u__status' => 'developer', 'u__username' => 'jwage', @@ -447,7 +447,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase 'sclr0' => 'JWAGE' . $i, 'p__phonenumber' => '91', 'a__id' => $i - ); + ]; } $stmt = new HydratorMockStatement($resultSet); diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php index db5d0f8ef..8d66ba601 100644 --- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php @@ -27,7 +27,7 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase $author->username = "beberlei"; $this->_em->persist($author); - $ids = array(); + $ids = []; for ($i = 0; $i < 100; $i++) { $article = new CmsArticle(); $article->text = "foo"; diff --git a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php index bc98c23f6..de77aafd8 100644 --- a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php @@ -21,10 +21,10 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase */ public function entitiesProvider() { - return array( - array('Doctrine\Tests\Models\CMS\CmsEmployee'), - array('Doctrine\Tests\Models\CMS\CmsUser'), - ); + return [ + ['Doctrine\Tests\Models\CMS\CmsEmployee'], + ['Doctrine\Tests\Models\CMS\CmsUser'], + ]; } /** @@ -37,7 +37,7 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase $start = microtime(true); for ($i = 0; $i < 100000; $i += 1) { - $user = $proxyFactory->getProxy($entityName, array('id' => $i)); + $user = $proxyFactory->getProxy($entityName, ['id' => $i]); } echo __FUNCTION__ . " - " . (microtime(true) - $start) . " seconds with " . $entityName . PHP_EOL; @@ -51,7 +51,7 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase $em = new MockEntityManager($this->_getEntityManager()); $proxyFactory = $em->getProxyFactory(); /* @var $user \Doctrine\Common\Proxy\Proxy */ - $user = $proxyFactory->getProxy($entityName, array('id' => 1)); + $user = $proxyFactory->getProxy($entityName, ['id' => 1]); $initializer = $user->__getInitializer(); $this->setMaxRunningTime(5); @@ -146,7 +146,7 @@ class PersisterMock extends BasicEntityPersister } /** {@inheritDoc} */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0, $limit = null, array $orderBy = null) + public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = 0, $limit = null, array $orderBy = null) { return $entity; } diff --git a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php index 774945c5a..279740918 100644 --- a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php @@ -159,8 +159,8 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase { $times = 50; $size = 30; - $states = array(); - $cities = array(); + $states = []; + $cities = []; $startPersist = microtime(true); $country = new Country("Country"); @@ -218,7 +218,7 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase { $times = 10; $size = 500; - $countries = array(); + $countries = []; $startPersist = microtime(true); echo PHP_EOL . $label; @@ -279,4 +279,4 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase printf("\n[%s] find %s countries (%s times)", number_format(microtime(true) - $startFind, 6), $size, $times); printf("\n%s\n", str_repeat('-', 50)); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php index 934933635..3d63eb4d8 100644 --- a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php @@ -23,7 +23,7 @@ class UnitOfWorkPerformanceTest extends OrmPerformanceTestCase { $n = 100; - $users = array(); + $users = []; for ($i=1; $i<=$n; ++$i) { $user = new CmsUser; $user->status = 'user'; diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php index 74d72856e..db6fa5c83 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php @@ -43,12 +43,14 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase $admin1 = new Admin1(10, "Rome", $country); - list ($values, $types) = $this->_persister->expandParameters(array( + list ($values, $types) = $this->_persister->expandParameters( + [ 'admin1' => $admin1 - )); + ] + ); - $this->assertEquals(array('integer', 'string'), $types); - $this->assertEquals(array(10, 'IT'), $values); + $this->assertEquals(['integer', 'string'], $types); + $this->assertEquals([10, 'IT'], $values); } public function testExpandCriteriaParametersWillExpandCompositeEntityKeys() @@ -62,7 +64,7 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase list ($values, $types) = $this->_persister->expandCriteriaParameters($criteria); - $this->assertEquals(array('integer', 'string'), $types); - $this->assertEquals(array(10, 'IT'), $values); + $this->assertEquals(['integer', 'string'], $types); + $this->assertEquals([10, 'IT'], $values); } } diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php index e788826d4..441ff0101 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php @@ -32,19 +32,19 @@ class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase public function testSelectConditionStatementEq() { - $statement = $this->_persister->getSelectConditionStatementSQL('admin1', 1, array(), Comparison::EQ); + $statement = $this->_persister->getSelectConditionStatementSQL('admin1', 1, [], Comparison::EQ); $this->assertEquals('t0.admin1 = ? AND t0.country = ?', $statement); } public function testSelectConditionStatementEqNull() { - $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, array(), Comparison::IS); + $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, [], Comparison::IS); $this->assertEquals('t0.admin1 IS NULL AND t0.country IS NULL', $statement); } public function testSelectConditionStatementNeqNull() { - $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, array(), Comparison::NEQ); + $statement = $this->_persister->getSelectConditionStatementSQL('admin1', null, [], Comparison::NEQ); $this->assertEquals('t0.admin1 IS NOT NULL AND t0.country IS NOT NULL', $statement); } @@ -53,6 +53,6 @@ class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase */ public function testSelectConditionStatementIn() { - $this->_persister->getSelectConditionStatementSQL('admin1', array(), array(), Comparison::IN); + $this->_persister->getSelectConditionStatementSQL('admin1', [], [], Comparison::IN); } } diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php index b617d14da..c4d747058 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php @@ -65,8 +65,8 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase $parent->customInteger = 1; $parent->child = $child; - $this->_em->getUnitOfWork()->registerManaged($parent, array('id' => 1), array('customInteger' => 0, 'child' => null)); - $this->_em->getUnitOfWork()->registerManaged($child, array('id' => 1), array()); + $this->_em->getUnitOfWork()->registerManaged($parent, ['id' => 1], ['customInteger' => 0, 'child' => null]); + $this->_em->getUnitOfWork()->registerManaged($child, ['id' => 1], []); $this->_em->getUnitOfWork()->propertyChanged($parent, 'customInteger', 0, 1); $this->_em->getUnitOfWork()->propertyChanged($parent, 'child', null, $child); @@ -83,7 +83,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase $method = new \ReflectionMethod($this->_persister, 'getSelectConditionSQL'); $method->setAccessible(true); - $sql = $method->invoke($this->_persister, array('customInteger' => 1, 'child' => 1)); + $sql = $method->invoke($this->_persister, ['customInteger' => 1, 'child' => 1]); $this->assertEquals('t0.customInteger = ABS(?) AND t0.child_id = ?', $sql); } @@ -105,19 +105,19 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase */ public function testSelectConditionStatementIsNull() { - $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::IS); + $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::IS); $this->assertEquals('test IS NULL', $statement); } public function testSelectConditionStatementEqNull() { - $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::EQ); + $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::EQ); $this->assertEquals('test IS NULL', $statement); } public function testSelectConditionStatementNeqNull() { - $statement = $this->_persister->getSelectConditionStatementSQL('test', null, array(), Comparison::NEQ); + $statement = $this->_persister->getSelectConditionStatementSQL('test', null, [], Comparison::NEQ); $this->assertEquals('test IS NOT NULL', $statement); } @@ -128,17 +128,17 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase { $this->assertEquals( '(t0.id IN (?) OR t0.id IS NULL)', - $this->_persister->getSelectConditionStatementSQL('id', array(null)) + $this->_persister->getSelectConditionStatementSQL('id', [null]) ); $this->assertEquals( '(t0.id IN (?) OR t0.id IS NULL)', - $this->_persister->getSelectConditionStatementSQL('id', array(null, 123)) + $this->_persister->getSelectConditionStatementSQL('id', [null, 123]) ); $this->assertEquals( '(t0.id IN (?) OR t0.id IS NULL)', - $this->_persister->getSelectConditionStatementSQL('id', array(123, null)) + $this->_persister->getSelectConditionStatementSQL('id', [123, null]) ); } @@ -147,7 +147,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity')); // Using a criteria as array - $statement = $persister->getCountSQL(array('value' => 'bar')); + $statement = $persister->getCountSQL(['value' => 'bar']); $this->assertEquals('SELECT COUNT(*) FROM "not-a-simple-entity" t0 WHERE t0."simple-entity-value" = ?', $statement); // Using a criteria object diff --git a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php index 5d4e992f7..14deca100 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php @@ -42,6 +42,6 @@ class JoinedSubClassPersisterTest extends OrmTestCase */ public function testExecuteInsertsWillReturnEmptySetWithNoQueuedInserts() { - $this->assertSame(array(), $this->persister->executeInserts()); + $this->assertSame([], $this->persister->executeInserts()); } } diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php index 174daf3c0..e7da7a463 100644 --- a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php @@ -48,7 +48,7 @@ class ProxyFactoryTest extends OrmTestCase protected function setUp() { parent::setUp(); - $this->connectionMock = new ConnectionMock(array(), new DriverMock()); + $this->connectionMock = new ConnectionMock([], new DriverMock()); $this->emMock = EntityManagerMock::create($this->connectionMock); $this->uowMock = new UnitOfWorkMock($this->emMock); $this->emMock->setUnitOfWork($this->uowMock); @@ -57,9 +57,9 @@ class ProxyFactoryTest extends OrmTestCase public function testReferenceProxyDelegatesLoadingToThePersister() { - $identifier = array('id' => 42); + $identifier = ['id' => 42]; $proxyClass = 'Proxies\__CG__\Doctrine\Tests\Models\ECommerce\ECommerceFeature'; - $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock(); + $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); @@ -83,7 +83,7 @@ class ProxyFactoryTest extends OrmTestCase $cm->initializeReflection(new RuntimeReflectionService()); $this->assertNotNull($cm->reflClass); - $num = $this->proxyFactory->generateProxyClasses(array($cm)); + $num = $this->proxyFactory->generateProxyClasses([$cm]); $this->assertEquals(0, $num, "No proxies generated."); } @@ -93,11 +93,11 @@ class ProxyFactoryTest extends OrmTestCase */ public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized() { - $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock(); + $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); /* @var $proxy \Doctrine\Common\Proxy\Proxy */ - $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', array('id' => 42)); + $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]); $persister ->expects($this->atLeastOnce()) @@ -120,11 +120,11 @@ class ProxyFactoryTest extends OrmTestCase */ public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized() { - $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(array('load'))->disableOriginalConstructor()->getMock(); + $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); /* @var $proxy \Doctrine\Common\Proxy\Proxy */ - $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', array('id' => 42)); + $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]); $persister ->expects($this->atLeastOnce()) diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php index e47c48215..bedcd6597 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php @@ -25,7 +25,7 @@ class CustomTreeWalkersJoinTest extends OrmTestCase { try { $query = $this->em->createQuery($dqlToBeTested); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\Tests\ORM\Query\CustomTreeWalkerJoin')) + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Query\CustomTreeWalkerJoin']) ->useQueryCache(false); $this->assertEquals($sqlToBeConfirmed, $query->getSql()); @@ -59,15 +59,15 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter { foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) { $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration; - + if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') { continue; } - + $this->modifySelectStatement($selectStatement, $identificationVariableDeclaration); } } - + private function modifySelectStatement(Query\AST\SelectStatement $selectStatement, $identificationVariableDecl) { $rangeVariableDecl = $identificationVariableDecl->rangeVariableDeclaration; @@ -75,7 +75,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null); $join = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration); $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false); - + $identificationVariableDecl->joins[] = $join; $selectStatement->selectClause->selectExpressions[] = $selectExpression; @@ -84,14 +84,14 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', - array( + [ 'metadata' => $addressMetadata, 'parent' => $rangeVariableDecl->aliasIdentificationVariable, 'relation' => $userMetadata->getAssociationMapping('address'), 'map' => null, 'nestingLevel' => 0, 'token' => null, - ) + ] ); } } diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php index 4114c4f8b..d6ae70818 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php @@ -36,7 +36,7 @@ class CustomTreeWalkersTest extends OrmTestCase return $query->getSql(); } - public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = array(), $outputWalker = null) + public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = [], $outputWalker = null) { try { $this->assertEquals($sqlToBeConfirmed, $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker)); @@ -50,7 +50,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.id = 1", - array('Doctrine\Tests\ORM\Functional\CustomTreeWalker') + ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] ); } @@ -59,7 +59,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name or u.name = :otherName', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE (c0_.name = ? OR c0_.name = ?) AND c0_.id = 1", - array('Doctrine\Tests\ORM\Functional\CustomTreeWalker') + ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] ); } @@ -68,7 +68,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.name = ? AND c0_.id = 1", - array('Doctrine\Tests\ORM\Functional\CustomTreeWalker') + ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] ); } @@ -79,7 +79,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->generateSql( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', - array(), + [], __NAMESPACE__ . '\\AddUnknownQueryComponentWalker' ); } @@ -89,7 +89,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c1_.id AS id_4, c1_.country AS country_5, c1_.zip AS zip_6, c1_.city AS city_7, c0_.email_id AS email_id_8, c1_.user_id AS user_id_9 FROM cms_users c0_ LEFT JOIN cms_addresses c1_ ON c0_.id = c1_.user_id WHERE c0_.id = 1", - array('Doctrine\Tests\ORM\Functional\CustomTreeWalkerJoin', 'Doctrine\Tests\ORM\Functional\CustomTreeWalker') + ['Doctrine\Tests\ORM\Functional\CustomTreeWalkerJoin', 'Doctrine\Tests\ORM\Functional\CustomTreeWalker'] ); } } @@ -100,7 +100,7 @@ class AddUnknownQueryComponentWalker extends Query\SqlWalker { parent::walkSelectStatement($selectStatement); - $this->setQueryComponent('x', array()); + $this->setQueryComponent('x', []); } } @@ -109,7 +109,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter public function walkSelectStatement(Query\AST\SelectStatement $selectStatement) { // Get the DQL aliases of all the classes we want to modify - $dqlAliases = array(); + $dqlAliases = []; foreach ($this->_getQueryComponents() as $dqlAlias => $comp) { // Hard-coded check just for demonstration: We want to modify the query if @@ -120,7 +120,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter } // Create our conditions for all involved classes - $factors = array(); + $factors = []; foreach ($dqlAliases as $alias) { $pathExpr = new Query\AST\PathExpression(Query\AST\PathExpression::TYPE_STATE_FIELD, $alias, 'id'); $pathExpr->type = Query\AST\PathExpression::TYPE_STATE_FIELD; @@ -139,7 +139,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression if ( ! ($condExpr instanceof Query\AST\ConditionalExpression)) { - $condExpr = new Query\AST\ConditionalExpression(array($condExpr)); + $condExpr = new Query\AST\ConditionalExpression([$condExpr]); $whereClause->conditionalExpression = $condExpr; } @@ -153,27 +153,27 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter $primary = new Query\AST\ConditionalPrimary; $primary->conditionalExpression = new Query\AST\ConditionalExpression($existingTerms); $existingFactor = new Query\AST\ConditionalFactor($primary); - $term = new Query\AST\ConditionalTerm(array_merge(array($existingFactor), $factors)); + $term = new Query\AST\ConditionalTerm(array_merge([$existingFactor], $factors)); - $selectStatement->whereClause->conditionalExpression->conditionalTerms = array($term); + $selectStatement->whereClause->conditionalExpression->conditionalTerms = [$term]; } else { // Just one term so we can simply append our factors to that term $singleTerm = $selectStatement->whereClause->conditionalExpression->conditionalTerms[0]; // Since Phase 1 AST optimizations were included, we need to re-add the ConditionalExpression if ( ! ($singleTerm instanceof Query\AST\ConditionalTerm)) { - $singleTerm = new Query\AST\ConditionalTerm(array($singleTerm)); + $singleTerm = new Query\AST\ConditionalTerm([$singleTerm]); $selectStatement->whereClause->conditionalExpression->conditionalTerms[0] = $singleTerm; } $singleTerm->conditionalFactors = array_merge($singleTerm->conditionalFactors, $factors); - $selectStatement->whereClause->conditionalExpression->conditionalTerms = array($singleTerm); + $selectStatement->whereClause->conditionalExpression->conditionalTerms = [$singleTerm]; } } else { // Create a new WHERE clause with our factors $term = new Query\AST\ConditionalTerm($factors); - $condExpr = new Query\AST\ConditionalExpression(array($term)); + $condExpr = new Query\AST\ConditionalExpression([$term]); $whereClause = new Query\AST\WhereClause($condExpr); $selectStatement->whereClause = $whereClause; } @@ -186,15 +186,15 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter { foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) { $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration; - + if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') { continue; } - + $this->modifySelectStatement($selectStatement, $identificationVariableDeclaration); } } - + private function modifySelectStatement(Query\AST\SelectStatement $selectStatement, $identificationVariableDecl) { $rangeVariableDecl = $identificationVariableDecl->rangeVariableDeclaration; @@ -202,7 +202,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $joinAssocDeclaration = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null); $join = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration); $selectExpression = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false); - + $identificationVariableDecl->joins[] = $join; $selectStatement->selectClause->selectExpressions[] = $selectExpression; @@ -211,14 +211,14 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', - array( + [ 'metadata' => $addressMetadata, 'parent' => $rangeVariableDecl->aliasIdentificationVariable, 'relation' => $userMetadata->getAssociationMapping('address'), 'map' => null, 'nestingLevel' => 0, 'token' => null, - ) + ] ); } } diff --git a/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/tests/Doctrine/Tests/ORM/Query/ExprTest.php index 61def1770..791f2f9b9 100644 --- a/tests/Doctrine/Tests/ORM/Query/ExprTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ExprTest.php @@ -55,7 +55,7 @@ class ExprTest extends OrmTestCase { $this->assertEquals('COUNT(DISTINCT u.id)', (string) $this->_expr->countDistinct('u.id')); } - + public function testCountDistinctExprMulti() { $this->assertEquals('COUNT(DISTINCT u.id, u.name)', (string) $this->_expr->countDistinct('u.id', 'u.name')); @@ -274,22 +274,22 @@ class ExprTest extends OrmTestCase public function testInExpr() { - $this->assertEquals('u.id IN(1, 2, 3)', (string) $this->_expr->in('u.id', array(1, 2, 3))); + $this->assertEquals('u.id IN(1, 2, 3)', (string) $this->_expr->in('u.id', [1, 2, 3])); } public function testInLiteralExpr() { - $this->assertEquals("u.type IN('foo', 'bar')", (string) $this->_expr->in('u.type', array('foo', 'bar'))); + $this->assertEquals("u.type IN('foo', 'bar')", (string) $this->_expr->in('u.type', ['foo', 'bar'])); } public function testNotInExpr() { - $this->assertEquals('u.id NOT IN(1, 2, 3)', (string) $this->_expr->notIn('u.id', array(1, 2, 3))); + $this->assertEquals('u.id NOT IN(1, 2, 3)', (string) $this->_expr->notIn('u.id', [1, 2, 3])); } public function testNotInLiteralExpr() { - $this->assertEquals("u.type NOT IN('foo', 'bar')", (string) $this->_expr->notIn('u.type', array('foo', 'bar'))); + $this->assertEquals("u.type NOT IN('foo', 'bar')", (string) $this->_expr->notIn('u.type', ['foo', 'bar'])); } public function testAndxOrxExpr() @@ -360,8 +360,8 @@ class ExprTest extends OrmTestCase { // Andx - $andx = new Expr\Andx(array('1 = 1', '2 = 2')); - $this->assertEquals(array('1 = 1', '2 = 2'), $andx->getParts()); + $andx = new Expr\Andx(['1 = 1', '2 = 2']); + $this->assertEquals(['1 = 1', '2 = 2'], $andx->getParts()); // Comparison $comparison = new Expr\Comparison('foo', Expr\Comparison::EQ, 'bar'); @@ -376,13 +376,13 @@ class ExprTest extends OrmTestCase $this->assertEquals('f.id', $from->getIndexBy()); // Func - $func = new Expr\Func('MAX', array('f.id')); + $func = new Expr\Func('MAX', ['f.id']); $this->assertEquals('MAX', $func->getName()); - $this->assertEquals(array('f.id'), $func->getArguments()); + $this->assertEquals(['f.id'], $func->getArguments()); // GroupBy - $group = new Expr\GroupBy(array('foo DESC', 'bar ASC')); - $this->assertEquals(array('foo DESC', 'bar ASC'), $group->getParts()); + $group = new Expr\GroupBy(['foo DESC', 'bar ASC']); + $this->assertEquals(['foo DESC', 'bar ASC'], $group->getParts()); // Join $join = new Expr\Join(Expr\Join::INNER_JOIN, 'f.bar', 'b', Expr\Join::ON, 'b.bar_id = 1', 'b.bar_id'); @@ -394,8 +394,8 @@ class ExprTest extends OrmTestCase $this->assertEquals('b', $join->getAlias()); // Literal - $literal = new Expr\Literal(array('foo')); - $this->assertEquals(array('foo'), $literal->getParts()); + $literal = new Expr\Literal(['foo']); + $this->assertEquals(['foo'], $literal->getParts()); // Math $math = new Expr\Math(10, '+', 20); @@ -405,22 +405,22 @@ class ExprTest extends OrmTestCase // OrderBy $order = new Expr\OrderBy('foo', 'DESC'); - $this->assertEquals(array('foo DESC'), $order->getParts()); + $this->assertEquals(['foo DESC'], $order->getParts()); // Andx - $orx = new Expr\Orx(array('foo = 1', 'bar = 2')); - $this->assertEquals(array('foo = 1', 'bar = 2'), $orx->getParts()); + $orx = new Expr\Orx(['foo = 1', 'bar = 2']); + $this->assertEquals(['foo = 1', 'bar = 2'], $orx->getParts()); // Select - $select = new Expr\Select(array('foo', 'bar')); - $this->assertEquals(array('foo', 'bar'), $select->getParts()); + $select = new Expr\Select(['foo', 'bar']); + $this->assertEquals(['foo', 'bar'], $select->getParts()); } public function testAddEmpty() { $andExpr = $this->_expr->andX(); $andExpr->add($this->_expr->andX()); - + $this->assertEquals(0, $andExpr->count()); } @@ -428,7 +428,7 @@ class ExprTest extends OrmTestCase { $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 fe12b3989..88fdca9bf 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -46,7 +46,7 @@ class LanguageRecognitionTest extends OrmTestCase } } - public function parseDql($dql, $hints = array()) + public function parseDql($dql, $hints = []) { $query = $this->_em->createQuery($dql); $query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); @@ -86,50 +86,52 @@ class LanguageRecognitionTest extends OrmTestCase { $this->expectException(QueryException::class); - $this->_em->getConfiguration()->setEntityNamespaces(array( + $this->_em->getConfiguration()->setEntityNamespaces( + [ 'Unknown' => 'Unknown', 'CMS' => 'Doctrine\Tests\Models\CMS' - )); + ] + ); $this->parseDql($dql); } public function invalidDQL() { - return array( + return [ - array('SELECT \'foo\' AS foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'), + ['SELECT \'foo\' AS foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'], /* Checks for invalid IdentificationVariables and AliasIdentificationVariables */ - array('SELECT \foo FROM Doctrine\Tests\Models\CMS\CmsUser \foo'), - array('SELECT foo\ FROM Doctrine\Tests\Models\CMS\CmsUser foo\\'), - array('SELECT foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser foo\bar'), - array('SELECT foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser foo:bar'), - array('SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'), + ['SELECT \foo FROM Doctrine\Tests\Models\CMS\CmsUser \foo'], + ['SELECT foo\ FROM Doctrine\Tests\Models\CMS\CmsUser foo\\'], + ['SELECT foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser foo\bar'], + ['SELECT foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser foo:bar'], + ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'], /* Checks for invalid AbstractSchemaName */ - array('SELECT u FROM UnknownClass u'), // unknown - array('SELECT u FROM Unknown\Class u'), // unknown with namespace - array('SELECT u FROM \Unknown\Class u'), // unknown, leading backslash - array('SELECT u FROM Unknown\\\\Class u'), // unknown, syntactically bogus (duplicate \\) - array('SELECT u FROM Unknown\Class\ u'), // unknown, syntactically bogus (trailing \) - array('SELECT u FROM Unknown:Class u'), // unknown, with namespace alias - array('SELECT u FROM Unknown::Class u'), // unknown, with PAAMAYIM_NEKUDOTAYIM - array('SELECT u FROM Unknown:Class:Name u'), // unknown, with invalid namespace alias - array('SELECT u FROM UnknownClass: u'), // unknown, with invalid namespace alias - array('SELECT u FROM Unknown:Class: u'), // unknown, with invalid namespace alias - array('SELECT u FROM Doctrine\Tests\Models\CMS\\\\CmsUser u'), // syntactically bogus (duplicate \\)array('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser\ u'), // syntactically bogus (trailing \) - array('SELECT u FROM CMS::User u'), - array('SELECT u FROM CMS:User: u'), - array('SELECT u FROM CMS:User:Foo u'), + ['SELECT u FROM UnknownClass u'], // unknown + ['SELECT u FROM Unknown\Class u'], // unknown with namespace + ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash + ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\) + ['SELECT u FROM Unknown\Class\ u'], // unknown, syntactically bogus (trailing \) + ['SELECT u FROM Unknown:Class u'], // unknown, with namespace alias + ['SELECT u FROM Unknown::Class u'], // unknown, with PAAMAYIM_NEKUDOTAYIM + ['SELECT u FROM Unknown:Class:Name u'], // unknown, with invalid namespace alias + ['SELECT u FROM UnknownClass: u'], // unknown, with invalid namespace alias + ['SELECT u FROM Unknown:Class: u'], // unknown, with invalid namespace alias + ['SELECT u FROM Doctrine\Tests\Models\CMS\\\\CmsUser u'], // syntactically bogus (duplicate \\)array('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser\ u'), // syntactically bogus (trailing \) + ['SELECT u FROM CMS::User u'], + ['SELECT u FROM CMS:User: u'], + ['SELECT u FROM CMS:User:Foo u'], /* Checks for invalid AliasResultVariable */ - array('SELECT \'foo\' AS \foo FROM Doctrine\Tests\Models\CMS\CmsUser u'), - array('SELECT \'foo\' AS \foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'), - array('SELECT \'foo\' AS foo\ FROM Doctrine\Tests\Models\CMS\CmsUser u'), - array('SELECT \'foo\' AS foo\\\\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'), - array('SELECT \'foo\' AS foo: FROM Doctrine\Tests\Models\CMS\CmsUser u'), - array('SELECT \'foo\' AS foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser u'), - ); + ['SELECT \'foo\' AS \foo FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ['SELECT \'foo\' AS \foo\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ['SELECT \'foo\' AS foo\ FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ['SELECT \'foo\' AS foo\\\\bar FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ['SELECT \'foo\' AS foo: FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ['SELECT \'foo\' AS foo:bar FROM Doctrine\Tests\Models\CMS\CmsUser u'], + ]; } public function testSelectSingleComponentWithMultipleColumns() @@ -671,7 +673,7 @@ class LanguageRecognitionTest extends OrmTestCase { $this->assertValidDQL("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL"); } - + /** * @group DDC-3085 */ diff --git a/tests/Doctrine/Tests/ORM/Query/LexerTest.php b/tests/Doctrine/Tests/ORM/Query/LexerTest.php index 9c4a889f0..904b89787 100644 --- a/tests/Doctrine/Tests/ORM/Query/LexerTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LexerTest.php @@ -161,63 +161,63 @@ class LexerTest extends OrmTestCase $dql = "SELECT u FROM My\Namespace\User u WHERE u.name = 'Jack O''Neil'"; $lexer = new Lexer($dql); - $tokens = array( - array( + $tokens = [ + [ 'value' => 'SELECT', 'type' => Lexer::T_SELECT, 'position' => 0 - ), - array( + ], + [ 'value' => 'u', 'type' => Lexer::T_IDENTIFIER, 'position' => 7 - ), - array( + ], + [ 'value' => 'FROM', 'type' => Lexer::T_FROM, 'position' => 9 - ), - array( + ], + [ 'value' => 'My\Namespace\User', 'type' => Lexer::T_FULLY_QUALIFIED_NAME, 'position' => 14 - ), - array( + ], + [ 'value' => 'u', 'type' => Lexer::T_IDENTIFIER, 'position' => 32 - ), - array( + ], + [ 'value' => 'WHERE', 'type' => Lexer::T_WHERE, 'position' => 34 - ), - array( + ], + [ 'value' => 'u', 'type' => Lexer::T_IDENTIFIER, 'position' => 40 - ), - array( + ], + [ 'value' => '.', 'type' => Lexer::T_DOT, 'position' => 41 - ), - array( + ], + [ 'value' => 'name', 'type' => Lexer::T_IDENTIFIER, 'position' => 42 - ), - array( + ], + [ 'value' => '=', 'type' => Lexer::T_EQUALS, 'position' => 47 - ), - array( + ], + [ 'value' => "Jack O'Neil", 'type' => Lexer::T_STRING, 'position' => 49 - ) - ); + ] + ]; foreach ($tokens as $expected) { $lexer->moveNext(); @@ -232,16 +232,16 @@ class LexerTest extends OrmTestCase public function provideTokens() { - return array( - array(Lexer::T_IDENTIFIER, 'u'), // one char - array(Lexer::T_IDENTIFIER, 'someIdentifier'), - array(Lexer::T_IDENTIFIER, 's0m31d3nt1f13r'), // including digits - array(Lexer::T_IDENTIFIER, 'some_identifier'), // including underscore - array(Lexer::T_IDENTIFIER, '_some_identifier'), // starts with underscore - array(Lexer::T_IDENTIFIER, 'comma'), // name of a token class with value < 100 (whitebox test) - array(Lexer::T_FULLY_QUALIFIED_NAME, 'Some\Class'), // DQL class reference - array(Lexer::T_ALIASED_NAME, 'Some:Name'), - array(Lexer::T_ALIASED_NAME, 'Some:Subclassed\Name') - ); + return [ + [Lexer::T_IDENTIFIER, 'u'], // one char + [Lexer::T_IDENTIFIER, 'someIdentifier'], + [Lexer::T_IDENTIFIER, 's0m31d3nt1f13r'], // including digits + [Lexer::T_IDENTIFIER, 'some_identifier'], // including underscore + [Lexer::T_IDENTIFIER, '_some_identifier'], // starts with underscore + [Lexer::T_IDENTIFIER, 'comma'], // name of a token class with value < 100 (whitebox test) + [Lexer::T_FULLY_QUALIFIED_NAME, 'Some\Class'], // DQL class reference + [Lexer::T_ALIASED_NAME, 'Some:Name'], + [Lexer::T_ALIASED_NAME, 'Some:Subclassed\Name'] + ]; } } diff --git a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php index 640a91314..b929f8d18 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php @@ -13,20 +13,20 @@ class ParameterTypeInfererTest extends OrmTestCase public function providerParameterTypeInferer() { - $data = array( - array(1, Type::INTEGER), - array("bar", PDO::PARAM_STR), - array("1", PDO::PARAM_STR), - array(new \DateTime, Type::DATETIME), - array(array(2), Connection::PARAM_INT_ARRAY), - array(array("foo"), Connection::PARAM_STR_ARRAY), - array(array("1","2"), Connection::PARAM_STR_ARRAY), - array(array(), Connection::PARAM_STR_ARRAY), - array(true, Type::BOOLEAN), - ); + $data = [ + [1, Type::INTEGER], + ["bar", PDO::PARAM_STR], + ["1", PDO::PARAM_STR], + [new \DateTime, Type::DATETIME], + [[2], Connection::PARAM_INT_ARRAY], + [["foo"], Connection::PARAM_STR_ARRAY], + [["1","2"], Connection::PARAM_STR_ARRAY], + [[], Connection::PARAM_STR_ARRAY], + [true, Type::BOOLEAN], + ]; if (PHP_VERSION_ID >= 50500) { - $data[] = array(new \DateTimeImmutable(), Type::DATETIME); + $data[] = [new \DateTimeImmutable(), Type::DATETIME]; } return $data; diff --git a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php index 086e1d43e..0a61d7d31 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php @@ -26,7 +26,7 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase { $this->assertNull($this->parserResult->getSqlExecutor()); - $executor = $this->getMockBuilder(AbstractSqlExecutor::class)->setMethods(array('execute'))->getMock(); + $executor = $this->getMockBuilder(AbstractSqlExecutor::class)->setMethods(['execute'])->getMock(); $this->parserResult->setSqlExecutor($executor); $this->assertSame($executor, $this->parserResult->getSqlExecutor()); } @@ -35,7 +35,7 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase { $this->parserResult->addParameterMapping(1, 1); $this->parserResult->addParameterMapping(1, 2); - $this->assertEquals(array(1, 2), $this->parserResult->getSqlParameterPositions(1)); + $this->assertEquals([1, 2], $this->parserResult->getSqlParameterPositions(1)); } public function testGetParameterMappings() @@ -44,6 +44,6 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase $this->parserResult->addParameterMapping(1, 1); $this->parserResult->addParameterMapping(1, 2); - $this->assertEquals(array(1 => array(1, 2)), $this->parserResult->getParameterMappings()); + $this->assertEquals([1 => [1, 2]], $this->parserResult->getParameterMappings()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Query/ParserTest.php b/tests/Doctrine/Tests/ORM/Query/ParserTest.php index fb320773e..6b898f80b 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParserTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParserTest.php @@ -108,28 +108,29 @@ class ParserTest extends OrmTestCase * The basic checks that tokens are classified correctly do not belong here * but in LexerTest. */ - return array( - array(Lexer::T_WHERE, 'where'), // keyword - array(Lexer::T_DOT, '.'), // token that cannot be an identifier - array(Lexer::T_IDENTIFIER, 'someIdentifier'), - array(Lexer::T_IDENTIFIER, 'from'), // also a terminal string (the "FROM" keyword) as in DDC-505 - array(Lexer::T_IDENTIFIER, 'comma') // not even a terminal string, but the name of a constant in the Lexer (whitebox test) - ); + return [ + [Lexer::T_WHERE, 'where'], // keyword + [Lexer::T_DOT, '.'], // token that cannot be an identifier + [Lexer::T_IDENTIFIER, 'someIdentifier'], + [Lexer::T_IDENTIFIER, 'from'], // also a terminal string (the "FROM" keyword) as in DDC-505 + [Lexer::T_IDENTIFIER, 'comma'] + // not even a terminal string, but the name of a constant in the Lexer (whitebox test) + ]; } public function invalidMatches() { - return array( - array(Lexer::T_DOT, 'ALL'), // ALL is a terminal string (reserved keyword) and also possibly an identifier - array(Lexer::T_DOT, ','), // "," is a token on its own, but cannot be used as identifier - array(Lexer::T_WHERE, 'WITH'), // as in DDC-3697 - array(Lexer::T_WHERE, '.'), + return [ + [Lexer::T_DOT, 'ALL'], // ALL is a terminal string (reserved keyword) and also possibly an identifier + [Lexer::T_DOT, ','], // "," is a token on its own, but cannot be used as identifier + [Lexer::T_WHERE, 'WITH'], // as in DDC-3697 + [Lexer::T_WHERE, '.'], // The following are qualified or aliased names and must not be accepted where only an Identifier is expected - array(Lexer::T_IDENTIFIER, '\\Some\\Class'), - array(Lexer::T_IDENTIFIER, 'Some\\Class'), - array(Lexer::T_IDENTIFIER, 'Some:Name'), - ); + [Lexer::T_IDENTIFIER, '\\Some\\Class'], + [Lexer::T_IDENTIFIER, 'Some\\Class'], + [Lexer::T_IDENTIFIER, 'Some:Name'], + ]; } private function createParser($dql) diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php index b8d688261..7653be5ec 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php @@ -30,7 +30,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->visitor = new QueryExpressionVisitor(array('o','p')); + $this->visitor = new QueryExpressionVisitor(['o','p']); } /** @@ -44,7 +44,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase { $this->assertEquals($queryExpr, $this->visitor->walkComparison($criteriaExpr)); if ($parameter) { - $this->assertEquals(new ArrayCollection(array($parameter)), $this->visitor->getParameters()); + $this->assertEquals(new ArrayCollection([$parameter]), $this->visitor->getParameters()); } } @@ -53,30 +53,30 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase $cb = new CriteriaBuilder(); $qb = new QueryBuilder(); - return array( - array($cb->eq('field', 'value'), $qb->eq('o.field', ':field'), new Parameter('field', 'value')), - array($cb->neq('field', 'value'), $qb->neq('o.field', ':field'), new Parameter('field', 'value')), - array($cb->eq('field', null), $qb->isNull('o.field')), - array($cb->neq('field', null), $qb->isNotNull('o.field')), - array($cb->isNull('field'), $qb->isNull('o.field')), + return [ + [$cb->eq('field', 'value'), $qb->eq('o.field', ':field'), new Parameter('field', 'value')], + [$cb->neq('field', 'value'), $qb->neq('o.field', ':field'), new Parameter('field', 'value')], + [$cb->eq('field', null), $qb->isNull('o.field')], + [$cb->neq('field', null), $qb->isNotNull('o.field')], + [$cb->isNull('field'), $qb->isNull('o.field')], - array($cb->gt('field', 'value'), $qb->gt('o.field', ':field'), new Parameter('field', 'value')), - array($cb->gte('field', 'value'), $qb->gte('o.field', ':field'), new Parameter('field', 'value')), - array($cb->lt('field', 'value'), $qb->lt('o.field', ':field'), new Parameter('field', 'value')), - array($cb->lte('field', 'value'), $qb->lte('o.field', ':field'), new Parameter('field', 'value')), + [$cb->gt('field', 'value'), $qb->gt('o.field', ':field'), new Parameter('field', 'value')], + [$cb->gte('field', 'value'), $qb->gte('o.field', ':field'), new Parameter('field', 'value')], + [$cb->lt('field', 'value'), $qb->lt('o.field', ':field'), new Parameter('field', 'value')], + [$cb->lte('field', 'value'), $qb->lte('o.field', ':field'), new Parameter('field', 'value')], - array($cb->in('field', array('value')), $qb->in('o.field', ':field'), new Parameter('field', array('value'))), - array($cb->notIn('field', array('value')), $qb->notIn('o.field', ':field'), new Parameter('field', array('value'))), + [$cb->in('field', ['value']), $qb->in('o.field', ':field'), new Parameter('field', ['value'])], + [$cb->notIn('field', ['value']), $qb->notIn('o.field', ':field'), new Parameter('field', ['value'])], - array($cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')), + [$cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')], // Test parameter conversion - array($cb->eq('object.field', 'value'), $qb->eq('o.object.field', ':object_field'), new Parameter('object_field', 'value')), + [$cb->eq('object.field', 'value'), $qb->eq('o.object.field', ':object_field'), new Parameter('object_field', 'value')], // Test alternative rootAlias - array($cb->eq('p.field', 'value'), $qb->eq('p.field', ':p_field'), new Parameter('p_field', 'value')), - array($cb->eq('p.object.field', 'value'), $qb->eq('p.object.field', ':p_object_field'), new Parameter('p_object_field', 'value')), - ); + [$cb->eq('p.field', 'value'), $qb->eq('p.field', ':p_field'), new Parameter('p_field', 'value')], + [$cb->eq('p.object.field', 'value'), $qb->eq('p.object.field', ':p_object_field'), new Parameter('p_object_field', 'value')], + ]; } public function testWalkAndCompositeExpression() diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index 7a3687c52..e646d670a 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -89,7 +89,7 @@ class QueryTest extends OrmTestCase ->setHint('foo', 'bar') ->setHint('bar', 'baz') ->setParameter(1, 'bar') - ->setParameters(new ArrayCollection(array(new Parameter(2, 'baz')))) + ->setParameters(new ArrayCollection([new Parameter(2, 'baz')])) ->setResultCacheDriver(null) ->setResultCacheId('foo') ->setDQL('foo') @@ -109,7 +109,7 @@ class QueryTest extends OrmTestCase $this->assertEquals('bar', $q->getHint('foo')); $this->assertEquals('baz', $q->getHint('bar')); - $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints()); + $this->assertEquals(['foo' => 'bar', 'bar' => 'baz'], $q->getHints()); $this->assertTrue($q->hasHint('foo')); $this->assertFalse($q->hasHint('barFooBaz')); } @@ -154,11 +154,11 @@ class QueryTest extends OrmTestCase */ public function testCollectionParameters() { - $cities = array( + $cities = [ 0 => "Paris", 3 => "Canne", 9 => "St Julien" - ); + ]; $query = $this->_em ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)") @@ -186,11 +186,11 @@ class QueryTest extends OrmTestCase public function testDefaultQueryHints() { $config = $this->_em->getConfiguration(); - $defaultHints = array( + $defaultHints = [ 'hint_name_1' => 'hint_value_1', 'hint_name_2' => 'hint_value_2', 'hint_name_3' => 'hint_value_3', - ); + ]; $config->setDefaultQueryHints($defaultHints); $query = $this->_em->createQuery(); diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 707973495..9a074d60e 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -37,7 +37,8 @@ class SelectSqlGenerationTest extends OrmTestCase * @param array $queryHints * @param array $queryParams */ - public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = array(), array $queryParams = array()) + public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = [] + ) { try { $query = $this->_em->createQuery($dqlToBeTested); @@ -75,7 +76,8 @@ class SelectSqlGenerationTest extends OrmTestCase * @param array $queryHints * @param array $queryParams */ - public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = array(), array $queryParams = array()) + public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = [] + ) { $this->expectException($expectedException); @@ -107,7 +109,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -124,7 +126,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -554,7 +556,7 @@ class SelectSqlGenerationTest extends OrmTestCase $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1", "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN (?)", - array(), array(1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee')) + [], [1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee')] ); } @@ -699,7 +701,7 @@ class SelectSqlGenerationTest extends OrmTestCase $group->id = 101; $group2 = new CmsGroup(); $group2->id = 105; - $q->setParameter('param', array($group, $group2)); + $q->setParameter('param', [$group, $group2]); $this->assertEquals( 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (?))', @@ -713,7 +715,7 @@ class SelectSqlGenerationTest extends OrmTestCase // 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 CompanyPerson(); - $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, array('id' => 101)); + $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, ['id' => 101]); $q->setParameter('param', $person); $this->assertEquals( '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 WHERE EXISTS (SELECT 1 FROM company_persons_friends c3_ INNER JOIN company_persons c4_ ON c3_.friend_id = c4_.id WHERE c3_.person_id = c0_.id AND c4_.id IN (?))', @@ -1047,7 +1049,7 @@ class SelectSqlGenerationTest extends OrmTestCase "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(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_WRITE) + [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_WRITE] ); } @@ -1063,7 +1065,7 @@ class SelectSqlGenerationTest extends OrmTestCase "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(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) + [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ] ); } @@ -1077,7 +1079,7 @@ class SelectSqlGenerationTest extends OrmTestCase "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(ORMQuery::HINT_LOCK_MODE => LockMode::NONE) + [ORMQuery::HINT_LOCK_MODE => LockMode::NONE] ); } @@ -1104,7 +1106,7 @@ class SelectSqlGenerationTest extends OrmTestCase "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(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) + [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ] ); } @@ -1120,7 +1122,7 @@ class SelectSqlGenerationTest extends OrmTestCase "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(ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ) + [ORMQuery::HINT_LOCK_MODE => LockMode::PESSIMISTIC_READ] ); } @@ -1137,7 +1139,7 @@ class SelectSqlGenerationTest extends OrmTestCase 'SELECT ABS(c0_.phonenumber) AS sclr_0 FROM cms_phonenumbers c0_' ); - $config->setCustomNumericFunctions(array()); + $config->setCustomNumericFunctions([]); } /** @@ -1441,7 +1443,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1453,7 +1455,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1465,7 +1467,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1477,7 +1479,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1489,7 +1491,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1501,7 +1503,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1513,7 +1515,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1525,7 +1527,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1537,7 +1539,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1549,7 +1551,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1561,7 +1563,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -1573,7 +1575,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => true) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => true] ); } @@ -1585,7 +1587,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -2145,7 +2147,7 @@ class SelectSqlGenerationTest extends OrmTestCase 'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING u.username IS NULL', 'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING c0_.username IS NULL' ); - + $this->assertSqlGeneration( 'SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u HAVING MAX(u.name) IS NULL', 'SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING MAX(c0_.name) IS NULL' @@ -2160,7 +2162,7 @@ class SelectSqlGenerationTest extends OrmTestCase $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(ORMQuery::HINT_FORCE_PARTIAL_LOAD => false) + [ORMQuery::HINT_FORCE_PARTIAL_LOAD => false] ); } @@ -2238,8 +2240,8 @@ class SelectSqlGenerationTest extends OrmTestCase $this->assertSqlGeneration( 'SELECT e, COUNT(c) FROM Doctrine\Tests\Models\Company\CompanyEmployee e JOIN e.contracts c WHERE e.department = :department', "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, COUNT(c2_.id) AS sclr_5, c0_.discr AS discr_6 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id INNER JOIN company_contract_employees c3_ ON c1_.id = c3_.employee_id INNER JOIN company_contracts c2_ ON c2_.id = c3_.contract_id AND c2_.discr IN ('fix', 'flexible', 'flexultra') WHERE c1_.department = ?", - array(), - array('department' => 'foobar') + [], + ['department' => 'foobar'] ); } @@ -2264,7 +2266,7 @@ class SelectSqlGenerationTest extends OrmTestCase "SELECT c0_.name AS name_0 FROM cms_users c0_ HAVING name_0 LIKE '3'" ); } - + /** * @group DDC-3085 */ diff --git a/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php b/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php index 263cffc56..e23ee0117 100644 --- a/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SqlWalkerTest.php @@ -24,7 +24,7 @@ class SqlWalkerTest extends OrmTestCase */ protected function setUp() { - $this->sqlWalker = new SqlWalker(new Query($this->_getTestEntityManager()), new ParserResult(), array()); + $this->sqlWalker = new SqlWalker(new Query($this->_getTestEntityManager()), new ParserResult(), []); } /** @@ -53,10 +53,10 @@ class SqlWalkerTest extends OrmTestCase */ public function getColumnNamesAndSqlAliases() { - return array( - array('aaaaa', 'a0_'), - array('table', 't0_'), - array('çtable', 't0_'), - ); + return [ + ['aaaaa', 'a0_'], + ['table', 't0_'], + ['çtable', 't0_'], + ]; } } diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index acf4d08e6..9418028ec 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -285,7 +285,7 @@ class QueryBuilderTest extends OrmTestCase $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->where('u.id = :uid') - ->andWhere($qb->expr()->in('u.id', array(1, 2, 3))); + ->andWhere($qb->expr()->in('u.id', [1, 2, 3])); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id IN(1, 2, 3)'); } @@ -296,7 +296,7 @@ class QueryBuilderTest extends OrmTestCase $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->where('u.id = :uid') - ->orWhere($qb->expr()->in('u.id', array(1, 2, 3))); + ->orWhere($qb->expr()->in('u.id', [1, 2, 3])); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id IN(1, 2, 3)'); } @@ -307,7 +307,7 @@ class QueryBuilderTest extends OrmTestCase $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->where('u.id = :uid') - ->andWhere($qb->expr()->notIn('u.id', array(1, 2, 3))); + ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3])); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id NOT IN(1, 2, 3)'); } @@ -318,7 +318,7 @@ class QueryBuilderTest extends OrmTestCase $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->where('u.id = :uid') - ->orWhere($qb->expr()->notIn('u.id', array(1, 2, 3))); + ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3])); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id NOT IN(1, 2, 3)'); } @@ -528,7 +528,7 @@ class QueryBuilderTest extends OrmTestCase ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); $criteria = new Criteria(); - $criteria->orderBy(array('field' => Criteria::DESC)); + $criteria->orderBy(['field' => Criteria::DESC]); $qb->addCriteria($criteria); @@ -547,7 +547,7 @@ class QueryBuilderTest extends OrmTestCase ->join('u.article','a'); $criteria = new Criteria(); - $criteria->orderBy(array('a.field' => Criteria::DESC)); + $criteria->orderBy(['a.field' => Criteria::DESC]); $qb->addCriteria($criteria); @@ -692,7 +692,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $orExpr = $qb->expr()->orX(); $orExpr->add($qb->expr()->eq('u.id', ':uid3')); - $orExpr->add($qb->expr()->in('u.id', array(1))); + $orExpr->add($qb->expr()->in('u.id', [1])); $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') @@ -706,11 +706,11 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->where($qb->expr()->in('u.name', array('one', 'two', 'three'))); + ->where($qb->expr()->in('u.name', ['one', 'two', 'three'])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); - $qb->where($qb->expr()->in('u.name', array("O'Reilly", "O'Neil", 'Smith'))); + $qb->where($qb->expr()->in('u.name', ["O'Reilly", "O'Neil", 'Smith'])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('O''Reilly', 'O''Neil', 'Smith')"); } @@ -721,11 +721,11 @@ class QueryBuilderTest extends OrmTestCase $expr = $this->_em->getExpressionBuilder(); $qb->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->where($expr->in('u.name', array($expr->literal('one'), $expr->literal('two'), $expr->literal('three')))); + ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); - $qb->where($expr->in('u.name', array($expr->literal("O'Reilly"), $expr->literal("O'Neil"), $expr->literal('Smith')))); + $qb->where($expr->in('u.name', [$expr->literal("O'Reilly"), $expr->literal("O'Neil"), $expr->literal('Smith')])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('O''Reilly', 'O''Neil', 'Smith')"); } @@ -735,7 +735,7 @@ class QueryBuilderTest extends OrmTestCase $expr = $this->_em->getExpressionBuilder(); $orExpr = $expr->orX(); $orExpr->add($expr->eq('u.id', ':uid3')); - $orExpr->add($expr->not($expr->in('u.id', array(1)))); + $orExpr->add($expr->not($expr->in('u.id', [1]))); $qb = $this->_em->createQueryBuilder(); $qb->select('u') @@ -839,7 +839,7 @@ class QueryBuilderTest extends OrmTestCase ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->where('u.username = ?1')->orderBy('u.username'); - $qb->resetDQLParts(array('where', 'orderBy')); + $qb->resetDQLParts(['where', 'orderBy']); $this->assertEquals(1, count($qb->getDQLPart('select'))); $this->assertNull($qb->getDQLPart('where')); @@ -975,7 +975,7 @@ class QueryBuilderTest extends OrmTestCase ->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $this->assertEquals(array('u'), $qb->getRootAliases()); + $this->assertEquals(['u'], $qb->getRootAliases()); } public function testGetRootEntities() @@ -984,7 +984,7 @@ class QueryBuilderTest extends OrmTestCase ->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $this->assertEquals(array('Doctrine\Tests\Models\CMS\CmsUser'), $qb->getRootEntities()); + $this->assertEquals(['Doctrine\Tests\Models\CMS\CmsUser'], $qb->getRootEntities()); } public function testGetSeveralRootAliases() @@ -994,7 +994,7 @@ class QueryBuilderTest extends OrmTestCase ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u2'); - $this->assertEquals(array('u', 'u2'), $qb->getRootAliases()); + $this->assertEquals(['u', 'u2'], $qb->getRootAliases()); $this->assertEquals('u', $qb->getRootAlias()); } @@ -1003,7 +1003,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder() ->select('u') ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->add('join', array('INNER JOIN u.groups g'), true); + ->add('join', ['INNER JOIN u.groups g'], true); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.groups g', $qb->getDQL()); } diff --git a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php index bdccb4d7e..182554c93 100644 --- a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php @@ -52,7 +52,7 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase ->entityManager ->expects($this->any()) ->method('getClassMetadata') - ->will($this->returnCallback(array($this, 'buildClassMetadata'))); + ->will($this->returnCallback([$this, 'buildClassMetadata'])); $this->assertInstanceOf( 'Doctrine\\Tests\\Models\\DDC869\\DDC869PaymentRepository', @@ -66,7 +66,7 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase ->entityManager ->expects($this->any()) ->method('getClassMetadata') - ->will($this->returnCallback(array($this, 'buildClassMetadata'))); + ->will($this->returnCallback([$this, 'buildClassMetadata'])); $this->assertSame( $this->repositoryFactory->getRepository($this->entityManager, __CLASS__), @@ -100,11 +100,11 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase $em1 ->expects($this->any()) ->method('getClassMetadata') - ->will($this->returnCallback(array($this, 'buildClassMetadata'))); + ->will($this->returnCallback([$this, 'buildClassMetadata'])); $em2 ->expects($this->any()) ->method('getClassMetadata') - ->will($this->returnCallback(array($this, 'buildClassMetadata'))); + ->will($this->returnCallback([$this, 'buildClassMetadata'])); $repo1 = $this->repositoryFactory->getRepository($em1, __CLASS__); $repo2 = $this->repositoryFactory->getRepository($em2, __CLASS__); diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php index 298ca23a9..c8e2abca7 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php @@ -32,9 +32,11 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $this->command = new CollectionRegionCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($this->command); } @@ -43,10 +45,12 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:collection'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), '--all' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing all second-level cache collection regions' . PHP_EOL, $tester->getDisplay()); } @@ -55,11 +59,13 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:collection'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache for collection "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay()); } @@ -68,12 +74,14 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:collection'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', 'owner-id' => 1, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache entry for collection "Doctrine\Tests\Models\Cache\State#cities" owner entity identified by "1"' . PHP_EOL, $tester->getDisplay()); } @@ -82,12 +90,14 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:collection'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', '--flush' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Flushing cache provider configured for "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay()); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php index d16fa2e7f..b579c14d1 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php @@ -32,9 +32,11 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $this->command = new EntityRegionCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($this->command); } @@ -43,10 +45,12 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:entity'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), '--all' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing all second-level cache entity regions' . PHP_EOL, $tester->getDisplay()); } @@ -55,10 +59,12 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:entity'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache for entity "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay()); } @@ -67,11 +73,13 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:entity'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', 'entity-id' => 1, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache entry for entity "Doctrine\Tests\Models\Cache\Country" identified by "1"' . PHP_EOL, $tester->getDisplay()); } @@ -80,11 +88,13 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:entity'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', '--flush' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Flushing cache provider configured for entity named "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay()); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php index 4468faf96..0d296bf55 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php @@ -32,9 +32,11 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $this->command = new QueryRegionCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($this->command); } @@ -43,10 +45,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:query'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), '--all' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing all second-level cache query regions' . PHP_EOL, $tester->getDisplay()); } @@ -55,10 +59,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:query'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'region-name' => null, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache query region named "query_cache_region"' . PHP_EOL, $tester->getDisplay()); } @@ -67,10 +73,12 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:query'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'region-name' => 'my_region', - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Clearing second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay()); } @@ -79,11 +87,13 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase { $command = $this->application->find('orm:clear-cache:region:query'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'region-name' => 'my_region', '--flush' => true, - ), array('decorated' => false)); + ], ['decorated' => false] + ); $this->assertEquals('Flushing cache provider configured for second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay()); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php index af89c866d..3e6a0e904 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommandTest.php @@ -20,6 +20,6 @@ class ConvertDoctrine1SchemaCommandTest extends OrmTestCase ->method('writeln') ->with($this->equalTo('No Metadata Classes to process.')); - $command->convertDoctrine1Schema(array(), sys_get_temp_dir(), 'annotation', 4, null, $output); + $command->convertDoctrine1Schema([], sys_get_temp_dir(), 'annotation', 4, null, $output); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php index 08ade2999..e306c34b6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php @@ -35,15 +35,19 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase $metadataDriver = $this->_em->getConfiguration()->getMetadataDriverImpl(); - $metadataDriver->addPaths(array( + $metadataDriver->addPaths( + [ __DIR__ . '/../../../../Models/DDC3231/' - )); - + ] + ); + $this->application = new Application(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add(new GenerateRepositoriesCommand()); @@ -54,7 +58,7 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase */ public function tearDown() { - $dirs = array(); + $dirs = []; $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->path)); foreach ($ri AS $file) { @@ -133,11 +137,13 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase $command = $this->application->find('orm:generate-repositories'); $tester = new CommandTester($command); - $tester->execute(array( + $tester->execute( + [ 'command' => $command->getName(), 'dest-path' => $this->path, '--filter' => $filter, - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php index fb63e4f64..01a4d13db 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php @@ -33,9 +33,11 @@ class InfoCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $command = new InfoCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($command); @@ -45,9 +47,11 @@ class InfoCommandTest extends OrmFunctionalTestCase public function testListAllClasses() { - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), - )); + ] + ); $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $this->tester->getDisplay()); $this->assertContains('Doctrine\Tests\Models\Cache\City', $this->tester->getDisplay()); diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php index 017e94aee..9f1cec7f4 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php @@ -38,9 +38,11 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $command = new MappingDescribeCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($command); @@ -50,10 +52,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase public function testShowSpecificFuzzySingle() { - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), 'entityName' => 'AttractionInfo', - )); + ] + ); $display = $this->tester->getDisplay(); $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $display); @@ -66,10 +70,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase */ public function testShowSpecificFuzzyAmbiguous() { - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), 'entityName' => 'Attraction', - )); + ] + ); } /** @@ -78,10 +84,12 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase */ public function testShowSpecificNotFound() { - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), 'entityName' => 'AttractionFooBar' - )); + ] + ); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php index 8a78e4970..aa74ce753 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php @@ -41,9 +41,11 @@ class RunDqlCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $this->command = new RunDqlCommand(); - $this->application->setHelperSet(new HelperSet(array( + $this->application->setHelperSet(new HelperSet( + [ 'em' => new EntityManagerHelper($this->_em) - ))); + ] + )); $this->application->add($this->command); @@ -62,10 +64,12 @@ class RunDqlCommandTest extends OrmFunctionalTestCase $this->assertSame( 0, - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), 'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e', - )) + ] + ) ); $this->assertContains(DateTimeModel::CLASSNAME, $this->tester->getDisplay()); @@ -78,11 +82,13 @@ class RunDqlCommandTest extends OrmFunctionalTestCase $this->assertSame( 0, - $this->tester->execute(array( + $this->tester->execute( + [ 'command' => $this->command->getName(), 'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e', '--show-sql' => 'true' - )) + ] + ) ); $this->assertStringMatchesFormat('%Astring%sSELECT %a', $this->tester->getDisplay()); diff --git a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php index 6c62ca352..ca6192faa 100644 --- a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php @@ -33,7 +33,7 @@ class ConvertDoctrine1SchemaTest extends OrmTestCase $config->setProxyDir(__DIR__ . '/../../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); - $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager); + $conn = new ConnectionMock([], $driverMock, $config, $eventManager); $config->setMetadataDriverImpl($metadataDriver); return EntityManagerMock::create($conn, $config, $eventManager); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 89c073fd2..e51bb3116 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -54,32 +54,36 @@ class EntityGeneratorTest extends OrmTestCase * * @return ClassMetadataInfo */ - public function generateBookEntityFixture(array $embeddedClasses = array()) + public function generateBookEntityFixture(array $embeddedClasses = []) { $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook'); $metadata->namespace = $this->_namespace; $metadata->customRepositoryClassName = $this->_namespace . '\EntityGeneratorBookRepository'; $metadata->table['name'] = 'book'; - $metadata->table['uniqueConstraints']['name_uniq'] = array('columns' => array('name')); - $metadata->table['indexes']['status_idx'] = array('columns' => array('status')); - $metadata->mapField(array('fieldName' => 'name', 'type' => 'string')); - $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'options' => array('default' => 'published'))); - $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true)); - $metadata->mapOneToOne(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book')); - $joinColumns = array( - array('name' => 'author_id', 'referencedColumnName' => 'id') + $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']]; + $metadata->table['indexes']['status_idx'] = ['columns' => ['status']]; + $metadata->mapField(['fieldName' => 'name', 'type' => 'string']); + $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'options' => ['default' => 'published']]); + $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); + $metadata->mapOneToOne( + ['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book'] ); - $metadata->mapManyToMany(array( + $joinColumns = [ + ['name' => 'author_id', 'referencedColumnName' => 'id'] + ]; + $metadata->mapManyToMany( + [ 'fieldName' => 'comments', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorComment', 'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY, - 'joinTable' => array( + 'joinTable' => [ 'name' => 'book_comment', - 'joinColumns' => array(array('name' => 'book_id', 'referencedColumnName' => 'id')), - 'inverseJoinColumns' => array(array('name' => 'comment_id', 'referencedColumnName' => 'id')), - ), - )); + 'joinColumns' => [['name' => 'book_id', 'referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['name' => 'comment_id', 'referencedColumnName' => 'id']], + ], + ] + ); $metadata->addLifecycleCallback('loading', 'postLoad'); $metadata->addLifecycleCallback('willBeRemoved', 'preRemove'); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); @@ -100,12 +104,12 @@ class EntityGeneratorTest extends OrmTestCase $metadata->namespace = $this->_namespace; $metadata->table['name'] = 'entity_type'; - $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true)); + $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); $name = $field['fieldName']; $type = $field['dbType']; - $metadata->mapField(array('fieldName' => $name, 'type' => $type)); + $metadata->mapField(['fieldName' => $name, 'type' => $type]); $this->_generator->writeEntityClass($metadata, $this->_tmpDir); @@ -115,16 +119,16 @@ class EntityGeneratorTest extends OrmTestCase /** * @return ClassMetadataInfo */ - private function generateIsbnEmbeddableFixture(array $embeddedClasses = array()) + private function generateIsbnEmbeddableFixture(array $embeddedClasses = []) { $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn'); $metadata->namespace = $this->_namespace; $metadata->isEmbeddedClass = true; - $metadata->mapField(array('fieldName' => 'prefix', 'type' => 'integer')); - $metadata->mapField(array('fieldName' => 'groupNumber', 'type' => 'integer')); - $metadata->mapField(array('fieldName' => 'publisherNumber', 'type' => 'integer')); - $metadata->mapField(array('fieldName' => 'titleNumber', 'type' => 'integer')); - $metadata->mapField(array('fieldName' => 'checkDigit', 'type' => 'integer')); + $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']); + $metadata->mapField(['fieldName' => 'groupNumber', 'type' => 'integer']); + $metadata->mapField(['fieldName' => 'publisherNumber', 'type' => 'integer']); + $metadata->mapField(['fieldName' => 'titleNumber', 'type' => 'integer']); + $metadata->mapField(['fieldName' => 'checkDigit', 'type' => 'integer']); foreach ($embeddedClasses as $fieldName => $embeddedClass) { $this->mapEmbedded($fieldName, $metadata, $embeddedClass); @@ -143,10 +147,10 @@ class EntityGeneratorTest extends OrmTestCase $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable'); $metadata->namespace = $this->_namespace; $metadata->isEmbeddedClass = true; - $metadata->mapField(array('fieldName' => 'field1', 'type' => 'integer')); - $metadata->mapField(array('fieldName' => 'field2', 'type' => 'integer', 'nullable' => true)); - $metadata->mapField(array('fieldName' => 'field3', 'type' => 'datetime')); - $metadata->mapField(array('fieldName' => 'field4', 'type' => 'datetime', 'nullable' => true)); + $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']); + $metadata->mapField(['fieldName' => 'field2', 'type' => 'integer', 'nullable' => true]); + $metadata->mapField(['fieldName' => 'field3', 'type' => 'datetime']); + $metadata->mapField(['fieldName' => 'field4', 'type' => 'datetime', 'nullable' => true]); $this->_generator->writeEntityClass($metadata, $this->_tmpDir); @@ -166,7 +170,7 @@ class EntityGeneratorTest extends OrmTestCase $columnPrefix = false ) { $classMetadata->mapEmbedded( - array('fieldName' => $fieldName, 'class' => $embeddableMetadata->name, 'columnPrefix' => $columnPrefix) + ['fieldName' => $fieldName, 'class' => $embeddableMetadata->name, 'columnPrefix' => $columnPrefix] ); } @@ -181,7 +185,8 @@ class EntityGeneratorTest extends OrmTestCase ClassMetadataInfo $embeddableMetadata ) { foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) { - $classMetadata->mapEmbedded(array( + $classMetadata->mapEmbedded( + [ 'fieldName' => $fieldName . '.' . $property, 'class' => $embeddableClass['class'], 'columnPrefix' => $embeddableClass['columnPrefix'], @@ -189,7 +194,8 @@ class EntityGeneratorTest extends OrmTestCase ? $fieldName . '.' . $embeddableClass['declaredField'] : $fieldName, 'originalField' => $embeddableClass['originalField'] ?: $property, - )); + ] + ); } } @@ -221,8 +227,8 @@ class EntityGeneratorTest extends OrmTestCase public function testGeneratedEntityClass() { $testMetadata = $this->generateTestEmbeddableFixture(); - $isbnMetadata = $this->generateIsbnEmbeddableFixture(array('test' => $testMetadata)); - $metadata = $this->generateBookEntityFixture(array('isbn' => $isbnMetadata)); + $isbnMetadata = $this->generateIsbnEmbeddableFixture(['test' => $testMetadata]); + $metadata = $this->generateBookEntityFixture(['isbn' => $isbnMetadata]); $book = $this->newInstance($metadata); $this->assertTrue(class_exists($metadata->name), "Class does not exist."); @@ -265,9 +271,9 @@ class EntityGeneratorTest extends OrmTestCase $comment = new EntityGeneratorComment(); $this->assertInstanceOf($metadata->name, $book->addComment($comment)); $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $book->getComments()); - $this->assertEquals(new ArrayCollection(array($comment)), $book->getComments()); + $this->assertEquals(new ArrayCollection([$comment]), $book->getComments()); $this->assertInternalType('boolean', $book->removeComment($comment)); - $this->assertEquals(new ArrayCollection(array()), $book->getComments()); + $this->assertEquals(new ArrayCollection([]), $book->getComments()); $this->newInstance($isbnMetadata); $isbn = new $isbnMetadata->name(); @@ -282,9 +288,9 @@ class EntityGeneratorTest extends OrmTestCase public function testEntityUpdatingWorks() { - $metadata = $this->generateBookEntityFixture(array('isbn' => $this->generateIsbnEmbeddableFixture())); + $metadata = $this->generateBookEntityFixture(['isbn' => $this->generateIsbnEmbeddableFixture()]); - $metadata->mapField(array('fieldName' => 'test', 'type' => 'string')); + $metadata->mapField(['fieldName' => 'test', 'type' => 'string']); $testEmbeddableMetadata = $this->generateTestEmbeddableFixture(); $this->mapEmbedded('testEmbedded', $metadata, $testEmbeddableMetadata); @@ -326,7 +332,7 @@ class EntityGeneratorTest extends OrmTestCase */ public function testDoesNotRegenerateExistingMethodsWithDifferentCase() { - $metadata = $this->generateBookEntityFixture(array('isbn' => $this->generateIsbnEmbeddableFixture())); + $metadata = $this->generateBookEntityFixture(['isbn' => $this->generateIsbnEmbeddableFixture()]); // Workaround to change existing fields case (just to simulate the use case) $metadata->fieldMappings['status']['fieldName'] = 'STATUS'; @@ -357,7 +363,7 @@ class EntityGeneratorTest extends OrmTestCase public function testMethodDocBlockShouldStartWithBackSlash() { $embeddedMetadata = $this->generateIsbnEmbeddableFixture(); - $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata)); + $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]); $book = $this->newInstance($metadata); $this->assertPhpDocVarType('\Doctrine\Common\Collections\Collection', new \ReflectionProperty($book, 'comments')); @@ -404,7 +410,7 @@ class EntityGeneratorTest extends OrmTestCase public function testLoadMetadata() { $embeddedMetadata = $this->generateIsbnEmbeddableFixture(); - $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata)); + $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]); $book = $this->newInstance($metadata); @@ -443,10 +449,10 @@ class EntityGeneratorTest extends OrmTestCase { $this->_generator->setAnnotationPrefix('ORM\\'); $embeddedMetadata = $this->generateIsbnEmbeddableFixture(); - $metadata = $this->generateBookEntityFixture(array('isbn' => $embeddedMetadata)); + $metadata = $this->generateBookEntityFixture(['isbn' => $embeddedMetadata]); $reader = new AnnotationReader(); - $driver = new AnnotationDriver($reader, array()); + $driver = new AnnotationDriver($reader, []); $book = $this->newInstance($metadata); @@ -489,7 +495,7 @@ class EntityGeneratorTest extends OrmTestCase $this->_generator->writeEntityClass($metadata, $this->_tmpDir); $this->newInstance($metadata); // force instantiation (causes autoloading to kick in) - $driver = new AnnotationDriver(new AnnotationReader(), array()); + $driver = new AnnotationDriver(new AnnotationReader(), []); $cm = new ClassMetadataInfo($metadata->name); $cm->initializeReflection(new RuntimeReflectionService); @@ -521,13 +527,15 @@ class EntityGeneratorTest extends OrmTestCase { $metadata = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity'); $metadata->namespace = $this->_namespace; - $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true)); + $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); - $metadata->setSequenceGeneratorDefinition(array( + $metadata->setSequenceGeneratorDefinition( + [ 'sequenceName' => 'DDC1784_ID_SEQ', 'allocationSize' => 1, 'initialValue' => 2 - )); + ] + ); $this->_generator->writeEntityClass($metadata, $this->_tmpDir); $filename = $this->_tmpDir . DIRECTORY_SEPARATOR @@ -553,23 +561,25 @@ class EntityGeneratorTest extends OrmTestCase { $metadata = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity'); $metadata->namespace = $this->_namespace; - $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true)); + $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); - $metadata->mapManyToMany(array( + $metadata->mapManyToMany( + [ 'fieldName' => 'centroCustos', 'targetEntity' => 'DDC2079CentroCusto', - 'joinTable' => array( + 'joinTable' => [ 'name' => 'unidade_centro_custo', - 'joinColumns' => array( - array('name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'), - array('name' => 'idunidade', 'referencedColumnName' => 'idunidade') - ), - 'inverseJoinColumns' => array( - array('name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'), - array('name' => 'idpais', 'referencedColumnName' => 'idpais'), - ), - ), - )); + 'joinColumns' => [ + ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'], + ['name' => 'idunidade', 'referencedColumnName' => 'idunidade'] + ], + 'inverseJoinColumns' => [ + ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'], + ['name' => 'idpais', 'referencedColumnName' => 'idpais'], + ], + ], + ] + ); $this->_generator->writeEntityClass($metadata, $this->_tmpDir); $filename = $this->_tmpDir . DIRECTORY_SEPARATOR @@ -838,7 +848,7 @@ class EntityGeneratorTest extends OrmTestCase public function testGeneratedMutableEmbeddablesClass() { $embeddedMetadata = $this->generateTestEmbeddableFixture(); - $metadata = $this->generateIsbnEmbeddableFixture(array('test' => $embeddedMetadata)); + $metadata = $this->generateIsbnEmbeddableFixture(['test' => $embeddedMetadata]); $isbn = $this->newInstance($metadata); @@ -878,7 +888,7 @@ class EntityGeneratorTest extends OrmTestCase { $this->_generator->setEmbeddablesImmutable(true); $embeddedMetadata = $this->generateTestEmbeddableFixture(); - $metadata = $this->generateIsbnEmbeddableFixture(array('test' => $embeddedMetadata)); + $metadata = $this->generateIsbnEmbeddableFixture(['test' => $embeddedMetadata]); $this->loadEntityClass($embeddedMetadata); $this->loadEntityClass($metadata); @@ -968,86 +978,106 @@ class EntityGeneratorTest extends OrmTestCase */ public function getEntityTypeAliasDataProvider() { - return array( - array(array( + return [ + [ + [ 'fieldName' => 'datetimetz', 'phpType' => '\\DateTime', 'dbType' => 'datetimetz', 'value' => new \DateTime - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'datetime', 'phpType' => '\\DateTime', 'dbType' => 'datetime', 'value' => new \DateTime - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'date', 'phpType' => '\\DateTime', 'dbType' => 'date', 'value' => new \DateTime - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'time', 'phpType' => '\DateTime', 'dbType' => 'time', 'value' => new \DateTime - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'object', 'phpType' => '\stdClass', 'dbType' => 'object', 'value' => new \stdClass() - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'bigint', 'phpType' => 'int', 'dbType' => 'bigint', 'value' => 11 - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'smallint', 'phpType' => 'int', 'dbType' => 'smallint', 'value' => 22 - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'text', 'phpType' => 'string', 'dbType' => 'text', 'value' => 'text' - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'blob', 'phpType' => 'string', 'dbType' => 'blob', 'value' => 'blob' - )), - array(array( + ] + ], + [ + [ 'fieldName' => 'decimal', 'phpType' => 'string', 'dbType' => 'decimal', 'value' => '12.34' - ), - )); + ], + ] + ]; } public function getParseTokensInEntityFileData() { - return array( - array( + return [ + [ '_generator->setRegenerateEntityIfExists(false); $this->_generator->setUpdateEntityIfExists(true); $this->_generator->setFieldVisibility(EntityGenerator::FIELD_VISIBLE_PROTECTED); - + $this->_repositoryGenerator = new EntityRepositoryGenerator(); } @@ -47,7 +47,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase */ public function tearDown() { - $dirs = array(); + $dirs = []; $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir)); foreach ($ri AS $file) { @@ -119,9 +119,9 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $em = $this->_getTestEntityManager(); $ns = $this->_namespace; - + require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2.php'; - + $className = $ns . '\DDC3231User2Tmp'; $this->writeEntityClass('Doctrine\Tests\Models\DDC3231\DDC3231User2', $className); @@ -131,14 +131,14 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $this->assertFileExists($rpath); require $rpath; - + $repo = new \ReflectionClass($em->getRepository($className)); $this->assertTrue($repo->inNamespace()); $this->assertSame($className . 'Repository', $repo->getName()); $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo->getParentClass()->getName()); - + require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2NoNamespace.php'; $className2 = 'DDC3231User2NoNamespaceTmp'; @@ -188,10 +188,10 @@ class EntityRepositoryGeneratorTest extends OrmTestCase private function writeRepositoryClass($className, $defaultRepository = null) { $this->_repositoryGenerator->setDefaultRepositoryName($defaultRepository); - + $this->_repositoryGenerator->writeEntityRepositoryClass($className . 'Repository', $this->_tmpDir); return $this->_tmpDir . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className) . 'Repository.php'; } - + } diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 5edd47b03..2cf91c390 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -39,7 +39,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase $config->setProxyDir(__DIR__ . '/../../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $eventManager = new EventManager(); - $conn = new ConnectionMock(array(), $driverMock, $config, $eventManager); + $conn = new ConnectionMock([], $driverMock, $config, $eventManager); $config->setMetadataDriverImpl($metadataDriver); return EntityManagerMock::create($conn, $config, $eventManager); @@ -47,18 +47,18 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase protected function _createMetadataDriver($type, $path) { - $mappingDriver = array( + $mappingDriver = [ 'php' => 'Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', 'annotation' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver', 'xml' => 'Doctrine\ORM\Mapping\Driver\XmlDriver', 'yaml' => 'Doctrine\ORM\Mapping\Driver\YamlDriver', - ); + ]; $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'."); $class = $mappingDriver[$type]; $driver = ($type === 'annotation') - ? $this->createAnnotationDriver(array($path)) + ? $this->createAnnotationDriver([$path]) : new $class($path); return $driver; @@ -140,7 +140,8 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testTableIsExported($class) { $this->assertEquals('cms_users', $class->table['name']); - $this->assertEquals(array('engine' => 'MyISAM', 'foo' => array('bar' => 'baz')), + $this->assertEquals( + ['engine' => 'MyISAM', 'foo' => ['bar' => 'baz']], $class->table['options']); return $class; @@ -164,7 +165,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testIdentifierIsExported($class) { $this->assertEquals(ClassMetadataInfo::GENERATOR_TYPE_IDENTITY, $class->generatorType, "Generator Type wrong"); - $this->assertEquals(array('id'), $class->identifier); + $this->assertEquals(['id'], $class->identifier); $this->assertTrue(isset($class->fieldMappings['id']['id']) && $class->fieldMappings['id']['id'] === true); return $class; @@ -259,7 +260,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToManyMapping', $class->associationMappings['phonenumbers']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Phonenumber', $class->associationMappings['phonenumbers']['targetEntity']); $this->assertEquals('user', $class->associationMappings['phonenumbers']['mappedBy']); - $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); + $this->assertEquals(['number' => 'ASC'], $class->associationMappings['phonenumbers']['orderBy']); $this->assertTrue($class->associationMappings['phonenumbers']['isCascadeRemove']); $this->assertTrue($class->associationMappings['phonenumbers']['isCascadePersist']); diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php index 3eca15f9c..424412882 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php @@ -29,19 +29,23 @@ class XmlClassMetadataExporterTest extends AbstractClassMetadataExporterTest $exporter = new XmlExporter(); $metadata = new ClassMetadata('entityTest'); - $metadata->mapField(array( + $metadata->mapField( + [ "fieldName" => 'id', "type" => 'integer', "columnName" => 'id', "id" => true, - )); + ] + ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); - $metadata->setSequenceGeneratorDefinition(array( + $metadata->setSequenceGeneratorDefinition( + [ 'sequenceName' => 'seq_entity_test_id', 'allocationSize' => 5, 'initialValue' => 1 - )); + ] + ); $expectedFileContent = <<<'XML' @@ -71,15 +75,17 @@ XML; $exporter = new XmlExporter(); $metadata = new ClassMetadata('entityTest'); - $metadata->mapField(array( + $metadata->mapField( + [ "fieldName" => 'myField', "type" => 'string', "columnName" => 'my_field', - "options" => array( + "options" => [ "default" => "default_string", "comment" => "The comment for the field", - ), - )); + ], + ] + ); $expectedFileContent = <<<'XML' diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php index 4a379f82e..8fe7425d9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php @@ -3,128 +3,148 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo; $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); -$metadata->setPrimaryTable(array( +$metadata->setPrimaryTable( + [ 'name' => 'cms_users', - 'options' => array('engine' => 'MyISAM', 'foo' => array('bar' => 'baz')), - )); + 'options' => ['engine' => 'MyISAM', 'foo' => ['bar' => 'baz']], + ] +); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); $metadata->addLifecycleCallback('doStuffOnPrePersist', 'prePersist'); $metadata->addLifecycleCallback('doOtherStuffOnPrePersistToo', 'prePersist'); $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist'); -$metadata->mapField(array( +$metadata->mapField( + [ 'id' => true, 'fieldName' => 'id', 'type' => 'integer', 'columnName' => 'id', - )); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'name', 'type' => 'string', 'length' => 50, 'unique' => true, 'nullable' => true, 'columnName' => 'name', - )); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'email', 'type' => 'string', 'columnName' => 'user_email', 'columnDefinition' => 'CHAR(32) NOT NULL', - )); -$metadata->mapField(array( + ] +); +$metadata->mapField( + [ 'fieldName' => 'age', 'type' => 'integer', - 'options' => array("unsigned"=>true), - )); + 'options' => ["unsigned"=>true], + ] +); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); -$metadata->mapManyToOne(array( +$metadata->mapManyToOne( + [ 'fieldName' => 'mainGroup', 'targetEntity' => 'Doctrine\\Tests\\ORM\Tools\\Export\\Group', -)); -$metadata->mapOneToOne(array( + ] +); +$metadata->mapOneToOne( + [ 'fieldName' => 'address', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Address', 'inversedBy' => 'user', 'cascade' => - array( + [ 0 => 'persist', - ), + ], 'mappedBy' => NULL, 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - ), - ), + ], + ], 'orphanRemoval' => true, 'fetch' => ClassMetadataInfo::FETCH_EAGER, - )); -$metadata->mapOneToOne(array( + ] +); +$metadata->mapOneToOne( + [ 'fieldName' => 'cart', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Cart', 'mappedBy' => 'user', 'cascade' => - array( + [ 0 => 'persist', - ), + ], 'inversedBy' => NULL, 'orphanRemoval' => false, 'fetch' => ClassMetadataInfo::FETCH_EAGER, -)); -$metadata->mapOneToMany(array( + ] +); +$metadata->mapOneToMany( + [ 'fieldName' => 'phonenumbers', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Phonenumber', 'cascade' => - array( + [ 1 => 'persist', 2 => 'merge', - ), + ], 'mappedBy' => 'user', 'orphanRemoval' => true, 'fetch' => ClassMetadataInfo::FETCH_LAZY, 'orderBy' => - array( + [ 'number' => 'ASC', - ), - )); -$metadata->mapManyToMany(array( + ], + ] +); +$metadata->mapManyToMany( + [ 'fieldName' => 'groups', 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Group', 'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY, 'cascade' => - array( + [ 0 => 'remove', 1 => 'persist', 2 => 'refresh', 3 => 'merge', 4 => 'detach', - ), + ], 'mappedBy' => NULL, 'joinTable' => - array( + [ 'name' => 'cms_users_groups', 'joinColumns' => - array( + [ 0 => - array( + [ 'name' => 'user_id', 'referencedColumnName' => 'id', 'unique' => false, 'nullable' => false, - ), - ), + ], + ], 'inverseJoinColumns' => - array( + [ 0 => - array( + [ 'name' => 'group_id', 'referencedColumnName' => 'id', 'columnDefinition' => 'INT NULL', - ), - ), - ), + ], + ], + ], 'orderBy' => NULL, - )); + ] +); diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php index a85a5f6f8..cb085124d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php @@ -14,7 +14,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -27,7 +27,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -40,7 +40,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost b GROUP BY b.id'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -53,7 +53,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a ORDER BY a.name'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -66,7 +66,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -80,7 +80,7 @@ class CountWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery( "SELECT g, COUNT(u.id) AS userCount FROM Doctrine\Tests\Models\CMS\CmsGroup g LEFT JOIN g.users u GROUP BY g.id HAVING userCount > 0" ); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setFirstResult(null)->setMaxResults(null); $this->expectException(\RuntimeException::class); @@ -88,15 +88,15 @@ class CountWalkerTest extends PaginationTestCase $query->getSQL(); } - + /** - * Arbitrary Join + * Arbitrary Join */ public function testCountQueryWithArbitraryJoin() { $query = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p LEFT JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\CountWalker')); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php index 30da25789..5ccec2e75 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php @@ -14,11 +14,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $dql = 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $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", + "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() ); } @@ -28,11 +28,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $dql = 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a ORDER BY p.title'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $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", + "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() ); } @@ -42,11 +42,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $this->assertEquals( - "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", + "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", $limitQuery->getSQL() ); } @@ -59,28 +59,28 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $dql = 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p ORDER BY p.author'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $this->assertEquals( - "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC", + "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC", $limitQuery->getSQL() ); } - + /** - * Arbitrary Join - */ + * Arbitrary Join + */ public function testLimitSubqueryWithArbitraryJoin() { $dql = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $this->assertEquals( - "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)", + "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)", $limitQuery->getSQL() ); } @@ -90,11 +90,11 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $dql = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c ORDER BY p.title'; $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker')); + + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); $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", + "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() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php index f89ea5704..bbe2dcea6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php @@ -16,7 +16,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -30,7 +30,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -44,7 +44,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -58,7 +58,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -72,7 +72,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 OR 2 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -86,7 +86,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE (1 = 1 OR 2 = 2) AND 3 = 3' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -100,7 +100,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2 OR 3 = 3' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -114,36 +114,36 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE NOT 1 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $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() ); } - + /** - * Arbitrary Join + * Arbitrary Join */ public function testWhereInQueryWithArbitraryJoin_NoWhere() { $whereInQuery = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c' ); - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $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() ); } - + public function testWhereInQueryWithArbitraryJoin_SingleWhere() { $whereInQuery = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c WHERE 1 = 1' ); - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker')); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( diff --git a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php index 28753078d..d089317c9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php @@ -43,12 +43,12 @@ class ResolveTargetEntityListenerTest extends OrmTestCase $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - array() + [] ); $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\TargetInterface', 'Doctrine\Tests\ORM\Tools\TargetEntity', - array() + [] ); $evm->addEventSubscriber($this->listener); @@ -73,7 +73,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - array() + [] ); $this->em->getEventManager()->addEventSubscriber($this->listener); @@ -92,12 +92,12 @@ class ResolveTargetEntityListenerTest extends OrmTestCase $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - array() + [] ); $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\TargetInterface', 'Doctrine\Tests\ORM\Tools\TargetEntity', - array() + [] ); $evm->addEventListener(Events::loadClassMetadata, $this->listener); @@ -105,7 +105,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase $meta = $cm->associationMappings['manyToMany']; $this->assertSame('Doctrine\Tests\ORM\Tools\TargetEntity', $meta['targetEntity']); - $this->assertEquals(array('resolvetargetentity_id', 'targetinterface_id'), $meta['joinTableColumns']); + $this->assertEquals(['resolvetargetentity_id', 'targetinterface_id'], $meta['joinTableColumns']); } /** @@ -120,7 +120,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase $this->listener->addResolveTargetEntity( 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - array() + [] ); $evm->addEventSubscriber($this->listener); diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index bc54744b9..142ddcb2f 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php @@ -15,7 +15,7 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $classes = array( + $classes = [ $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'), @@ -23,12 +23,12 @@ class SchemaToolTest extends OrmTestCase $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - ); + ]; $schema = $schemaTool->getSchemaFromMetadata($classes); $this->assertTrue($schema->hasTable('cms_users'), "Table cms_users should exist."); - $this->assertTrue($schema->getTable('cms_users')->columnsAreIndexed(array('username')), "username column should be indexed."); + $this->assertTrue($schema->getTable('cms_users')->columnsAreIndexed(['username']), "username column should be indexed."); } public function testAnnotationOptionsAttribute() @@ -36,13 +36,13 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $classes = array( + $classes = [ $em->getClassMetadata(__NAMESPACE__ . '\\TestEntityWithAnnotationOptionsAttribute'), - ); + ]; $schema = $schemaTool->getSchemaFromMetadata($classes); - $expected = array('foo' => 'bar', 'baz' => array('key' => 'val')); + $expected = ['foo' => 'bar', 'baz' => ['key' => 'val']]; $this->assertEquals($expected, $schema->getTable('TestEntityWithAnnotationOptionsAttribute')->getOptions(), "options annotation are passed to the tables options"); $this->assertEquals($expected, $schema->getTable('TestEntityWithAnnotationOptionsAttribute')->getColumn('test')->getCustomSchemaOptions(), "options annotation are passed to the columns customSchemaOptions"); @@ -62,7 +62,7 @@ class SchemaToolTest extends OrmTestCase $avatar->fieldMappings['id']['columnDefinition'] = $customColumnDef; $user = $em->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser'); - $classes = array($avatar, $user); + $classes = [$avatar, $user]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -81,11 +81,11 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $em->getEventManager()->addEventListener( - array(ToolEvents::postGenerateSchemaTable, ToolEvents::postGenerateSchema), $listener + [ToolEvents::postGenerateSchemaTable, ToolEvents::postGenerateSchema], $listener ); $schemaTool = new SchemaTool($em); - $classes = array( + $classes = [ $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'), @@ -93,7 +93,7 @@ class SchemaToolTest extends OrmTestCase $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - ); + ]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -106,16 +106,16 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $classes = array( + $classes = [ $em->getClassMetadata('Doctrine\Tests\Models\NullDefault\NullDefaultColumn'), - ); + ]; $customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes) ->getTable('NullDefaultColumn') ->getColumn('nullDefault') ->getCustomSchemaOptions(); - $this->assertSame(array(), $customSchemaOptions); + $this->assertSame([], $customSchemaOptions); } /** @@ -247,4 +247,4 @@ class SecondEntity * @Column(name="name") */ public $name; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index a17d92e7f..627a7b6a6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -26,49 +26,61 @@ class SchemaValidatorTest extends OrmTestCase public function testCmsModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/CMS" - )); + ] + ); $this->validator->validateMapping(); } public function testCompanyModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/Company" - )); + ] + ); $this->validator->validateMapping(); } public function testECommerceModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/ECommerce" - )); + ] + ); $this->validator->validateMapping(); } public function testForumModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/Forum" - )); + ] + ); $this->validator->validateMapping(); } public function testNavigationModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/Navigation" - )); + ] + ); $this->validator->validateMapping(); } public function testRoutingModelSet() { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths(array( + $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( + [ __DIR__ . "/../../Models/Routing" - )); + ] + ); $this->validator->validateMapping(); } @@ -83,10 +95,10 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class1); $this->assertEquals( - array( + [ "The inverse join columns of the many-to-many table 'Entity1Entity2' have to contain to ALL identifier columns of the target entity 'Doctrine\Tests\ORM\Tools\InvalidEntity2', however 'key4' are missing.", "The join columns of the many-to-many table 'Entity1Entity2' have to contain to ALL identifier columns of the source entity 'Doctrine\Tests\ORM\Tools\InvalidEntity1', however 'key2' are missing." - ), + ], $ce ); } @@ -102,10 +114,10 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class2); $this->assertEquals( - array( + [ "The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\InvalidEntity1'.", "The join columns of the association 'assoc' have to match to ALL identifier columns of the target entity 'Doctrine\Tests\ORM\Tools\InvalidEntity1', however 'key1, key2' are missing." - ), + ], $ce ); } @@ -120,7 +132,7 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class1); - $this->assertEquals(array(), $ce); + $this->assertEquals([], $ce); } /** @@ -131,10 +143,11 @@ class SchemaValidatorTest extends OrmTestCase $classThree = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC1649Three'); $ce = $this->validator->validateClass($classThree); - $this->assertEquals(Array( + $this->assertEquals( + [ "Cannot map association 'Doctrine\Tests\ORM\Tools\DDC1649Three#two as identifier, because the target entity 'Doctrine\Tests\ORM\Tools\DDC1649Two' also maps an association as identifier.", "The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\DDC1649Two'." - ), $ce); + ], $ce); } /** @@ -146,11 +159,11 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class); $this->assertEquals( - array( + [ "The field Doctrine\Tests\ORM\Tools\DDC3274One#two is on the inverse side of a bi-directional " . "relationship, but the specified mappedBy association on the target-entity " . "Doctrine\Tests\ORM\Tools\DDC3274Two#one does not contain the required 'inversedBy=\"two\"' attribute." - ), + ], $ce ); } @@ -164,10 +177,10 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class); $this->assertEquals( - array( + [ "The association Doctrine\Tests\ORM\Tools\DDC3322One#invalidAssoc is ordered by a foreign field " . "invalidField that is not a field on the target entity Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1." - ), + ], $ce ); } @@ -181,10 +194,10 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class); $this->assertEquals( - array( + [ "The association Doctrine\Tests\ORM\Tools\DDC3322Two#invalidAssoc is ordered by a field oneToMany " . "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is a collection-valued association." - ), + ], $ce ); } @@ -198,10 +211,10 @@ class SchemaValidatorTest extends OrmTestCase $ce = $this->validator->validateClass($class); $this->assertEquals( - array( + [ "The association Doctrine\Tests\ORM\Tools\DDC3322Three#invalidAssoc is ordered by a field oneToOneInverse " . "on Doctrine\Tests\ORM\Tools\DDC3322ValidEntity1 that is the inverse side of an association." - ), + ], $ce ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index 06ef2a07a..0709d5256 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -47,7 +47,7 @@ class SetupTest extends OrmTestCase public function testAnnotationConfiguration() { - $config = Setup::createAnnotationMetadataConfiguration(array(), true); + $config = Setup::createAnnotationMetadataConfiguration([], true); $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); $this->assertEquals(sys_get_temp_dir(), $config->getProxyDir()); @@ -57,7 +57,7 @@ class SetupTest extends OrmTestCase public function testXMLConfiguration() { - $config = Setup::createXMLMetadataConfiguration(array(), true); + $config = Setup::createXMLMetadataConfiguration([], true); $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\XmlDriver', $config->getMetadataDriverImpl()); @@ -65,7 +65,7 @@ class SetupTest extends OrmTestCase public function testYAMLConfiguration() { - $config = Setup::createYAMLMetadataConfiguration(array(), true); + $config = Setup::createYAMLMetadataConfiguration([], true); $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\YamlDriver', $config->getMetadataDriverImpl()); @@ -76,7 +76,7 @@ class SetupTest extends OrmTestCase */ public function testConfigureProxyDir() { - $config = Setup::createAnnotationMetadataConfiguration(array(), true, "/foo"); + $config = Setup::createAnnotationMetadataConfiguration([], true, "/foo"); $this->assertEquals('/foo', $config->getProxyDir()); } @@ -86,7 +86,7 @@ class SetupTest extends OrmTestCase public function testConfigureCache() { $cache = new ArrayCache(); - $config = Setup::createAnnotationMetadataConfiguration(array(), true, null, $cache); + $config = Setup::createAnnotationMetadataConfiguration([], true, null, $cache); $this->assertSame($cache, $config->getResultCacheImpl()); $this->assertSame($cache, $config->getMetadataCacheImpl()); @@ -99,7 +99,7 @@ class SetupTest extends OrmTestCase public function testConfigureCacheCustomInstance() { $cache = $this->createMock(Cache::class); - $config = Setup::createConfiguration(array(), true, $cache); + $config = Setup::createConfiguration([], true, $cache); $this->assertSame($cache, $config->getResultCacheImpl()); $this->assertSame($cache, $config->getMetadataCacheImpl()); diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 5a32d2882..42aadd431 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -52,7 +52,7 @@ class UnitOfWorkTest extends OrmTestCase protected function setUp() { parent::setUp(); - $this->_connectionMock = new ConnectionMock(array(), new DriverMock()); + $this->_connectionMock = new ConnectionMock([], new DriverMock()); $this->_emMock = EntityManagerMock::create($this->_connectionMock); // SUT $this->_unitOfWork = new UnitOfWorkMock($this->_emMock); @@ -168,7 +168,7 @@ class UnitOfWorkTest extends OrmTestCase $this->assertTrue($this->_unitOfWork->isScheduledForDirtyCheck($entity)); - $this->assertEquals(array('data' => array('thedata', 'newdata')), $this->_unitOfWork->getEntityChangeSet($entity)); + $this->assertEquals(['data' => ['thedata', 'newdata']], $this->_unitOfWork->getEntityChangeSet($entity)); $item = new NotifyChangedRelatedItem(); $entity->getItems()->add($item); @@ -215,7 +215,7 @@ class UnitOfWorkTest extends OrmTestCase $persister->reset(); // if the entity is already managed the exists() check should be skipped - $this->_unitOfWork->registerManaged($ph, array('phonenumber' => '12345'), array()); + $this->_unitOfWork->registerManaged($ph, ['phonenumber' => '12345'], []); $this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_unitOfWork->getEntityState($ph)); $this->assertFalse($persister->isExistsCalled()); $ph2 = new CmsPhonenumber(); @@ -319,7 +319,7 @@ class UnitOfWorkTest extends OrmTestCase $entity = new ForumUser(); $entity->id = 123; - $this->_unitOfWork->registerManaged($entity, array('id' => 123), array()); + $this->_unitOfWork->registerManaged($entity, ['id' => 123], []); $this->assertTrue($this->_unitOfWork->isInIdentityMap($entity)); $this->_unitOfWork->remove($entity); @@ -497,7 +497,7 @@ class UnitOfWorkTest extends OrmTestCase */ class NotifyChangedEntity implements NotifyPropertyChanged { - private $_listeners = array(); + private $_listeners = []; /** * @Id * @Column(type="integer") diff --git a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php index dad6ce4b3..384d04328 100644 --- a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php +++ b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php @@ -36,12 +36,12 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( - array( + [ $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'), $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\Flight'), $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\City') - ) + ] ); } catch (ORMException $e) { } @@ -66,7 +66,7 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase $this->_em->flush(); $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity') - ->findOneBy(array('name' => 'Fred')); + ->findOneBy(['name' => 'Fred']); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'); diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index a6a3bece4..b6d2f005c 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -63,29 +63,29 @@ abstract class OrmFunctionalTestCase extends OrmTestCase * * @var array */ - protected $_usedModelSets = array(); + protected $_usedModelSets = []; /** * Whether the database schema has already been created. * * @var array */ - protected static $_tablesCreated = array(); + protected static $_tablesCreated = []; /** * Array of entity class name to their tables that were created. * * @var array */ - protected static $_entityTablesCreated = array(); + protected static $_entityTablesCreated = []; /** * List of model sets and their classes. * * @var array */ - protected static $_modelSets = array( - 'cms' => array( + protected static $_modelSets = [ + 'cms' => [ 'Doctrine\Tests\Models\CMS\CmsUser', 'Doctrine\Tests\Models\CMS\CmsPhonenumber', 'Doctrine\Tests\Models\CMS\CmsAddress', @@ -94,9 +94,9 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\CMS\CmsTag', 'Doctrine\Tests\Models\CMS\CmsArticle', 'Doctrine\Tests\Models\CMS\CmsComment', - ), - 'forum' => array(), - 'company' => array( + ], + 'forum' => [], + 'company' => [ 'Doctrine\Tests\Models\Company\CompanyPerson', 'Doctrine\Tests\Models\Company\CompanyEmployee', 'Doctrine\Tests\Models\Company\CompanyManager', @@ -106,40 +106,40 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\Company\CompanyRaffle', 'Doctrine\Tests\Models\Company\CompanyCar', 'Doctrine\Tests\Models\Company\CompanyContract', - ), - 'ecommerce' => array( + ], + 'ecommerce' => [ 'Doctrine\Tests\Models\ECommerce\ECommerceCart', 'Doctrine\Tests\Models\ECommerce\ECommerceCustomer', 'Doctrine\Tests\Models\ECommerce\ECommerceProduct', 'Doctrine\Tests\Models\ECommerce\ECommerceShipping', 'Doctrine\Tests\Models\ECommerce\ECommerceFeature', 'Doctrine\Tests\Models\ECommerce\ECommerceCategory' - ), - 'generic' => array( + ], + 'generic' => [ 'Doctrine\Tests\Models\Generic\BooleanModel', 'Doctrine\Tests\Models\Generic\DateTimeModel', 'Doctrine\Tests\Models\Generic\DecimalModel', 'Doctrine\Tests\Models\Generic\SerializationModel', - ), - 'routing' => array( + ], + 'routing' => [ 'Doctrine\Tests\Models\Routing\RoutingLeg', 'Doctrine\Tests\Models\Routing\RoutingLocation', 'Doctrine\Tests\Models\Routing\RoutingRoute', 'Doctrine\Tests\Models\Routing\RoutingRouteBooking', - ), - 'navigation' => array( + ], + 'navigation' => [ 'Doctrine\Tests\Models\Navigation\NavUser', 'Doctrine\Tests\Models\Navigation\NavCountry', 'Doctrine\Tests\Models\Navigation\NavPhotos', 'Doctrine\Tests\Models\Navigation\NavTour', 'Doctrine\Tests\Models\Navigation\NavPointOfInterest', - ), - 'directorytree' => array( + ], + 'directorytree' => [ 'Doctrine\Tests\Models\DirectoryTree\AbstractContentItem', 'Doctrine\Tests\Models\DirectoryTree\File', 'Doctrine\Tests\Models\DirectoryTree\Directory', - ), - 'ddc117' => array( + ], + 'ddc117' => [ 'Doctrine\Tests\Models\DDC117\DDC117Article', 'Doctrine\Tests\Models\DDC117\DDC117Reference', 'Doctrine\Tests\Models\DDC117\DDC117Translation', @@ -147,42 +147,42 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\DDC117\DDC117ApproveChanges', 'Doctrine\Tests\Models\DDC117\DDC117Editor', 'Doctrine\Tests\Models\DDC117\DDC117Link', - ), - 'ddc3699' => array( + ], + 'ddc3699' => [ 'Doctrine\Tests\Models\DDC3699\DDC3699Parent', 'Doctrine\Tests\Models\DDC3699\DDC3699RelationOne', 'Doctrine\Tests\Models\DDC3699\DDC3699RelationMany', 'Doctrine\Tests\Models\DDC3699\DDC3699Child', - ), - 'stockexchange' => array( + ], + 'stockexchange' => [ 'Doctrine\Tests\Models\StockExchange\Bond', 'Doctrine\Tests\Models\StockExchange\Stock', 'Doctrine\Tests\Models\StockExchange\Market', - ), - 'legacy' => array( + ], + 'legacy' => [ 'Doctrine\Tests\Models\Legacy\LegacyUser', 'Doctrine\Tests\Models\Legacy\LegacyUserReference', 'Doctrine\Tests\Models\Legacy\LegacyArticle', 'Doctrine\Tests\Models\Legacy\LegacyCar', - ), - 'customtype' => array( + ], + 'customtype' => [ 'Doctrine\Tests\Models\CustomType\CustomTypeChild', 'Doctrine\Tests\Models\CustomType\CustomTypeParent', 'Doctrine\Tests\Models\CustomType\CustomTypeUpperCase', - ), - 'compositekeyinheritance' => array( + ], + 'compositekeyinheritance' => [ 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass', 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedChildClass', 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass', 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleChildClass', - ), - 'taxi' => array( + ], + 'taxi' => [ 'Doctrine\Tests\Models\Taxi\PaidRide', 'Doctrine\Tests\Models\Taxi\Ride', 'Doctrine\Tests\Models\Taxi\Car', 'Doctrine\Tests\Models\Taxi\Driver', - ), - 'cache' => array( + ], + 'cache' => [ 'Doctrine\Tests\Models\Cache\Country', 'Doctrine\Tests\Models\Cache\State', 'Doctrine\Tests\Models\Cache\City', @@ -205,102 +205,102 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\Cache\AttractionInfo', 'Doctrine\Tests\Models\Cache\AttractionContactInfo', 'Doctrine\Tests\Models\Cache\AttractionLocationInfo' - ), - 'tweet' => array( + ], + 'tweet' => [ 'Doctrine\Tests\Models\Tweet\User', 'Doctrine\Tests\Models\Tweet\Tweet', 'Doctrine\Tests\Models\Tweet\UserList', - ), - 'ddc2504' => array( + ], + 'ddc2504' => [ 'Doctrine\Tests\Models\DDC2504\DDC2504RootClass', 'Doctrine\Tests\Models\DDC2504\DDC2504ChildClass', 'Doctrine\Tests\Models\DDC2504\DDC2504OtherClass', - ), - 'ddc3346' => array( + ], + 'ddc3346' => [ 'Doctrine\Tests\Models\DDC3346\DDC3346Author', 'Doctrine\Tests\Models\DDC3346\DDC3346Article', - ), - 'quote' => array( + ], + 'quote' => [ 'Doctrine\Tests\Models\Quote\Address', 'Doctrine\Tests\Models\Quote\Group', 'Doctrine\Tests\Models\Quote\NumericEntity', 'Doctrine\Tests\Models\Quote\Phone', 'Doctrine\Tests\Models\Quote\User' - ), - 'vct_onetoone' => array( + ], + 'vct_onetoone' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity' - ), - 'vct_onetoone_compositeid' => array( + ], + 'vct_onetoone_compositeid' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity' - ), - 'vct_onetoone_compositeid_foreignkey' => array( + ], + 'vct_onetoone_compositeid_foreignkey' => [ 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity' - ), - 'vct_onetomany' => array( + ], + 'vct_onetomany' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity' - ), - 'vct_onetomany_compositeid' => array( + ], + 'vct_onetomany_compositeid' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity' - ), - 'vct_onetomany_compositeid_foreignkey' => array( + ], + 'vct_onetomany_compositeid_foreignkey' => [ 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity' - ), - 'vct_onetomany_extralazy' => array( + ], + 'vct_onetomany_extralazy' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity' - ), - 'vct_manytomany' => array( + ], + 'vct_manytomany' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity' - ), - 'vct_manytomany_compositeid' => array( + ], + 'vct_manytomany_compositeid' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity' - ), - 'vct_manytomany_compositeid_foreignkey' => array( + ], + 'vct_manytomany_compositeid_foreignkey' => [ 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity' - ), - 'vct_manytomany_extralazy' => array( + ], + 'vct_manytomany_extralazy' => [ 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity' - ), - 'geonames' => array( + ], + 'geonames' => [ 'Doctrine\Tests\Models\GeoNames\Country', 'Doctrine\Tests\Models\GeoNames\Admin1', 'Doctrine\Tests\Models\GeoNames\Admin1AlternateName', 'Doctrine\Tests\Models\GeoNames\City' - ), - 'custom_id_object_type' => array( + ], + 'custom_id_object_type' => [ 'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeParent', 'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeChild', - ), - 'pagination' => array( + ], + 'pagination' => [ 'Doctrine\Tests\Models\Pagination\Company', 'Doctrine\Tests\Models\Pagination\Logo', 'Doctrine\Tests\Models\Pagination\Department', 'Doctrine\Tests\Models\Pagination\User', 'Doctrine\Tests\Models\Pagination\User1', - ), - 'versioned_many_to_one' => array( + ], + 'versioned_many_to_one' => [ 'Doctrine\Tests\Models\VersionedManyToOne\Category', 'Doctrine\Tests\Models\VersionedManyToOne\Article', - ), - 'issue5989' => array( + ], + 'issue5989' => [ 'Doctrine\Tests\Models\Issue5989\Issue5989Person', 'Doctrine\Tests\Models\Issue5989\Issue5989Employee', 'Doctrine\Tests\Models\Issue5989\Issue5989Manager', - ), - ); + ], + ]; /** * @param string $setName @@ -590,7 +590,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase throw new \RuntimeException("EntityManager not set, you have to call parent::setUp() before invoking this method."); } - $classes = array(); + $classes = []; foreach ($classNames as $className) { if ( ! isset(static::$_entityTablesCreated[$className])) { static::$_entityTablesCreated[$className] = true; @@ -624,7 +624,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase } if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { - if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), array("mysql", "postgresql"))) { + if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) { static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/'); } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") { static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual'); @@ -636,7 +636,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $this->_schemaTool = new SchemaTool($this->_em); } - $classes = array(); + $classes = []; foreach ($this->_usedModelSets as $setName => $bool) { if ( ! isset(static::$_tablesCreated[$setName])/* || $forceCreateTables*/) { @@ -712,10 +712,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $this->isSecondLevelCacheEnabled = true; } - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array( + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver( + [ realpath(__DIR__ . '/Models/Cache'), realpath(__DIR__ . '/Models/GeoNames') - ), true)); + ], true)); $conn = static::$_sharedConn; $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack); @@ -724,7 +725,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $evm = $conn->getEventManager(); foreach ($evm->getListeners() AS $event => $listeners) { foreach ($listeners AS $listener) { - $evm->removeEventListener(array($event), $listener); + $evm->removeEventListener([$event], $listener); } } @@ -740,7 +741,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase } if (isset($GLOBALS['debug_uow_listener'])) { - $evm->addEventListener(array('onFlush'), new DebugUnitOfWorkListener()); + $evm->addEventListener(['onFlush'], new DebugUnitOfWorkListener()); } return EntityManager::create($conn, $config); @@ -763,7 +764,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $queries = ""; $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true); foreach ($last25queries as $i => $query) { - $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: array()); + $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: [] + ); $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL; } diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 200f53450..9d6e9b5ac 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -62,7 +62,7 @@ abstract class OrmTestCase extends DoctrineTestCase * * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver */ - protected function createAnnotationDriver($paths = array(), $alias = null) + protected function createAnnotationDriver($paths = [], $alias = null) { if (version_compare(Version::VERSION, '3.0.0', '>=')) { $reader = new Annotations\CachedReader(new Annotations\AnnotationReader(), new ArrayCache()); @@ -125,13 +125,14 @@ abstract class OrmTestCase extends DoctrineTestCase $config = new Configuration(); $config->setMetadataCacheImpl($metadataCache); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true)); $config->setQueryCacheImpl(self::getSharedQueryCacheImpl()); $config->setProxyDir(__DIR__ . '/Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array( + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver( + [ realpath(__DIR__ . '/Models/Cache') - ), true)); + ], true)); if ($this->isSecondLevelCacheEnabled) { @@ -147,12 +148,12 @@ abstract class OrmTestCase extends DoctrineTestCase } if ($conn === null) { - $conn = array( + $conn = [ 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock', 'wrapperClass' => 'Doctrine\Tests\Mocks\ConnectionMock', 'user' => 'john', 'password' => 'wayne' - ); + ]; } if (is_array($conn)) { diff --git a/tests/Doctrine/Tests/TestUtil.php b/tests/Doctrine/Tests/TestUtil.php index 8a830f724..812961c92 100644 --- a/tests/Doctrine/Tests/TestUtil.php +++ b/tests/Doctrine/Tests/TestUtil.php @@ -125,10 +125,10 @@ class TestUtil private static function getFallbackConnectionParams() { - $params = array( + $params = [ 'driver' => 'pdo_sqlite', 'memory' => true - ); + ]; if (isset($GLOBALS['db_path'])) { $params['path'] = $GLOBALS['db_path']; @@ -151,14 +151,14 @@ class TestUtil private static function getParamsForTemporaryConnection() { - $connectionParams = array( + $connectionParams = [ 'driver' => $GLOBALS['tmpdb_type'], 'user' => $GLOBALS['tmpdb_username'], 'password' => $GLOBALS['tmpdb_password'], 'host' => $GLOBALS['tmpdb_host'], 'dbname' => null, 'port' => $GLOBALS['tmpdb_port'] - ); + ]; if (isset($GLOBALS['tmpdb_name'])) { $connectionParams['dbname'] = $GLOBALS['tmpdb_name']; @@ -177,14 +177,14 @@ class TestUtil private static function getParamsForMainConnection() { - $connectionParams = array( + $connectionParams = [ 'driver' => $GLOBALS['db_type'], 'user' => $GLOBALS['db_username'], 'password' => $GLOBALS['db_password'], 'host' => $GLOBALS['db_host'], 'dbname' => $GLOBALS['db_name'], 'port' => $GLOBALS['db_port'] - ); + ]; if (isset($GLOBALS['db_server'])) { $connectionParams['server'] = $GLOBALS['db_server']; From c609072ce1f82bc30c437a24fbfe19a3f912352a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 7 Dec 2016 23:34:14 +0100 Subject: [PATCH 3/8] Use short-array syntax on "bin" directory --- bin/doctrine.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/doctrine.php b/bin/doctrine.php index 81e016686..81d4e7bf2 100644 --- a/bin/doctrine.php +++ b/bin/doctrine.php @@ -20,8 +20,10 @@ use Symfony\Component\Console\Helper\HelperSet; use Doctrine\ORM\Tools\Console\ConsoleRunner; -$autoloadFiles = array(__DIR__ . '/../vendor/autoload.php', - __DIR__ . '/../../../autoload.php'); +$autoloadFiles = [ + __DIR__ . '/../vendor/autoload.php', + __DIR__ . '/../../../autoload.php' +]; foreach ($autoloadFiles as $autoloadFile) { if (file_exists($autoloadFile)) { @@ -30,7 +32,7 @@ foreach ($autoloadFiles as $autoloadFile) { } } -$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'); +$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config']; $configFile = null; foreach ($directories as $directory) { @@ -51,7 +53,7 @@ if ( ! is_readable($configFile)) { exit(1); } -$commands = array(); +$commands = []; $helperSet = require $configFile; From 234989d0693174da9f760d50b5c11ac30eee6fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 8 Dec 2016 00:31:12 +0100 Subject: [PATCH 4/8] Use short-array syntax on "lib" directory --- lib/Doctrine/ORM/AbstractQuery.php | 8 +- lib/Doctrine/ORM/Cache/DefaultCache.php | 4 +- .../ORM/Cache/DefaultCacheFactory.php | 6 +- .../ORM/Cache/DefaultCollectionHydrator.php | 6 +- .../ORM/Cache/DefaultEntityHydrator.php | 4 +- lib/Doctrine/ORM/Cache/DefaultQueryCache.php | 31 ++-- .../ORM/Cache/Logging/CacheLoggerChain.php | 2 +- .../Cache/Logging/StatisticsCacheLogger.php | 12 +- .../AbstractCollectionPersister.php | 2 +- ...rictReadWriteCachedCollectionPersister.php | 8 +- .../ReadWriteCachedCollectionPersister.php | 12 +- .../Entity/AbstractEntityPersister.php | 16 +- ...onStrictReadWriteCachedEntityPersister.php | 4 +- .../Entity/ReadWriteCachedEntityPersister.php | 12 +- lib/Doctrine/ORM/Cache/QueryCache.php | 4 +- .../Cache/Region/DefaultMultiGetRegion.php | 4 +- .../ORM/Cache/Region/DefaultRegion.php | 2 +- .../ORM/Cache/RegionsConfiguration.php | 4 +- lib/Doctrine/ORM/Configuration.php | 8 +- lib/Doctrine/ORM/EntityManager.php | 16 +- lib/Doctrine/ORM/EntityNotFoundException.php | 2 +- lib/Doctrine/ORM/EntityRepository.php | 4 +- lib/Doctrine/ORM/Id/AssignedGenerator.php | 2 +- lib/Doctrine/ORM/Id/SequenceGenerator.php | 6 +- lib/Doctrine/ORM/Id/TableGenerator.php | 2 +- .../ORM/Internal/CommitOrderCalculator.php | 12 +- .../Internal/Hydration/AbstractHydrator.php | 42 ++--- .../ORM/Internal/Hydration/ArrayHydrator.php | 22 +-- .../ORM/Internal/Hydration/ObjectHydrator.php | 24 +-- .../ORM/Internal/Hydration/ScalarHydrator.php | 2 +- .../Hydration/SimpleObjectHydrator.php | 4 +- .../ORM/Internal/HydrationCompleteHandler.php | 6 +- .../Mapping/Builder/AssociationBuilder.php | 6 +- .../Mapping/Builder/ClassMetadataBuilder.php | 70 ++++---- .../Mapping/Builder/EntityListenerBuilder.php | 6 +- .../ORM/Mapping/Builder/FieldBuilder.php | 4 +- .../Builder/ManyToManyAssociationBuilder.php | 8 +- .../ORM/Mapping/ClassMetadataFactory.php | 80 +++++---- .../ORM/Mapping/ClassMetadataInfo.php | 102 +++++------ lib/Doctrine/ORM/Mapping/Column.php | 2 +- .../Mapping/DefaultEntityListenerResolver.php | 6 +- .../ORM/Mapping/DefaultQuoteStrategy.php | 2 +- .../ORM/Mapping/Driver/AnnotationDriver.php | 163 +++++++++-------- .../ORM/Mapping/Driver/DatabaseDriver.php | 58 +++--- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 169 ++++++++++-------- .../ORM/Mapping/Driver/YamlDriver.php | 132 +++++++------- lib/Doctrine/ORM/Mapping/EntityListeners.php | 4 +- lib/Doctrine/ORM/Mapping/EntityResult.php | 2 +- lib/Doctrine/ORM/Mapping/JoinTable.php | 4 +- .../ORM/Mapping/NamedNativeQueries.php | 4 +- .../ORM/Mapping/SqlResultSetMapping.php | 8 +- .../ORM/Mapping/SqlResultSetMappings.php | 4 +- lib/Doctrine/ORM/Mapping/Table.php | 2 +- lib/Doctrine/ORM/NativeQuery.php | 4 +- lib/Doctrine/ORM/PersistentCollection.php | 8 +- .../Collection/ManyToManyPersister.php | 64 +++---- .../Collection/OneToManyPersister.php | 12 +- .../Entity/BasicEntityPersister.php | 146 +++++++-------- .../Entity/CachedPersisterContext.php | 2 +- .../ORM/Persisters/Entity/EntityPersister.php | 10 +- .../Entity/JoinedSubclassPersister.php | 36 ++-- .../Entity/SingleTablePersister.php | 2 +- .../ORM/Persisters/SqlExpressionVisitor.php | 4 +- .../ORM/Persisters/SqlValueVisitor.php | 8 +- lib/Doctrine/ORM/Query.php | 14 +- .../ORM/Query/AST/CoalesceExpression.php | 4 +- .../ORM/Query/AST/ConditionalExpression.php | 2 +- .../ORM/Query/AST/ConditionalTerm.php | 2 +- lib/Doctrine/ORM/Query/AST/FromClause.php | 4 +- .../Query/AST/Functions/ConcatFunction.php | 6 +- .../ORM/Query/AST/GeneralCaseExpression.php | 4 +- lib/Doctrine/ORM/Query/AST/GroupByClause.php | 2 +- .../AST/IdentificationVariableDeclaration.php | 2 +- lib/Doctrine/ORM/Query/AST/InExpression.php | 2 +- lib/Doctrine/ORM/Query/AST/OrderByClause.php | 2 +- lib/Doctrine/ORM/Query/AST/SelectClause.php | 2 +- .../Query/AST/SimpleArithmeticExpression.php | 2 +- .../ORM/Query/AST/SimpleCaseExpression.php | 4 +- .../ORM/Query/AST/SubselectFromClause.php | 2 +- lib/Doctrine/ORM/Query/AST/UpdateClause.php | 2 +- .../Query/Exec/MultiTableDeleteExecutor.php | 10 +- .../Query/Exec/MultiTableUpdateExecutor.php | 16 +- lib/Doctrine/ORM/Query/Expr.php | 30 ++-- lib/Doctrine/ORM/Query/Expr/Andx.php | 4 +- lib/Doctrine/ORM/Query/Expr/Base.php | 8 +- lib/Doctrine/ORM/Query/Expr/Composite.php | 2 +- lib/Doctrine/ORM/Query/Expr/OrderBy.php | 4 +- lib/Doctrine/ORM/Query/Expr/Orx.php | 4 +- lib/Doctrine/ORM/Query/Expr/Select.php | 4 +- lib/Doctrine/ORM/Query/Filter/SQLFilter.php | 4 +- lib/Doctrine/ORM/Query/FilterCollection.php | 8 +- lib/Doctrine/ORM/Query/Lexer.php | 6 +- lib/Doctrine/ORM/Query/Parser.php | 128 ++++++------- lib/Doctrine/ORM/Query/ParserResult.php | 2 +- .../ORM/Query/QueryExpressionVisitor.php | 20 +-- lib/Doctrine/ORM/Query/ResultSetMapping.php | 30 ++-- .../ORM/Query/ResultSetMappingBuilder.php | 12 +- lib/Doctrine/ORM/Query/SqlWalker.php | 100 +++++------ lib/Doctrine/ORM/Query/TreeWalkerAdapter.php | 2 +- lib/Doctrine/ORM/Query/TreeWalkerChain.php | 2 +- .../ORM/Query/TreeWalkerChainIterator.php | 2 +- lib/Doctrine/ORM/QueryBuilder.php | 62 +++---- .../Repository/DefaultRepositoryFactory.php | 2 +- .../Tools/AttachEntityListenersListener.php | 6 +- .../Command/ClearCache/MetadataCommand.php | 14 +- .../Command/ClearCache/QueryCommand.php | 16 +- .../Command/ClearCache/ResultCommand.php | 16 +- .../Command/ConvertDoctrine1SchemaCommand.php | 56 +++--- .../Console/Command/ConvertMappingCommand.php | 68 +++---- .../EnsureProductionSettingsCommand.php | 14 +- .../Command/GenerateEntitiesCommand.php | 78 ++++---- .../Command/GenerateProxiesCommand.php | 24 +-- .../Command/GenerateRepositoriesCommand.php | 22 +-- .../Command/MappingDescribeCommand.php | 16 +- .../Tools/Console/Command/RunDqlCommand.php | 52 +++--- .../Command/SchemaTool/CreateCommand.php | 14 +- .../Command/SchemaTool/DropCommand.php | 30 ++-- .../Command/SchemaTool/UpdateCommand.php | 30 ++-- .../ORM/Tools/Console/ConsoleRunner.php | 60 ++++--- .../ORM/Tools/Console/MetadataFilter.php | 2 +- .../ORM/Tools/ConvertDoctrine1Schema.php | 38 ++-- lib/Doctrine/ORM/Tools/EntityGenerator.php | 130 +++++++------- .../ORM/Tools/EntityRepositoryGenerator.php | 14 +- .../Tools/Export/ClassMetadataExporter.php | 4 +- .../Tools/Export/Driver/AbstractExporter.php | 2 +- .../ORM/Tools/Export/Driver/PhpExporter.php | 22 +-- .../ORM/Tools/Export/Driver/XmlExporter.php | 14 +- .../ORM/Tools/Export/Driver/YamlExporter.php | 30 ++-- .../Tools/Pagination/CountOutputWalker.php | 2 +- .../ORM/Tools/Pagination/CountWalker.php | 8 +- .../Tools/Pagination/LimitSubqueryWalker.php | 20 +-- .../ORM/Tools/Pagination/Paginator.php | 2 +- .../ORM/Tools/Pagination/WhereInWalker.php | 42 +++-- .../ORM/Tools/ResolveTargetEntityListener.php | 6 +- lib/Doctrine/ORM/Tools/SchemaTool.php | 58 +++--- lib/Doctrine/ORM/Tools/SchemaValidator.php | 6 +- lib/Doctrine/ORM/UnitOfWork.php | 108 +++++------ .../ORM/Utility/IdentifierFlattener.php | 4 +- lib/Doctrine/ORM/Utility/PersisterHelper.php | 6 +- 139 files changed, 1532 insertions(+), 1445 deletions(-) diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php index 5f4248b5f..8d901d514 100644 --- a/lib/Doctrine/ORM/AbstractQuery.php +++ b/lib/Doctrine/ORM/AbstractQuery.php @@ -96,7 +96,7 @@ abstract class AbstractQuery * * @var array */ - protected $_hints = array(); + protected $_hints = []; /** * The hydration mode. @@ -955,7 +955,7 @@ abstract class AbstractQuery } if ( ! $result) { - $result = array(); + $result = []; } $setCacheEntry = function($data) use ($cache, $result, $cacheKey, $realCacheKey, $queryCacheProfile) { @@ -1049,7 +1049,7 @@ abstract class AbstractQuery */ protected function getHydrationCacheId() { - $parameters = array(); + $parameters = []; foreach ($this->getParameters() as $parameter) { $parameters[$parameter->getName()] = $this->processParameterValue($parameter->getValue()); @@ -1111,7 +1111,7 @@ abstract class AbstractQuery { $this->parameters = new ArrayCollection(); - $this->_hints = array(); + $this->_hints = []; $this->_hints = $this->_em->getConfiguration()->getDefaultQueryHints(); } diff --git a/lib/Doctrine/ORM/Cache/DefaultCache.php b/lib/Doctrine/ORM/Cache/DefaultCache.php index 2557da4c1..80fbd8143 100644 --- a/lib/Doctrine/ORM/Cache/DefaultCache.php +++ b/lib/Doctrine/ORM/Cache/DefaultCache.php @@ -53,7 +53,7 @@ class DefaultCache implements Cache /** * @var \Doctrine\ORM\Cache\QueryCache[] */ - private $queryCaches = array(); + private $queryCaches = []; /** * @var \Doctrine\ORM\Cache\QueryCache @@ -336,7 +336,7 @@ class DefaultCache implements Cache } } - return array($metadata->identifier[0] => $identifier); + return [$metadata->identifier[0] => $identifier]; } } diff --git a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php index 98ece43c7..151009632 100644 --- a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php +++ b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php @@ -64,7 +64,7 @@ class DefaultCacheFactory implements CacheFactory /** * @var \Doctrine\ORM\Cache\Region[] */ - private $regions = array(); + private $regions = []; /** * @var string|null @@ -167,10 +167,10 @@ class DefaultCacheFactory implements CacheFactory return new DefaultQueryCache( $em, $this->getRegion( - array( + [ 'region' => $regionName ?: Cache::DEFAULT_QUERY_REGION_NAME, 'usage' => ClassMetadata::CACHE_USAGE_NONSTRICT_READ_WRITE - ) + ] ) ); } diff --git a/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php b/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php index f6583cbd2..7ff11e4ad 100644 --- a/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php +++ b/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php @@ -46,7 +46,7 @@ class DefaultCollectionHydrator implements CollectionHydrator /** * @var array */ - private static $hints = array(Query::HINT_CACHE_ENABLED => true); + private static $hints = [Query::HINT_CACHE_ENABLED => true]; /** * @param \Doctrine\ORM\EntityManagerInterface $em The entity manager. @@ -62,7 +62,7 @@ class DefaultCollectionHydrator implements CollectionHydrator */ public function buildCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key, $collection) { - $data = array(); + $data = []; foreach ($collection as $index => $entity) { $data[$index] = new EntityCacheKey($metadata->name, $this->uow->getEntityIdentifier($entity)); @@ -79,7 +79,7 @@ class DefaultCollectionHydrator implements CollectionHydrator /* @var $targetPersister \Doctrine\ORM\Cache\Persister\CachedPersister */ $targetPersister = $this->uow->getEntityPersister($assoc['targetEntity']); $targetRegion = $targetPersister->getCacheRegion(); - $list = array(); + $list = []; $entityEntries = $targetRegion->getMultiple($entry); diff --git a/lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php b/lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php index 9ecb18e92..99a98bddc 100644 --- a/lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php +++ b/lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php @@ -55,7 +55,7 @@ class DefaultEntityHydrator implements EntityHydrator /** * @var array */ - private static $hints = array(Query::HINT_CACHE_ENABLED => true); + private static $hints = [Query::HINT_CACHE_ENABLED => true]; /** * @param \Doctrine\ORM\EntityManagerInterface $em The entity manager. @@ -138,7 +138,7 @@ class DefaultEntityHydrator implements EntityHydrator $data[reset($assoc['joinColumnFieldNames'])] = $targetId; $targetEntity = $this->em->getClassMetadata($assoc['targetEntity']); - $targetId = array($targetEntity->identifier[0] => $targetId); + $targetId = [$targetEntity->identifier[0] => $targetId]; } $data[$name] = new AssociationCacheEntry($assoc['targetEntity'], $targetId); diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php index dabf1721e..88e594213 100644 --- a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php +++ b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php @@ -66,7 +66,7 @@ class DefaultQueryCache implements QueryCache /** * @var array */ - private static $hints = array(Query::HINT_CACHE_ENABLED => true); + private static $hints = [Query::HINT_CACHE_ENABLED => true]; /** * @param \Doctrine\ORM\EntityManagerInterface $em The entity manager. @@ -86,7 +86,7 @@ class DefaultQueryCache implements QueryCache /** * {@inheritdoc} */ - public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = array()) + public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = []) { if ( ! ($key->cacheMode & Cache::MODE_GET)) { return null; @@ -104,7 +104,7 @@ class DefaultQueryCache implements QueryCache return null; } - $result = array(); + $result = []; $entityName = reset($rsm->aliasMap); $hasRelation = ( ! empty($rsm->relationMap)); $persister = $this->uow->getEntityPersister($entityName); @@ -209,7 +209,7 @@ class DefaultQueryCache implements QueryCache /** * {@inheritdoc} */ - public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = array()) + public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = []) { if ($rsm->scalarMappings) { throw new CacheException("Second level cache does not support scalar results."); @@ -231,7 +231,7 @@ class DefaultQueryCache implements QueryCache return false; } - $data = array(); + $data = []; $entityName = reset($rsm->aliasMap); $rootAlias = key($rsm->aliasMap); $hasRelation = ( ! empty($rsm->relationMap)); @@ -247,7 +247,7 @@ class DefaultQueryCache implements QueryCache $identifier = $this->uow->getEntityIdentifier($entity); $entityKey = new EntityCacheKey($entityName, $identifier); $data[$index]['identifier'] = $identifier; - $data[$index]['associations'] = array(); + $data[$index]['associations'] = []; if (($key->cacheMode & Cache::MODE_REFRESH) || ! $region->contains($entityKey)) { // Cancel put result if entity put fail @@ -332,15 +332,15 @@ class DefaultQueryCache implements QueryCache } } - return array( + return [ 'targetEntity' => $assocMetadata->rootEntityName, 'identifier' => $assocIdentifier, 'type' => $assoc['type'] - ); + ]; } // Handle *-to-many associations - $list = array(); + $list = []; foreach ($assocValue as $assocItemIndex => $assocItem) { $assocIdentifier = $this->uow->getEntityIdentifier($assocItem); @@ -356,11 +356,11 @@ class DefaultQueryCache implements QueryCache $list[$assocItemIndex] = $assocIdentifier; } - return array( + return [ 'targetEntity' => $assocMetadata->rootEntityName, 'type' => $assoc['type'], 'list' => $list, - ); + ]; } /** @@ -372,7 +372,7 @@ class DefaultQueryCache implements QueryCache */ private function getAssociationValue(ResultSetMapping $rsm, $assocAlias, $entity) { - $path = array(); + $path = []; $alias = $assocAlias; while (isset($rsm->parentAliasMap[$alias])) { @@ -380,10 +380,11 @@ class DefaultQueryCache implements QueryCache $field = $rsm->relationMap[$alias]; $class = $rsm->aliasMap[$parent]; - array_unshift($path, array( + array_unshift($path, [ 'field' => $field, 'class' => $class - )); + ] + ); $alias = $parent; } @@ -417,7 +418,7 @@ class DefaultQueryCache implements QueryCache return $this->getAssociationPathValue($value, $path); } - $values = array(); + $values = []; foreach ($value as $item) { $values[] = $this->getAssociationPathValue($item, $path); diff --git a/lib/Doctrine/ORM/Cache/Logging/CacheLoggerChain.php b/lib/Doctrine/ORM/Cache/Logging/CacheLoggerChain.php index 694b35ca5..28a8125c9 100644 --- a/lib/Doctrine/ORM/Cache/Logging/CacheLoggerChain.php +++ b/lib/Doctrine/ORM/Cache/Logging/CacheLoggerChain.php @@ -35,7 +35,7 @@ class CacheLoggerChain implements CacheLogger /** * @var array<\Doctrine\ORM\Cache\Logging\CacheLogger> */ - private $loggers = array(); + private $loggers = []; /** * @param string $name diff --git a/lib/Doctrine/ORM/Cache/Logging/StatisticsCacheLogger.php b/lib/Doctrine/ORM/Cache/Logging/StatisticsCacheLogger.php index 2fbba40be..122e3534a 100644 --- a/lib/Doctrine/ORM/Cache/Logging/StatisticsCacheLogger.php +++ b/lib/Doctrine/ORM/Cache/Logging/StatisticsCacheLogger.php @@ -35,17 +35,17 @@ class StatisticsCacheLogger implements CacheLogger /** * @var array */ - private $cacheMissCountMap = array(); + private $cacheMissCountMap = []; /** * @var array */ - private $cacheHitCountMap = array(); + private $cacheHitCountMap = []; /** * @var array */ - private $cachePutCountMap = array(); + private $cachePutCountMap = []; /** * {@inheritdoc} @@ -214,9 +214,9 @@ class StatisticsCacheLogger implements CacheLogger */ public function clearStats() { - $this->cachePutCountMap = array(); - $this->cacheHitCountMap = array(); - $this->cacheMissCountMap = array(); + $this->cachePutCountMap = []; + $this->cacheHitCountMap = []; + $this->cacheMissCountMap = []; } /** diff --git a/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php b/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php index abaef17a6..7a10d17d9 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php @@ -70,7 +70,7 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister /** * @var array */ - protected $queuedCache = array(); + protected $queuedCache = []; /** * @var \Doctrine\ORM\Cache\Region diff --git a/lib/Doctrine/ORM/Cache/Persister/Collection/NonStrictReadWriteCachedCollectionPersister.php b/lib/Doctrine/ORM/Cache/Persister/Collection/NonStrictReadWriteCachedCollectionPersister.php index 86e5c8f9f..fbd46f6ea 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Collection/NonStrictReadWriteCachedCollectionPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Collection/NonStrictReadWriteCachedCollectionPersister.php @@ -46,7 +46,7 @@ class NonStrictReadWriteCachedCollectionPersister extends AbstractCollectionPers } } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -54,7 +54,7 @@ class NonStrictReadWriteCachedCollectionPersister extends AbstractCollectionPers */ public function afterTransactionRolledBack() { - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -96,9 +96,9 @@ class NonStrictReadWriteCachedCollectionPersister extends AbstractCollectionPers $this->persister->update($collection); - $this->queuedCache['update'][spl_object_hash($collection)] = array( + $this->queuedCache['update'][spl_object_hash($collection)] = [ 'key' => $key, 'list' => $collection - ); + ]; } } diff --git a/lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php b/lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php index a92ed20d3..74bb04445 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersister.php @@ -60,7 +60,7 @@ class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister } } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -80,7 +80,7 @@ class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister } } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -98,10 +98,10 @@ class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister return; } - $this->queuedCache['delete'][spl_object_hash($collection)] = array( + $this->queuedCache['delete'][spl_object_hash($collection)] = [ 'key' => $key, 'lock' => $lock - ); + ]; } /** @@ -126,9 +126,9 @@ class ReadWriteCachedCollectionPersister extends AbstractCollectionPersister return; } - $this->queuedCache['update'][spl_object_hash($collection)] = array( + $this->queuedCache['update'][spl_object_hash($collection)] = [ 'key' => $key, 'lock' => $lock - ); + ]; } } diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php index c1e2d50ad..a6e2b3480 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php @@ -64,7 +64,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * @var array */ - protected $queuedCache = array(); + protected $queuedCache = []; /** * @var \Doctrine\ORM\Cache\Region @@ -160,7 +160,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritDoc} */ - public function getCountSQL($criteria = array()) + public function getCountSQL($criteria = []) { return $this->persister->getCountSQL($criteria); } @@ -249,7 +249,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister private function storeJoinedAssociations($entity) { if ($this->joinedAssociations === null) { - $associations = array(); + $associations = []; foreach ($this->class->associationMappings as $name => $assoc) { if (isset($assoc['cache']) && @@ -360,7 +360,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = null, $limit = null, array $orderBy = null) + public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = null, $limit = null, array $orderBy = null) { if ($entity !== null || $assoc !== null || ! empty($hints) || $lockMode !== null) { return $this->persister->load($criteria, $entity, $assoc, $hints, $lockMode, $limit, $orderBy); @@ -386,7 +386,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister return null; } - $cached = $queryCache->put($queryKey, $rsm, array($result)); + $cached = $queryCache->put($queryKey, $rsm, [$result]); if ($this->cacheLogger) { if ($result) { @@ -404,7 +404,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} */ - public function loadAll(array $criteria = array(), array $orderBy = null, $limit = null, $offset = null) + public function loadAll(array $criteria = [], array $orderBy = null, $limit = null, $offset = null) { $query = $this->persister->getSelectSQL($criteria, null, null, $limit, $offset, $orderBy); $hash = $this->getHash($query, $criteria, null, null, null); @@ -494,7 +494,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritDoc} */ - public function count($criteria = array()) + public function count($criteria = []) { return $this->persister->count($criteria); } @@ -612,7 +612,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} */ - public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = array()) + public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = []) { return $this->persister->loadOneToOneEntity($assoc, $sourceEntity, $identifier); } diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php index 54c814a9a..a2844673b 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php @@ -62,7 +62,7 @@ class NonStrictReadWriteCachedEntityPersister extends AbstractEntityPersister $this->timestampRegion->update($this->timestampKey); } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -70,7 +70,7 @@ class NonStrictReadWriteCachedEntityPersister extends AbstractEntityPersister */ public function afterTransactionRolledBack() { - $this->queuedCache = array(); + $this->queuedCache = []; } /** diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php index 07cac510d..79a4c8c3d 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php @@ -73,7 +73,7 @@ class ReadWriteCachedEntityPersister extends AbstractEntityPersister $this->timestampRegion->update($this->timestampKey); } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -93,7 +93,7 @@ class ReadWriteCachedEntityPersister extends AbstractEntityPersister } } - $this->queuedCache = array(); + $this->queuedCache = []; } /** @@ -113,10 +113,10 @@ class ReadWriteCachedEntityPersister extends AbstractEntityPersister return $deleted; } - $this->queuedCache['delete'][] = array( + $this->queuedCache['delete'][] = [ 'lock' => $lock, 'key' => $key - ); + ]; return $deleted; } @@ -135,9 +135,9 @@ class ReadWriteCachedEntityPersister extends AbstractEntityPersister return; } - $this->queuedCache['update'][] = array( + $this->queuedCache['update'][] = [ 'lock' => $lock, 'key' => $key - ); + ]; } } diff --git a/lib/Doctrine/ORM/Cache/QueryCache.php b/lib/Doctrine/ORM/Cache/QueryCache.php index dd5ef3bf5..de2496253 100644 --- a/lib/Doctrine/ORM/Cache/QueryCache.php +++ b/lib/Doctrine/ORM/Cache/QueryCache.php @@ -44,7 +44,7 @@ interface QueryCache * * @return boolean */ - public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = array()); + public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = []); /** * @param \Doctrine\ORM\Cache\QueryCacheKey $key @@ -53,7 +53,7 @@ interface QueryCache * * @return array|null */ - public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = array()); + public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = []); /** * @return \Doctrine\ORM\Cache\Region diff --git a/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php b/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php index 7ecf73311..1df073c3e 100644 --- a/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php +++ b/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php @@ -56,7 +56,7 @@ class DefaultMultiGetRegion extends DefaultRegion */ public function getMultiple(CollectionCacheEntry $collection) { - $keysToRetrieve = array(); + $keysToRetrieve = []; foreach ($collection->identifiers as $index => $key) { $keysToRetrieve[$index] = $this->getCacheEntryKey($key); @@ -67,7 +67,7 @@ class DefaultMultiGetRegion extends DefaultRegion return null; } - $returnableItems = array(); + $returnableItems = []; foreach ($keysToRetrieve as $index => $key) { $returnableItems[$index] = $items[$key]; } diff --git a/lib/Doctrine/ORM/Cache/Region/DefaultRegion.php b/lib/Doctrine/ORM/Cache/Region/DefaultRegion.php index 3f214d0b0..be62a6fb9 100644 --- a/lib/Doctrine/ORM/Cache/Region/DefaultRegion.php +++ b/lib/Doctrine/ORM/Cache/Region/DefaultRegion.php @@ -102,7 +102,7 @@ class DefaultRegion implements Region */ public function getMultiple(CollectionCacheEntry $collection) { - $result = array(); + $result = []; foreach ($collection->identifiers as $key) { $entryKey = $this->getCacheEntryKey($key); diff --git a/lib/Doctrine/ORM/Cache/RegionsConfiguration.php b/lib/Doctrine/ORM/Cache/RegionsConfiguration.php index 0d060636c..d79c5b1af 100644 --- a/lib/Doctrine/ORM/Cache/RegionsConfiguration.php +++ b/lib/Doctrine/ORM/Cache/RegionsConfiguration.php @@ -31,12 +31,12 @@ class RegionsConfiguration /** * @var array */ - private $lifetimes = array(); + private $lifetimes = []; /** * @var array */ - private $lockLifetimes = array(); + private $lockLifetimes = []; /** * @var integer diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 872050cb0..fa1d1dde7 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -149,7 +149,7 @@ class Configuration extends \Doctrine\DBAL\Configuration * * @return AnnotationDriver */ - public function newDefaultAnnotationDriver($paths = array(), $useSimpleAnnotationReader = true) + public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationReader = true) { AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php'); @@ -349,7 +349,7 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function addNamedNativeQuery($name, $sql, Query\ResultSetMapping $rsm) { - $this->_attributes['namedNativeQueries'][$name] = array($sql, $rsm); + $this->_attributes['namedNativeQueries'][$name] = [$sql, $rsm]; } /** @@ -590,7 +590,7 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function setCustomHydrationModes($modes) { - $this->_attributes['customHydrationModes'] = array(); + $this->_attributes['customHydrationModes'] = []; foreach ($modes as $modeName => $hydrator) { $this->addCustomHydrationMode($modeName, $hydrator); @@ -881,7 +881,7 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function getDefaultQueryHints() { - return isset($this->_attributes['defaultQueryHints']) ? $this->_attributes['defaultQueryHints'] : array(); + return isset($this->_attributes['defaultQueryHints']) ? $this->_attributes['defaultQueryHints'] : []; } /** diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index b61a2557b..53573c25c 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -386,7 +386,7 @@ use Doctrine\Common\Util\ClassUtils; throw ORMInvalidArgumentException::invalidCompositeIdentifier(); } - $id = array($class->identifier[0] => $id); + $id = [$class->identifier[0] => $id]; } foreach ($id as $i => $value) { @@ -399,7 +399,7 @@ use Doctrine\Common\Util\ClassUtils; } } - $sortedId = array(); + $sortedId = []; foreach ($class->identifier as $identifier) { if ( ! isset($id[$identifier])) { @@ -458,7 +458,7 @@ use Doctrine\Common\Util\ClassUtils; throw TransactionRequiredException::transactionRequired(); } - return $persister->load($sortedId, null, null, array(), $lockMode); + return $persister->load($sortedId, null, null, [], $lockMode); default: return $persister->loadById($sortedId); @@ -473,10 +473,10 @@ use Doctrine\Common\Util\ClassUtils; $class = $this->metadataFactory->getMetadataFor(ltrim($entityName, '\\')); if ( ! is_array($id)) { - $id = array($class->identifier[0] => $id); + $id = [$class->identifier[0] => $id]; } - $sortedId = array(); + $sortedId = []; foreach ($class->identifier as $identifier) { if ( ! isset($id[$identifier])) { @@ -502,7 +502,7 @@ use Doctrine\Common\Util\ClassUtils; $entity = $this->proxyFactory->getProxy($class->name, $sortedId); - $this->unitOfWork->registerManaged($entity, $sortedId, array()); + $this->unitOfWork->registerManaged($entity, $sortedId, []); return $entity; } @@ -520,14 +520,14 @@ use Doctrine\Common\Util\ClassUtils; } if ( ! is_array($identifier)) { - $identifier = array($class->identifier[0] => $identifier); + $identifier = [$class->identifier[0] => $identifier]; } $entity = $class->newInstance(); $class->setIdentifierValues($entity, $identifier); - $this->unitOfWork->registerManaged($entity, $identifier, array()); + $this->unitOfWork->registerManaged($entity, $identifier, []); $this->unitOfWork->markReadOnly($entity); return $entity; diff --git a/lib/Doctrine/ORM/EntityNotFoundException.php b/lib/Doctrine/ORM/EntityNotFoundException.php index afe2f2242..5b21e15c2 100644 --- a/lib/Doctrine/ORM/EntityNotFoundException.php +++ b/lib/Doctrine/ORM/EntityNotFoundException.php @@ -37,7 +37,7 @@ class EntityNotFoundException extends ORMException */ public static function fromClassNameAndIdentifier($className, array $id) { - $ids = array(); + $ids = []; foreach ($id as $key => $value) { $ids[] = $key . '(' . $value . ')'; diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php index 1934a18d0..6be570ba3 100644 --- a/lib/Doctrine/ORM/EntityRepository.php +++ b/lib/Doctrine/ORM/EntityRepository.php @@ -161,7 +161,7 @@ class EntityRepository implements ObjectRepository, Selectable */ public function findAll() { - return $this->findBy(array()); + return $this->findBy([]); } /** @@ -193,7 +193,7 @@ class EntityRepository implements ObjectRepository, Selectable { $persister = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName); - return $persister->load($criteria, null, null, array(), null, 1, $orderBy); + return $persister->load($criteria, null, null, [], null, 1, $orderBy); } /** diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php index 447dbd6d5..691eaee42 100644 --- a/lib/Doctrine/ORM/Id/AssignedGenerator.php +++ b/lib/Doctrine/ORM/Id/AssignedGenerator.php @@ -44,7 +44,7 @@ class AssignedGenerator extends AbstractIdGenerator { $class = $em->getClassMetadata(get_class($entity)); $idFields = $class->getIdentifierFieldNames(); - $identifier = array(); + $identifier = []; foreach ($idFields as $idField) { $value = $class->getFieldValue($entity, $idField); diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php index 1f3c9541b..a27edae90 100644 --- a/lib/Doctrine/ORM/Id/SequenceGenerator.php +++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php @@ -108,10 +108,12 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable */ public function serialize() { - return serialize(array( + return serialize( + [ 'allocationSize' => $this->_allocationSize, 'sequenceName' => $this->_sequenceName - )); + ] + ); } /** diff --git a/lib/Doctrine/ORM/Id/TableGenerator.php b/lib/Doctrine/ORM/Id/TableGenerator.php index abf3ab8ac..02385f511 100644 --- a/lib/Doctrine/ORM/Id/TableGenerator.php +++ b/lib/Doctrine/ORM/Id/TableGenerator.php @@ -92,7 +92,7 @@ class TableGenerator extends AbstractIdGenerator $this->_tableName, $this->_sequenceName, $this->_allocationSize ); - if ($conn->executeUpdate($updateSql, array(1 => $currentLevel, 2 => $currentLevel+1)) !== 1) { + if ($conn->executeUpdate($updateSql, [1 => $currentLevel, 2 => $currentLevel+1]) !== 1) { // no affected rows, concurrency issue, throw exception } } else { diff --git a/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php b/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php index e1331da47..067a8c577 100644 --- a/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php +++ b/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php @@ -54,14 +54,14 @@ class CommitOrderCalculator * * @var array */ - private $nodeList = array(); + private $nodeList = []; /** * Volatile variable holding calculated nodes during sorting process. * * @var array */ - private $sortedNodeList = array(); + private $sortedNodeList = []; /** * Checks for node (vertex) existence in graph. @@ -90,7 +90,7 @@ class CommitOrderCalculator $vertex->hash = $hash; $vertex->state = self::NOT_VISITED; $vertex->value = $node; - $vertex->dependencyList = array(); + $vertex->dependencyList = []; $this->nodeList[$hash] = $vertex; } @@ -136,8 +136,8 @@ class CommitOrderCalculator $sortedList = $this->sortedNodeList; - $this->nodeList = array(); - $this->sortedNodeList = array(); + $this->nodeList = []; + $this->sortedNodeList = []; return array_reverse($sortedList); } @@ -162,7 +162,7 @@ class CommitOrderCalculator break; case self::IN_PROGRESS: - if (isset($adjacentVertex->dependencyList[$vertex->hash]) && + if (isset($adjacentVertex->dependencyList[$vertex->hash]) && $adjacentVertex->dependencyList[$vertex->hash]->weight < $edge->weight) { $adjacentVertex->state = self::VISITED; diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php index ff142fc35..ee9385c81 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php @@ -69,14 +69,14 @@ abstract class AbstractHydrator * * @var array */ - protected $_metadataCache = array(); + protected $_metadataCache = []; /** * The cache used during row-by-row hydration. * * @var array */ - protected $_cache = array(); + protected $_cache = []; /** * The statement that provides the data to hydrate. @@ -113,7 +113,7 @@ abstract class AbstractHydrator * * @return IterableResult */ - public function iterate($stmt, $resultSetMapping, array $hints = array()) + public function iterate($stmt, $resultSetMapping, array $hints = []) { $this->_stmt = $stmt; $this->_rsm = $resultSetMapping; @@ -121,7 +121,7 @@ abstract class AbstractHydrator $evm = $this->_em->getEventManager(); - $evm->addEventListener(array(Events::onClear), $this); + $evm->addEventListener([Events::onClear], $this); $this->prepare(); @@ -137,7 +137,7 @@ abstract class AbstractHydrator * * @return array */ - public function hydrateAll($stmt, $resultSetMapping, array $hints = array()) + public function hydrateAll($stmt, $resultSetMapping, array $hints = []) { $this->_stmt = $stmt; $this->_rsm = $resultSetMapping; @@ -168,7 +168,7 @@ abstract class AbstractHydrator return false; } - $result = array(); + $result = []; $this->hydrateRowData($row, $result); @@ -209,8 +209,8 @@ abstract class AbstractHydrator $this->_stmt = null; $this->_rsm = null; - $this->_cache = array(); - $this->_metadataCache = array(); + $this->_cache = []; + $this->_metadataCache = []; } /** @@ -255,7 +255,7 @@ abstract class AbstractHydrator */ protected function gatherRowData(array $data, array &$id, array &$nonemptyComponents) { - $rowData = array('data' => array()); + $rowData = ['data' => []]; foreach ($data as $key => $value) { if (($cacheKeyInfo = $this->hydrateColumnInfo($key)) === null) { @@ -323,7 +323,7 @@ abstract class AbstractHydrator */ protected function gatherScalarRowData(&$data) { - $rowData = array(); + $rowData = []; foreach ($data as $key => $value) { if (($cacheKeyInfo = $this->hydrateColumnInfo($key)) === null) { @@ -369,18 +369,18 @@ abstract class AbstractHydrator $fieldName = $this->_rsm->fieldMappings[$key]; $fieldMapping = $classMetadata->fieldMappings[$fieldName]; - return $this->_cache[$key] = array( + return $this->_cache[$key] = [ 'isIdentifier' => in_array($fieldName, $classMetadata->identifier), 'fieldName' => $fieldName, 'type' => Type::getType($fieldMapping['type']), 'dqlAlias' => $this->_rsm->columnOwnerMap[$key], - ); + ]; case (isset($this->_rsm->newObjectMappings[$key])): // WARNING: A NEW object is also a scalar, so it must be declared before! $mapping = $this->_rsm->newObjectMappings[$key]; - return $this->_cache[$key] = array( + return $this->_cache[$key] = [ 'isScalar' => true, 'isNewObjectParameter' => true, 'fieldName' => $this->_rsm->scalarMappings[$key], @@ -388,14 +388,14 @@ abstract class AbstractHydrator 'argIndex' => $mapping['argIndex'], 'objIndex' => $mapping['objIndex'], 'class' => new \ReflectionClass($mapping['className']), - ); + ]; case (isset($this->_rsm->scalarMappings[$key])): - return $this->_cache[$key] = array( + return $this->_cache[$key] = [ 'isScalar' => true, 'fieldName' => $this->_rsm->scalarMappings[$key], 'type' => Type::getType($this->_rsm->typeMappings[$key]), - ); + ]; case (isset($this->_rsm->metaMappings[$key])): // Meta column (has meaning in relational schema only, i.e. foreign keys or discriminator columns). @@ -408,13 +408,13 @@ abstract class AbstractHydrator // Cache metadata fetch $this->getClassMetadata($this->_rsm->aliasMap[$dqlAlias]); - return $this->_cache[$key] = array( + return $this->_cache[$key] = [ 'isIdentifier' => isset($this->_rsm->isIdentifierColumn[$dqlAlias][$key]), 'isMetaColumn' => true, 'fieldName' => $fieldName, 'type' => $type, 'dqlAlias' => $dqlAlias, - ); + ]; } // this column is a left over, maybe from a LIMIT query hack for example in Oracle or DB2 @@ -452,7 +452,7 @@ abstract class AbstractHydrator protected function registerManaged(ClassMetadata $class, $entity, array $data) { if ($class->isIdentifierComposite) { - $id = array(); + $id = []; foreach ($class->identifier as $fieldName) { $id[$fieldName] = isset($class->associationMappings[$fieldName]) @@ -461,11 +461,11 @@ abstract class AbstractHydrator } } else { $fieldName = $class->identifier[0]; - $id = array( + $id = [ $fieldName => isset($class->associationMappings[$fieldName]) ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']] : $data[$fieldName] - ); + ]; } $this->_em->getUnitOfWork()->registerManaged($entity, $id, $data); diff --git a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php index f3e4376f7..c26b99be3 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php @@ -35,7 +35,7 @@ class ArrayHydrator extends AbstractHydrator /** * @var array */ - private $_rootAliases = array(); + private $_rootAliases = []; /** * @var bool @@ -45,17 +45,17 @@ class ArrayHydrator extends AbstractHydrator /** * @var array */ - private $_identifierMap = array(); + private $_identifierMap = []; /** * @var array */ - private $_resultPointers = array(); + private $_resultPointers = []; /** * @var array */ - private $_idTemplate = array(); + private $_idTemplate = []; /** * @var int @@ -70,8 +70,8 @@ class ArrayHydrator extends AbstractHydrator $this->_isSimpleQuery = count($this->_rsm->aliasMap) <= 1; foreach ($this->_rsm->aliasMap as $dqlAlias => $className) { - $this->_identifierMap[$dqlAlias] = array(); - $this->_resultPointers[$dqlAlias] = array(); + $this->_identifierMap[$dqlAlias] = []; + $this->_resultPointers[$dqlAlias] = []; $this->_idTemplate[$dqlAlias] = ''; } } @@ -81,7 +81,7 @@ class ArrayHydrator extends AbstractHydrator */ protected function hydrateAllData() { - $result = array(); + $result = []; while ($data = $this->_stmt->fetch(PDO::FETCH_ASSOC)) { $this->hydrateRowData($data, $result); @@ -97,7 +97,7 @@ class ArrayHydrator extends AbstractHydrator { // 1) Initialize $id = $this->_idTemplate; // initialize the id-memory - $nonemptyComponents = array(); + $nonemptyComponents = []; $rowData = $this->gatherRowData($row, $id, $nonemptyComponents); // 2) Now hydrate the data found in the current row. @@ -138,7 +138,7 @@ class ArrayHydrator extends AbstractHydrator $oneToOne = false; if ( ! isset($baseElement[$relationAlias])) { - $baseElement[$relationAlias] = array(); + $baseElement[$relationAlias] = []; } if (isset($nonemptyComponents[$dqlAlias])) { @@ -187,7 +187,7 @@ class ArrayHydrator extends AbstractHydrator // if this row has a NULL value for the root result id then make it a null result. if ( ! isset($nonemptyComponents[$dqlAlias]) ) { $result[] = $this->_rsm->isMixed - ? array($entityKey => null) + ? [$entityKey => null] : null; $resultKey = $this->_resultCounter; @@ -199,7 +199,7 @@ class ArrayHydrator extends AbstractHydrator // Check for an existing element if ($this->_isSimpleQuery || ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) { $element = $this->_rsm->isMixed - ? array($entityKey => $data) + ? [$entityKey => $data] : $data; if (isset($this->_rsm->indexByMap[$dqlAlias])) { diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index d2d23a252..9d8ee329a 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -42,17 +42,17 @@ class ObjectHydrator extends AbstractHydrator /** * @var array */ - private $identifierMap = array(); + private $identifierMap = []; /** * @var array */ - private $resultPointers = array(); + private $resultPointers = []; /** * @var array */ - private $idTemplate = array(); + private $idTemplate = []; /** * @var integer @@ -62,17 +62,17 @@ class ObjectHydrator extends AbstractHydrator /** * @var array */ - private $rootAliases = array(); + private $rootAliases = []; /** * @var array */ - private $initializedCollections = array(); + private $initializedCollections = []; /** * @var array */ - private $existingCollections = array(); + private $existingCollections = []; /** * {@inheritdoc} @@ -84,7 +84,7 @@ class ObjectHydrator extends AbstractHydrator } foreach ($this->_rsm->aliasMap as $dqlAlias => $className) { - $this->identifierMap[$dqlAlias] = array(); + $this->identifierMap[$dqlAlias] = []; $this->idTemplate[$dqlAlias] = ''; // Remember which associations are "fetch joined", so that we know where to inject @@ -142,7 +142,7 @@ class ObjectHydrator extends AbstractHydrator $this->identifierMap = $this->initializedCollections = $this->existingCollections = - $this->resultPointers = array(); + $this->resultPointers = []; if ($eagerLoad) { $this->_uow->triggerEagerLoads(); @@ -156,7 +156,7 @@ class ObjectHydrator extends AbstractHydrator */ protected function hydrateAllData() { - $result = array(); + $result = []; while ($row = $this->_stmt->fetch(PDO::FETCH_ASSOC)) { $this->hydrateRowData($row, $result); @@ -326,7 +326,7 @@ class ObjectHydrator extends AbstractHydrator { // Initialize $id = $this->idTemplate; // initialize the id-memory - $nonemptyComponents = array(); + $nonemptyComponents = []; // Split the row data into chunks of class data. $rowData = $this->gatherRowData($row, $id, $nonemptyComponents); @@ -478,7 +478,7 @@ class ObjectHydrator extends AbstractHydrator // if this row has a NULL value for the root result id then make it a null result. if ( ! isset($nonemptyComponents[$dqlAlias]) ) { if ($this->_rsm->isMixed) { - $result[] = array($entityKey => null); + $result[] = [$entityKey => null]; } else { $result[] = null; } @@ -492,7 +492,7 @@ class ObjectHydrator extends AbstractHydrator $element = $this->getEntity($data, $dqlAlias); if ($this->_rsm->isMixed) { - $element = array($entityKey => $element); + $element = [$entityKey => $element]; } if (isset($this->_rsm->indexByMap[$dqlAlias])) { diff --git a/lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php index 024ee3b66..093e89c4e 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php @@ -35,7 +35,7 @@ class ScalarHydrator extends AbstractHydrator */ protected function hydrateAllData() { - $result = array(); + $result = []; while ($data = $this->_stmt->fetch(\PDO::FETCH_ASSOC)) { $this->hydrateRowData($data, $result); diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 785a2b796..bf2beaba3 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -62,7 +62,7 @@ class SimpleObjectHydrator extends AbstractHydrator */ protected function hydrateAllData() { - $result = array(); + $result = []; while ($row = $this->_stmt->fetch(PDO::FETCH_ASSOC)) { $this->hydrateRowData($row, $result); @@ -79,7 +79,7 @@ class SimpleObjectHydrator extends AbstractHydrator protected function hydrateRowData(array $sqlResult, array &$result) { $entityName = $this->class->name; - $data = array(); + $data = []; // We need to find the correct entity class name if we have inheritance in resultset if ($this->class->inheritanceType !== ClassMetadata::INHERITANCE_TYPE_NONE) { diff --git a/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php b/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php index 4da71cefa..72a0c7034 100644 --- a/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php +++ b/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php @@ -47,7 +47,7 @@ final class HydrationCompleteHandler /** * @var array[] */ - private $deferredPostLoadInvocations = array(); + private $deferredPostLoadInvocations = []; /** * Constructor for this object @@ -75,7 +75,7 @@ final class HydrationCompleteHandler return; } - $this->deferredPostLoadInvocations[] = array($class, $invoke, $entity); + $this->deferredPostLoadInvocations[] = [$class, $invoke, $entity]; } /** @@ -86,7 +86,7 @@ final class HydrationCompleteHandler public function hydrationComplete() { $toInvoke = $this->deferredPostLoadInvocations; - $this->deferredPostLoadInvocations = array(); + $this->deferredPostLoadInvocations = []; foreach ($toInvoke as $classAndEntity) { list($class, $invoke, $entity) = $classAndEntity; diff --git a/lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php index 5abfe21bb..7f4fddc96 100644 --- a/lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php +++ b/lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php @@ -84,7 +84,7 @@ class AssociationBuilder */ public function cascadeAll() { - $this->mapping['cascade'] = array("ALL"); + $this->mapping['cascade'] = ["ALL"]; return $this; } @@ -183,14 +183,14 @@ class AssociationBuilder */ public function addJoinColumn($columnName, $referencedColumnName, $nullable = true, $unique = false, $onDelete = null, $columnDef = null) { - $this->joinColumns[] = array( + $this->joinColumns[] = [ 'name' => $columnName, 'referencedColumnName' => $referencedColumnName, 'nullable' => $nullable, 'unique' => $unique, 'onDelete' => $onDelete, 'columnDefinition' => $columnDef, - ); + ]; return $this; } diff --git a/lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php index 7d771d3f9..c08b374fe 100644 --- a/lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php +++ b/lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php @@ -91,11 +91,13 @@ class ClassMetadataBuilder */ public function addEmbedded($fieldName, $class, $columnPrefix = null) { - $this->cm->mapEmbedded(array( - 'fieldName' => $fieldName, - 'class' => $class, - 'columnPrefix' => $columnPrefix - )); + $this->cm->mapEmbedded( + [ + 'fieldName' => $fieldName, + 'class' => $class, + 'columnPrefix' => $columnPrefix + ] + ); return $this; } @@ -135,7 +137,7 @@ class ClassMetadataBuilder */ public function setTable($name) { - $this->cm->setPrimaryTable(array('name' => $name)); + $this->cm->setPrimaryTable(['name' => $name]); return $this; } @@ -151,10 +153,10 @@ class ClassMetadataBuilder public function addIndex(array $columns, $name) { if (!isset($this->cm->table['indexes'])) { - $this->cm->table['indexes'] = array(); + $this->cm->table['indexes'] = []; } - $this->cm->table['indexes'][$name] = array('columns' => $columns); + $this->cm->table['indexes'][$name] = ['columns' => $columns]; return $this; } @@ -170,10 +172,10 @@ class ClassMetadataBuilder public function addUniqueConstraint(array $columns, $name) { if ( ! isset($this->cm->table['uniqueConstraints'])) { - $this->cm->table['uniqueConstraints'] = array(); + $this->cm->table['uniqueConstraints'] = []; } - $this->cm->table['uniqueConstraints'][$name] = array('columns' => $columns); + $this->cm->table['uniqueConstraints'][$name] = ['columns' => $columns]; return $this; } @@ -188,10 +190,12 @@ class ClassMetadataBuilder */ public function addNamedQuery($name, $dqlQuery) { - $this->cm->addNamedQuery(array( - 'name' => $name, - 'query' => $dqlQuery, - )); + $this->cm->addNamedQuery( + [ + 'name' => $name, + 'query' => $dqlQuery, + ] + ); return $this; } @@ -231,11 +235,13 @@ class ClassMetadataBuilder */ public function setDiscriminatorColumn($name, $type = 'string', $length = 255) { - $this->cm->setDiscriminatorColumn(array( - 'name' => $name, - 'type' => $type, - 'length' => $length, - )); + $this->cm->setDiscriminatorColumn( + [ + 'name' => $name, + 'type' => $type, + 'length' => $length, + ] + ); return $this; } @@ -303,7 +309,7 @@ class ClassMetadataBuilder * * @return ClassMetadataBuilder */ - public function addField($name, $type, array $mapping = array()) + public function addField($name, $type, array $mapping = []) { $mapping['fieldName'] = $name; $mapping['type'] = $type; @@ -325,10 +331,10 @@ class ClassMetadataBuilder { return new FieldBuilder( $this, - array( + [ 'fieldName' => $name, 'type' => $type - ) + ] ); } @@ -344,11 +350,11 @@ class ClassMetadataBuilder { return new EmbeddedBuilder( $this, - array( + [ 'fieldName' => $fieldName, 'class' => $class, 'columnPrefix' => null - ) + ] ); } @@ -386,10 +392,10 @@ class ClassMetadataBuilder { return new AssociationBuilder( $this, - array( + [ 'fieldName' => $name, 'targetEntity' => $targetEntity - ), + ], ClassMetadata::MANY_TO_ONE ); } @@ -406,10 +412,10 @@ class ClassMetadataBuilder { return new AssociationBuilder( $this, - array( + [ 'fieldName' => $name, 'targetEntity' => $targetEntity - ), + ], ClassMetadata::ONE_TO_ONE ); } @@ -463,10 +469,10 @@ class ClassMetadataBuilder { return new ManyToManyAssociationBuilder( $this, - array( + [ 'fieldName' => $name, 'targetEntity' => $targetEntity - ), + ], ClassMetadata::MANY_TO_MANY ); } @@ -520,10 +526,10 @@ class ClassMetadataBuilder { return new OneToManyAssociationBuilder( $this, - array( + [ 'fieldName' => $name, 'targetEntity' => $targetEntity - ), + ], ClassMetadata::ONE_TO_MANY ); } diff --git a/lib/Doctrine/ORM/Mapping/Builder/EntityListenerBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/EntityListenerBuilder.php index d17abeac5..e96272609 100644 --- a/lib/Doctrine/ORM/Mapping/Builder/EntityListenerBuilder.php +++ b/lib/Doctrine/ORM/Mapping/Builder/EntityListenerBuilder.php @@ -34,7 +34,7 @@ class EntityListenerBuilder /** * @var array Hash-map to handle event names. */ - static private $events = array( + static private $events = [ Events::preRemove => true, Events::postRemove => true, Events::prePersist => true, @@ -43,7 +43,7 @@ class EntityListenerBuilder Events::postUpdate => true, Events::postLoad => true, Events::preFlush => true - ); + ]; /** * Lookup the entity class to find methods that match to event lifecycle names @@ -69,4 +69,4 @@ class EntityListenerBuilder $metadata->addEntityListener($method, $class, $method); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php index 5a8966781..d0128d4a9 100644 --- a/lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php +++ b/lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php @@ -226,11 +226,11 @@ class FieldBuilder */ public function setSequenceGenerator($sequenceName, $allocationSize = 1, $initialValue = 1) { - $this->sequenceDef = array( + $this->sequenceDef = [ 'sequenceName' => $sequenceName, 'allocationSize' => $allocationSize, 'initialValue' => $initialValue, - ); + ]; return $this; } diff --git a/lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationBuilder.php b/lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationBuilder.php index 8b167d996..a71859dfd 100644 --- a/lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationBuilder.php +++ b/lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationBuilder.php @@ -37,7 +37,7 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder /** * @var array */ - private $inverseJoinColumns = array(); + private $inverseJoinColumns = []; /** * @param string $name @@ -65,14 +65,14 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder */ public function addInverseJoinColumn($columnName, $referencedColumnName, $nullable = true, $unique = false, $onDelete = null, $columnDef = null) { - $this->inverseJoinColumns[] = array( + $this->inverseJoinColumns[] = [ 'name' => $columnName, 'referencedColumnName' => $referencedColumnName, 'nullable' => $nullable, 'unique' => $unique, 'onDelete' => $onDelete, 'columnDefinition' => $columnDef, - ); + ]; return $this; } @@ -83,7 +83,7 @@ class ManyToManyAssociationBuilder extends OneToManyAssociationBuilder public function build() { $mapping = $this->mapping; - $mapping['joinTable'] = array(); + $mapping['joinTable'] = []; if ($this->joinColumns) { $mapping['joinTable']['joinColumns'] = $this->joinColumns; } diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index b42b8b567..a1412d2f1 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -68,7 +68,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory /** * @var array */ - private $embeddablesActiveNesting = array(); + private $embeddablesActiveNesting = []; /** * {@inheritDoc} @@ -350,9 +350,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory { $allClasses = $this->driver->getAllClassNames(); $fqcn = $class->getName(); - $map = array($this->getShortName($class->name) => $fqcn); + $map = [$this->getShortName($class->name) => $fqcn]; - $duplicates = array(); + $duplicates = []; foreach ($allClasses as $subClassCandidate) { if (is_subclass_of($subClassCandidate, $fqcn)) { $shortName = $this->getShortName($subClassCandidate); @@ -475,15 +475,17 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $embeddableMetadata = $this->getMetadataFor($embeddableClass['class']); - $parentClass->mapEmbedded(array( - 'fieldName' => $prefix . '.' . $property, - 'class' => $embeddableMetadata->name, - 'columnPrefix' => $embeddableClass['columnPrefix'], - 'declaredField' => $embeddableClass['declaredField'] - ? $prefix . '.' . $embeddableClass['declaredField'] - : $prefix, - 'originalField' => $embeddableClass['originalField'] ?: $property, - )); + $parentClass->mapEmbedded( + [ + 'fieldName' => $prefix . '.' . $property, + 'class' => $embeddableMetadata->name, + 'columnPrefix' => $embeddableClass['columnPrefix'], + 'declaredField' => $embeddableClass['declaredField'] + ? $prefix . '.' . $embeddableClass['declaredField'] + : $prefix, + 'originalField' => $embeddableClass['originalField'] ?: $property, + ] + ); } } @@ -501,7 +503,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory return; } - foreach (array('uniqueConstraints', 'indexes') as $indexType) { + foreach (['uniqueConstraints', 'indexes'] as $indexType) { if (isset($parentClass->table[$indexType])) { foreach ($parentClass->table[$indexType] as $indexName => $index) { if (isset($subClass->table[$indexType][$indexName])) { @@ -528,10 +530,12 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory { foreach ($parentClass->namedQueries as $name => $query) { if ( ! isset ($subClass->namedQueries[$name])) { - $subClass->addNamedQuery(array( - 'name' => $query['name'], - 'query' => $query['query'] - )); + $subClass->addNamedQuery( + [ + 'name' => $query['name'], + 'query' => $query['query'] + ] + ); } } } @@ -550,13 +554,15 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory { foreach ($parentClass->namedNativeQueries as $name => $query) { if ( ! isset ($subClass->namedNativeQueries[$name])) { - $subClass->addNamedNativeQuery(array( - 'name' => $query['name'], - 'query' => $query['query'], - 'isSelfClass' => $query['isSelfClass'], - 'resultSetMapping' => $query['resultSetMapping'], - 'resultClass' => $query['isSelfClass'] ? $subClass->name : $query['resultClass'], - )); + $subClass->addNamedNativeQuery( + [ + 'name' => $query['name'], + 'query' => $query['query'], + 'isSelfClass' => $query['isSelfClass'], + 'resultSetMapping' => $query['resultSetMapping'], + 'resultClass' => $query['isSelfClass'] ? $subClass->name : $query['resultClass'], + ] + ); } } } @@ -575,21 +581,23 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory { foreach ($parentClass->sqlResultSetMappings as $name => $mapping) { if ( ! isset ($subClass->sqlResultSetMappings[$name])) { - $entities = array(); + $entities = []; foreach ($mapping['entities'] as $entity) { - $entities[] = array( + $entities[] = [ 'fields' => $entity['fields'], 'isSelfClass' => $entity['isSelfClass'], 'discriminatorColumn' => $entity['discriminatorColumn'], 'entityClass' => $entity['isSelfClass'] ? $subClass->name : $entity['entityClass'], - ); + ]; } - $subClass->addSqlResultSetMapping(array( - 'name' => $mapping['name'], - 'columns' => $mapping['columns'], - 'entities' => $entities, - )); + $subClass->addSqlResultSetMapping( + [ + 'name' => $mapping['name'], + 'columns' => $mapping['columns'], + 'entities' => $entities, + ] + ); } } } @@ -629,9 +637,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']); $sequencePrefix = $class->getSequencePrefix($this->getTargetPlatform()); $sequenceName = $this->getTargetPlatform()->getIdentitySequenceName($sequencePrefix, $columnName); - $definition = array( + $definition = [ 'sequenceName' => $this->getTargetPlatform()->fixSchemaElementName($sequenceName) - ); + ]; if ($quoted) { $definition['quoted'] = true; @@ -661,11 +669,11 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $sequenceName = $class->getSequenceName($this->getTargetPlatform()); $quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']); - $definition = array( + $definition = [ 'sequenceName' => $this->getTargetPlatform()->fixSchemaElementName($sequenceName), 'allocationSize' => 1, 'initialValue' => 1, - ); + ]; if ($quoted) { $definition['quoted'] = true; diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 3058a2eda..9a5811163 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -275,28 +275,28 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $parentClasses = array(); + public $parentClasses = []; /** * READ-ONLY: The names of all subclasses (descendants). * * @var array */ - public $subClasses = array(); + public $subClasses = []; /** * READ-ONLY: The names of all embedded classes based on properties. * * @var array */ - public $embeddedClasses = array(); + public $embeddedClasses = []; /** * READ-ONLY: The named queries allowed to be called directly from Repository. * * @var array */ - public $namedQueries = array(); + public $namedQueries = []; /** * READ-ONLY: The named native queries allowed to be called directly from Repository. @@ -313,7 +313,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $namedNativeQueries = array(); + public $namedNativeQueries = []; /** * READ-ONLY: The mappings of the results of native SQL queries. @@ -329,7 +329,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $sqlResultSetMappings = array(); + public $sqlResultSetMappings = []; /** * READ-ONLY: The field names of all fields that are part of the identifier/primary key @@ -337,7 +337,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $identifier = array(); + public $identifier = []; /** * READ-ONLY: The inheritance mapping type used by the class. @@ -394,7 +394,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $fieldMappings = array(); + public $fieldMappings = []; /** * READ-ONLY: An array of field names. Used to look up field names from column names. @@ -402,7 +402,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $fieldNames = array(); + public $fieldNames = []; /** * READ-ONLY: A map of field names to column names. Keys are field names and values column names. @@ -413,7 +413,7 @@ class ClassMetadataInfo implements ClassMetadata * * @deprecated 3.0 Remove this. */ - public $columnNames = array(); + public $columnNames = []; /** * READ-ONLY: The discriminator value of this class. @@ -437,7 +437,7 @@ class ClassMetadataInfo implements ClassMetadata * * @see discriminatorColumn */ - public $discriminatorMap = array(); + public $discriminatorMap = []; /** * READ-ONLY: The definition of the discriminator column used in JOINED and SINGLE_TABLE @@ -465,14 +465,14 @@ class ClassMetadataInfo implements ClassMetadata * * @var array[] */ - public $lifecycleCallbacks = array(); + public $lifecycleCallbacks = []; /** * READ-ONLY: The registered entity listeners. * * @var array */ - public $entityListeners = array(); + public $entityListeners = []; /** * READ-ONLY: The association mappings of this class. @@ -529,7 +529,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var array */ - public $associationMappings = array(); + public $associationMappings = []; /** * READ-ONLY: Flag indicating whether the identifier/primary key of the class is composite. @@ -642,7 +642,7 @@ class ClassMetadataInfo implements ClassMetadata * * @var \ReflectionProperty[] */ - public $reflFields = array(); + public $reflFields = []; /** * @var \Doctrine\Instantiator\InstantiatorInterface|null @@ -715,7 +715,7 @@ class ClassMetadataInfo implements ClassMetadata public function getIdentifierValues($entity) { if ($this->isIdentifierComposite) { - $id = array(); + $id = []; foreach ($this->identifier as $idField) { $value = $this->reflFields[$idField]->getValue($entity); @@ -732,10 +732,10 @@ class ClassMetadataInfo implements ClassMetadata $value = $this->reflFields[$id]->getValue($entity); if (null === $value) { - return array(); + return []; } - return array($id => $value); + return [$id => $value]; } /** @@ -810,7 +810,7 @@ class ClassMetadataInfo implements ClassMetadata public function __sleep() { // This metadata is always serialized/cached. - $serialized = array( + $serialized = [ 'associationMappings', 'columnNames', //TODO: 3.0 Remove this. Can use fieldMappings[$fieldName]['columnName'] 'fieldMappings', @@ -823,7 +823,7 @@ class ClassMetadataInfo implements ClassMetadata 'table', 'rootEntityName', 'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime. - ); + ]; // The rest of the metadata is only serialized if necessary. if ($this->changeTrackingPolicy != self::CHANGETRACKING_DEFERRED_IMPLICIT) { @@ -925,7 +925,7 @@ class ClassMetadataInfo implements ClassMetadata $this->reflClass = $reflService->getClass($this->name); $this->instantiator = $this->instantiator ?: new Instantiator(); - $parentReflFields = array(); + $parentReflFields = []; foreach ($this->embeddedClasses as $property => $embeddedClass) { if (isset($embeddedClass['declaredField'])) { @@ -1533,9 +1533,9 @@ class ClassMetadataInfo implements ClassMetadata } // Cascades - $cascades = isset($mapping['cascade']) ? array_map('strtolower', $mapping['cascade']) : array(); + $cascades = isset($mapping['cascade']) ? array_map('strtolower', $mapping['cascade']) : []; - $allCascades = array('remove', 'persist', 'refresh', 'merge', 'detach'); + $allCascades = ['remove', 'persist', 'refresh', 'merge', 'detach']; if (in_array('all', $cascades)) { $cascades = $allCascades; } elseif (count($cascades) !== count(array_intersect($cascades, $allCascades))) { @@ -1577,15 +1577,15 @@ class ClassMetadataInfo implements ClassMetadata if ($mapping['isOwningSide']) { if (empty($mapping['joinColumns'])) { // Apply default join column - $mapping['joinColumns'] = array( - array( + $mapping['joinColumns'] = [ + [ 'name' => $this->namingStrategy->joinColumnName($mapping['fieldName'], $this->name), 'referencedColumnName' => $this->namingStrategy->referenceColumnName() - ) - ); + ] + ]; } - $uniqueConstraintColumns = array(); + $uniqueConstraintColumns = []; foreach ($mapping['joinColumns'] as &$joinColumn) { if ($mapping['type'] === self::ONE_TO_ONE && ! $this->isInheritanceTypeSingleTable()) { @@ -1627,9 +1627,9 @@ class ClassMetadataInfo implements ClassMetadata throw new RuntimeException("ClassMetadataInfo::setTable() has to be called before defining a one to one relationship."); } - $this->table['uniqueConstraints'][$mapping['fieldName'] . "_uniq"] = array( + $this->table['uniqueConstraints'][$mapping['fieldName'] . "_uniq"] = [ 'columns' => $uniqueConstraintColumns - ); + ]; } $mapping['targetToSourceKeyColumns'] = array_flip($mapping['sourceToTargetKeyColumns']); @@ -1699,26 +1699,26 @@ class ClassMetadataInfo implements ClassMetadata && (! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns']))); if ( ! isset($mapping['joinTable']['joinColumns'])) { - $mapping['joinTable']['joinColumns'] = array( - array( + $mapping['joinTable']['joinColumns'] = [ + [ 'name' => $this->namingStrategy->joinKeyColumnName($mapping['sourceEntity'], $selfReferencingEntityWithoutJoinColumns ? 'source' : null), 'referencedColumnName' => $this->namingStrategy->referenceColumnName(), 'onDelete' => 'CASCADE' - ) - ); + ] + ]; } if ( ! isset($mapping['joinTable']['inverseJoinColumns'])) { - $mapping['joinTable']['inverseJoinColumns'] = array( - array( + $mapping['joinTable']['inverseJoinColumns'] = [ + [ 'name' => $this->namingStrategy->joinKeyColumnName($mapping['targetEntity'], $selfReferencingEntityWithoutJoinColumns ? 'target' : null), 'referencedColumnName' => $this->namingStrategy->referenceColumnName(), 'onDelete' => 'CASCADE' - ) - ); + ] + ]; } - $mapping['joinTableColumns'] = array(); + $mapping['joinTableColumns'] = []; foreach ($mapping['joinTable']['joinColumns'] as &$joinColumn) { if (empty($joinColumn['name'])) { @@ -1874,7 +1874,7 @@ class ClassMetadataInfo implements ClassMetadata */ public function getIdentifierColumnNames() { - $columnNames = array(); + $columnNames = []; foreach ($this->identifier as $idProperty) { if (isset($this->fieldMappings[$idProperty])) { @@ -2411,11 +2411,11 @@ class ClassMetadataInfo implements ClassMetadata $query = $queryMapping['query']; $dql = str_replace('__CLASS__', $this->name, $query); - $this->namedQueries[$name] = array( + $this->namedQueries[$name] = [ 'name' => $name, 'query' => $query, 'dql' => $dql, - ); + ]; } /** @@ -2657,7 +2657,7 @@ class ClassMetadataInfo implements ClassMetadata */ public function getLifecycleCallbacks($event) { - return isset($this->lifecycleCallbacks[$event]) ? $this->lifecycleCallbacks[$event] : array(); + return isset($this->lifecycleCallbacks[$event]) ? $this->lifecycleCallbacks[$event] : []; } /** @@ -2703,10 +2703,10 @@ class ClassMetadataInfo implements ClassMetadata { $class = $this->fullyQualifiedClassName($class); - $listener = array( + $listener = [ 'class' => $class, 'method' => $method, - ); + ]; if ( ! class_exists($class)) { throw MappingException::entityListenerClassNotFound($class, $this->name); @@ -2753,7 +2753,7 @@ class ClassMetadataInfo implements ClassMetadata $columnDef['type'] = "string"; } - if (in_array($columnDef['type'], array("boolean", "array", "object", "datetime", "time", "date"))) { + if (in_array($columnDef['type'], ["boolean", "array", "object", "datetime", "time", "date"])) { throw MappingException::invalidDiscriminatorColumnType($this->name, $columnDef['type']); } @@ -3021,7 +3021,7 @@ class ClassMetadataInfo implements ClassMetadata $this->versionField = $mapping['fieldName']; if ( ! isset($mapping['default'])) { - if (in_array($mapping['type'], array('integer', 'bigint', 'smallint'))) { + if (in_array($mapping['type'], ['integer', 'bigint', 'smallint'])) { $mapping['default'] = 1; } else if ($mapping['type'] == 'datetime') { $mapping['default'] = 'CURRENT_TIMESTAMP'; @@ -3115,7 +3115,7 @@ class ClassMetadataInfo implements ClassMetadata */ public function getQuotedIdentifierColumnNames($platform) { - $quotedColumnNames = array(); + $quotedColumnNames = []; foreach ($this->identifier as $idProperty) { if (isset($this->fieldMappings[$idProperty])) { @@ -3217,7 +3217,7 @@ class ClassMetadataInfo implements ClassMetadata */ public function getAssociationsByTargetClass($targetClass) { - $relations = array(); + $relations = []; foreach ($this->associationMappings as $mapping) { if ($mapping['targetEntity'] == $targetClass) { @@ -3273,12 +3273,12 @@ class ClassMetadataInfo implements ClassMetadata { $this->assertFieldNotMapped($mapping['fieldName']); - $this->embeddedClasses[$mapping['fieldName']] = array( + $this->embeddedClasses[$mapping['fieldName']] = [ 'class' => $this->fullyQualifiedClassName($mapping['class']), 'columnPrefix' => $mapping['columnPrefix'], 'declaredField' => isset($mapping['declaredField']) ? $mapping['declaredField'] : null, 'originalField' => isset($mapping['originalField']) ? $mapping['originalField'] : null, - ); + ]; } /** diff --git a/lib/Doctrine/ORM/Mapping/Column.php b/lib/Doctrine/ORM/Mapping/Column.php index 70337323f..711590be6 100644 --- a/lib/Doctrine/ORM/Mapping/Column.php +++ b/lib/Doctrine/ORM/Mapping/Column.php @@ -67,7 +67,7 @@ final class Column implements Annotation /** * @var array */ - public $options = array(); + public $options = []; /** * @var string diff --git a/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php b/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php index 75658547e..a8ee2dc78 100644 --- a/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php +++ b/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php @@ -31,7 +31,7 @@ class DefaultEntityListenerResolver implements EntityListenerResolver /** * @var array Map to store entity listener instances. */ - private $instances = array(); + private $instances = []; /** * {@inheritdoc} @@ -39,7 +39,7 @@ class DefaultEntityListenerResolver implements EntityListenerResolver public function clear($className = null) { if ($className === null) { - $this->instances = array(); + $this->instances = []; return; } @@ -72,4 +72,4 @@ class DefaultEntityListenerResolver implements EntityListenerResolver return $this->instances[$className] = new $className(); } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php index dfbded8a4..6929edfe4 100644 --- a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php +++ b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php @@ -116,7 +116,7 @@ class DefaultQuoteStrategy implements QuoteStrategy */ public function getIdentifierColumnNames(ClassMetadata $class, AbstractPlatform $platform) { - $quotedColumnNames = array(); + $quotedColumnNames = []; foreach ($class->identifier as $fieldName) { if (isset($class->fieldMappings[$fieldName])) { diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 9dd64bbd3..0ed36d895 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -42,10 +42,10 @@ class AnnotationDriver extends AbstractAnnotationDriver /** * {@inheritDoc} */ - protected $entityAnnotationClasses = array( + protected $entityAnnotationClasses = [ 'Doctrine\ORM\Mapping\Entity' => 1, 'Doctrine\ORM\Mapping\MappedSuperclass' => 2, - ); + ]; /** * {@inheritDoc} @@ -97,14 +97,14 @@ class AnnotationDriver extends AbstractAnnotationDriver // Evaluate Table annotation if (isset($classAnnotations['Doctrine\ORM\Mapping\Table'])) { $tableAnnot = $classAnnotations['Doctrine\ORM\Mapping\Table']; - $primaryTable = array( + $primaryTable = [ 'name' => $tableAnnot->name, 'schema' => $tableAnnot->schema - ); + ]; if ($tableAnnot->indexes !== null) { foreach ($tableAnnot->indexes as $indexAnnot) { - $index = array('columns' => $indexAnnot->columns); + $index = ['columns' => $indexAnnot->columns]; if ( ! empty($indexAnnot->flags)) { $index['flags'] = $indexAnnot->flags; @@ -124,7 +124,7 @@ class AnnotationDriver extends AbstractAnnotationDriver if ($tableAnnot->uniqueConstraints !== null) { foreach ($tableAnnot->uniqueConstraints as $uniqueConstraintAnnot) { - $uniqueConstraint = array('columns' => $uniqueConstraintAnnot->columns); + $uniqueConstraint = ['columns' => $uniqueConstraintAnnot->columns]; if ( ! empty($uniqueConstraintAnnot->options)) { $uniqueConstraint['options'] = $uniqueConstraintAnnot->options; @@ -148,10 +148,10 @@ class AnnotationDriver extends AbstractAnnotationDriver // Evaluate @Cache annotation if (isset($classAnnotations['Doctrine\ORM\Mapping\Cache'])) { $cacheAnnot = $classAnnotations['Doctrine\ORM\Mapping\Cache']; - $cacheMap = array( + $cacheMap = [ 'region' => $cacheAnnot->region, 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), - ); + ]; $metadata->enableCache($cacheMap); } @@ -161,12 +161,14 @@ class AnnotationDriver extends AbstractAnnotationDriver $namedNativeQueriesAnnot = $classAnnotations['Doctrine\ORM\Mapping\NamedNativeQueries']; foreach ($namedNativeQueriesAnnot->value as $namedNativeQuery) { - $metadata->addNamedNativeQuery(array( - 'name' => $namedNativeQuery->name, - 'query' => $namedNativeQuery->query, - 'resultClass' => $namedNativeQuery->resultClass, - 'resultSetMapping' => $namedNativeQuery->resultSetMapping, - )); + $metadata->addNamedNativeQuery( + [ + 'name' => $namedNativeQuery->name, + 'query' => $namedNativeQuery->query, + 'resultClass' => $namedNativeQuery->resultClass, + 'resultSetMapping' => $namedNativeQuery->resultSetMapping, + ] + ); } } @@ -175,36 +177,38 @@ class AnnotationDriver extends AbstractAnnotationDriver $sqlResultSetMappingsAnnot = $classAnnotations['Doctrine\ORM\Mapping\SqlResultSetMappings']; foreach ($sqlResultSetMappingsAnnot->value as $resultSetMapping) { - $entities = array(); - $columns = array(); + $entities = []; + $columns = []; foreach ($resultSetMapping->entities as $entityResultAnnot) { - $entityResult = array( - 'fields' => array(), + $entityResult = [ + 'fields' => [], 'entityClass' => $entityResultAnnot->entityClass, 'discriminatorColumn' => $entityResultAnnot->discriminatorColumn, - ); + ]; foreach ($entityResultAnnot->fields as $fieldResultAnnot) { - $entityResult['fields'][] = array( + $entityResult['fields'][] = [ 'name' => $fieldResultAnnot->name, 'column' => $fieldResultAnnot->column - ); + ]; } $entities[] = $entityResult; } foreach ($resultSetMapping->columns as $columnResultAnnot) { - $columns[] = array( + $columns[] = [ 'name' => $columnResultAnnot->name, - ); + ]; } - $metadata->addSqlResultSetMapping(array( - 'name' => $resultSetMapping->name, - 'entities' => $entities, - 'columns' => $columns - )); + $metadata->addSqlResultSetMapping( + [ + 'name' => $resultSetMapping->name, + 'entities' => $entities, + 'columns' => $columns + ] + ); } } @@ -220,10 +224,12 @@ class AnnotationDriver extends AbstractAnnotationDriver if ( ! ($namedQuery instanceof \Doctrine\ORM\Mapping\NamedQuery)) { throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations."); } - $metadata->addNamedQuery(array( - 'name' => $namedQuery->name, - 'query' => $namedQuery->query - )); + $metadata->addNamedQuery( + [ + 'name' => $namedQuery->name, + 'query' => $namedQuery->query + ] + ); } } @@ -240,14 +246,16 @@ class AnnotationDriver extends AbstractAnnotationDriver if (isset($classAnnotations['Doctrine\ORM\Mapping\DiscriminatorColumn'])) { $discrColumnAnnot = $classAnnotations['Doctrine\ORM\Mapping\DiscriminatorColumn']; - $metadata->setDiscriminatorColumn(array( - 'name' => $discrColumnAnnot->name, - 'type' => $discrColumnAnnot->type ?: 'string', - 'length' => $discrColumnAnnot->length ?: 255, - 'columnDefinition' => $discrColumnAnnot->columnDefinition, - )); + $metadata->setDiscriminatorColumn( + [ + 'name' => $discrColumnAnnot->name, + 'type' => $discrColumnAnnot->type ?: 'string', + 'length' => $discrColumnAnnot->length ?: 255, + 'columnDefinition' => $discrColumnAnnot->columnDefinition, + ] + ); } else { - $metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255)); + $metadata->setDiscriminatorColumn(['name' => 'dtype', 'type' => 'string', 'length' => 255]); } // Evaluate DiscriminatorMap annotation @@ -278,18 +286,21 @@ class AnnotationDriver extends AbstractAnnotationDriver continue; } - $mapping = array(); + $mapping = []; $mapping['fieldName'] = $property->getName(); // Evaluate @Cache annotation if (($cacheAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Cache')) !== null) { - $mapping['cache'] = $metadata->getAssociationCacheDefaults($mapping['fieldName'], array( - 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), - 'region' => $cacheAnnot->region, - )); + $mapping['cache'] = $metadata->getAssociationCacheDefaults( + $mapping['fieldName'], + [ + 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), + 'region' => $cacheAnnot->region, + ] + ); } // Check for JoinColumn/JoinColumns annotations - $joinColumns = array(); + $joinColumns = []; if ($joinColumnAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinColumn')) { $joinColumns[] = $this->joinColumnToArray($joinColumnAnnot); @@ -324,17 +335,21 @@ class AnnotationDriver extends AbstractAnnotationDriver // Check for SequenceGenerator/TableGenerator definition if ($seqGeneratorAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\SequenceGenerator')) { - $metadata->setSequenceGeneratorDefinition(array( - 'sequenceName' => $seqGeneratorAnnot->sequenceName, - 'allocationSize' => $seqGeneratorAnnot->allocationSize, - 'initialValue' => $seqGeneratorAnnot->initialValue - )); + $metadata->setSequenceGeneratorDefinition( + [ + 'sequenceName' => $seqGeneratorAnnot->sequenceName, + 'allocationSize' => $seqGeneratorAnnot->allocationSize, + 'initialValue' => $seqGeneratorAnnot->initialValue + ] + ); } else if ($this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\TableGenerator')) { throw MappingException::tableIdGeneratorNotImplemented($className); } else if ($customGeneratorAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\CustomIdGenerator')) { - $metadata->setCustomGeneratorDefinition(array( - 'class' => $customGeneratorAnnot->class - )); + $metadata->setCustomGeneratorDefinition( + [ + 'class' => $customGeneratorAnnot->class + ] + ); } } else if ($oneToOneAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OneToOne')) { if ($idAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Id')) { @@ -374,13 +389,13 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['fetch'] = $this->getFetchMode($className, $manyToOneAnnot->fetch); $metadata->mapManyToOne($mapping); } else if ($manyToManyAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\ManyToMany')) { - $joinTable = array(); + $joinTable = []; if ($joinTableAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinTable')) { - $joinTable = array( + $joinTable = [ 'name' => $joinTableAnnot->name, 'schema' => $joinTableAnnot->schema - ); + ]; foreach ($joinTableAnnot->joinColumns as $joinColumn) { $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumn); @@ -418,12 +433,12 @@ class AnnotationDriver extends AbstractAnnotationDriver $associationOverridesAnnot = $classAnnotations['Doctrine\ORM\Mapping\AssociationOverrides']; foreach ($associationOverridesAnnot->value as $associationOverride) { - $override = array(); + $override = []; $fieldName = $associationOverride->name; // Check for JoinColumn/JoinColumns annotations if ($associationOverride->joinColumns) { - $joinColumns = array(); + $joinColumns = []; foreach ($associationOverride->joinColumns as $joinColumn) { $joinColumns[] = $this->joinColumnToArray($joinColumn); @@ -435,10 +450,10 @@ class AnnotationDriver extends AbstractAnnotationDriver // Check for JoinTable annotations if ($associationOverride->joinTable) { $joinTableAnnot = $associationOverride->joinTable; - $joinTable = array( + $joinTable = [ 'name' => $joinTableAnnot->name, 'schema' => $joinTableAnnot->schema - ); + ]; foreach ($joinTableAnnot->joinColumns as $joinColumn) { $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumn); @@ -542,40 +557,40 @@ class AnnotationDriver extends AbstractAnnotationDriver */ private function getMethodCallbacks(\ReflectionMethod $method) { - $callbacks = array(); + $callbacks = []; $annotations = $this->reader->getMethodAnnotations($method); foreach ($annotations as $annot) { if ($annot instanceof \Doctrine\ORM\Mapping\PrePersist) { - $callbacks[] = array($method->name, Events::prePersist); + $callbacks[] = [$method->name, Events::prePersist]; } if ($annot instanceof \Doctrine\ORM\Mapping\PostPersist) { - $callbacks[] = array($method->name, Events::postPersist); + $callbacks[] = [$method->name, Events::postPersist]; } if ($annot instanceof \Doctrine\ORM\Mapping\PreUpdate) { - $callbacks[] = array($method->name, Events::preUpdate); + $callbacks[] = [$method->name, Events::preUpdate]; } if ($annot instanceof \Doctrine\ORM\Mapping\PostUpdate) { - $callbacks[] = array($method->name, Events::postUpdate); + $callbacks[] = [$method->name, Events::postUpdate]; } if ($annot instanceof \Doctrine\ORM\Mapping\PreRemove) { - $callbacks[] = array($method->name, Events::preRemove); + $callbacks[] = [$method->name, Events::preRemove]; } if ($annot instanceof \Doctrine\ORM\Mapping\PostRemove) { - $callbacks[] = array($method->name, Events::postRemove); + $callbacks[] = [$method->name, Events::postRemove]; } if ($annot instanceof \Doctrine\ORM\Mapping\PostLoad) { - $callbacks[] = array($method->name, Events::postLoad); + $callbacks[] = [$method->name, Events::postLoad]; } if ($annot instanceof \Doctrine\ORM\Mapping\PreFlush) { - $callbacks[] = array($method->name, Events::preFlush); + $callbacks[] = [$method->name, Events::preFlush]; } } @@ -590,14 +605,14 @@ class AnnotationDriver extends AbstractAnnotationDriver */ private function joinColumnToArray(JoinColumn $joinColumn) { - return array( + return [ 'name' => $joinColumn->name, 'unique' => $joinColumn->unique, 'nullable' => $joinColumn->nullable, 'onDelete' => $joinColumn->onDelete, 'columnDefinition' => $joinColumn->columnDefinition, 'referencedColumnName' => $joinColumn->referencedColumnName, - ); + ]; } /** @@ -610,7 +625,7 @@ class AnnotationDriver extends AbstractAnnotationDriver */ private function columnToArray($fieldName, Column $column) { - $mapping = array( + $mapping = [ 'fieldName' => $fieldName, 'type' => $column->type, 'scale' => $column->scale, @@ -618,7 +633,7 @@ class AnnotationDriver extends AbstractAnnotationDriver 'unique' => $column->unique, 'nullable' => $column->nullable, 'precision' => $column->precision - ); + ]; if ($column->options) { $mapping['options'] = $column->options; @@ -643,7 +658,7 @@ class AnnotationDriver extends AbstractAnnotationDriver * * @return AnnotationDriver */ - static public function create($paths = array(), AnnotationReader $reader = null) + static public function create($paths = [], AnnotationReader $reader = null) { if ($reader == null) { $reader = new AnnotationReader(); diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index d6ddaf2d0..9389feb81 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -54,22 +54,22 @@ class DatabaseDriver implements MappingDriver /** * @var array */ - private $classToTableNames = array(); + private $classToTableNames = []; /** * @var array */ - private $manyToManyTables = array(); + private $manyToManyTables = []; /** * @var array */ - private $classNamesForTables = array(); + private $classNamesForTables = []; /** * @var array */ - private $fieldNamesForColumns = array(); + private $fieldNamesForColumns = []; /** * The namespace for the generated entities. @@ -153,7 +153,7 @@ class DatabaseDriver implements MappingDriver */ public function setTables($entityTables, $manyToManyTables) { - $this->tables = $this->manyToManyTables = $this->classToTableNames = array(); + $this->tables = $this->manyToManyTables = $this->classToTableNames = []; foreach ($entityTables as $table) { $className = $this->getClassNameForTable($table->getName()); @@ -212,36 +212,36 @@ class DatabaseDriver implements MappingDriver $localColumn = current($myFk->getColumns()); - $associationMapping = array(); + $associationMapping = []; $associationMapping['fieldName'] = $this->getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true); $associationMapping['targetEntity'] = $this->getClassNameForTable($otherFk->getForeignTableName()); if (current($manyTable->getColumns())->getName() == $localColumn) { $associationMapping['inversedBy'] = $this->getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); - $associationMapping['joinTable'] = array( + $associationMapping['joinTable'] = [ 'name' => strtolower($manyTable->getName()), - 'joinColumns' => array(), - 'inverseJoinColumns' => array(), - ); + 'joinColumns' => [], + 'inverseJoinColumns' => [], + ]; $fkCols = $myFk->getForeignColumns(); $cols = $myFk->getColumns(); for ($i = 0, $colsCount = count($cols); $i < $colsCount; $i++) { - $associationMapping['joinTable']['joinColumns'][] = array( + $associationMapping['joinTable']['joinColumns'][] = [ 'name' => $cols[$i], 'referencedColumnName' => $fkCols[$i], - ); + ]; } $fkCols = $otherFk->getForeignColumns(); $cols = $otherFk->getColumns(); for ($i = 0, $colsCount = count($cols); $i < $colsCount; $i++) { - $associationMapping['joinTable']['inverseJoinColumns'][] = array( + $associationMapping['joinTable']['inverseJoinColumns'][] = [ 'name' => $cols[$i], 'referencedColumnName' => $fkCols[$i], - ); + ]; } } else { $associationMapping['mappedBy'] = $this->getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); @@ -265,20 +265,20 @@ class DatabaseDriver implements MappingDriver return; } - $tables = array(); + $tables = []; foreach ($this->_sm->listTableNames() as $tableName) { $tables[$tableName] = $this->_sm->listTableDetails($tableName); } - $this->tables = $this->manyToManyTables = $this->classToTableNames = array(); + $this->tables = $this->manyToManyTables = $this->classToTableNames = []; foreach ($tables as $tableName => $table) { $foreignKeys = ($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) ? $table->getForeignKeys() - : array(); + : []; - $allForeignKeyColumns = array(); + $allForeignKeyColumns = []; foreach ($foreignKeys as $foreignKey) { $allForeignKeyColumns = array_merge($allForeignKeyColumns, $foreignKey->getLocalColumns()); @@ -345,14 +345,14 @@ class DatabaseDriver implements MappingDriver $columns = $this->tables[$tableName]->getColumns(); $primaryKeys = $this->getTablePrimaryKeys($this->tables[$tableName]); $foreignKeys = $this->getTableForeignKeys($this->tables[$tableName]); - $allForeignKeys = array(); + $allForeignKeys = []; foreach ($foreignKeys as $foreignKey) { $allForeignKeys = array_merge($allForeignKeys, $foreignKey->getLocalColumns()); } - $ids = array(); - $fieldMappings = array(); + $ids = []; + $fieldMappings = []; foreach ($columns as $column) { if (in_array($column->getName(), $allForeignKeys)) { @@ -389,12 +389,12 @@ class DatabaseDriver implements MappingDriver */ private function buildFieldMapping($tableName, Column $column) { - $fieldMapping = array( + $fieldMapping = [ 'fieldName' => $this->getFieldNameForColumn($tableName, $column->getName(), false), 'columnName' => $column->getName(), 'type' => $column->getType()->getName(), 'nullable' => ( ! $column->getNotNull()), - ); + ]; // Type specific elements switch ($fieldMapping['type']) { @@ -452,10 +452,10 @@ class DatabaseDriver implements MappingDriver $fkColumns = $foreignKey->getColumns(); $fkForeignColumns = $foreignKey->getForeignColumns(); $localColumn = current($fkColumns); - $associationMapping = array( + $associationMapping = [ 'fieldName' => $this->getFieldNameForColumn($tableName, $localColumn, true), 'targetEntity' => $this->getClassNameForTable($foreignTableName), - ); + ]; if (isset($metadata->fieldMappings[$associationMapping['fieldName']])) { $associationMapping['fieldName'] .= '2'; // "foo" => "foo2" @@ -466,10 +466,10 @@ class DatabaseDriver implements MappingDriver } for ($i = 0, $fkColumnsCount = count($fkColumns); $i < $fkColumnsCount; $i++) { - $associationMapping['joinColumns'][] = array( + $associationMapping['joinColumns'][] = [ 'name' => $fkColumns[$i], 'referencedColumnName' => $fkForeignColumns[$i], - ); + ]; } // Here we need to check if $fkColumns are the same as $primaryKeys @@ -492,7 +492,7 @@ class DatabaseDriver implements MappingDriver { return ($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) ? $table->getForeignKeys() - : array(); + : []; } /** @@ -510,7 +510,7 @@ class DatabaseDriver implements MappingDriver // Do nothing } - return array(); + return []; } /** diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 3d8499180..d7099663f 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -76,7 +76,7 @@ class XmlDriver extends FileDriver } // Evaluate attributes - $primaryTable = array(); + $primaryTable = []; if (isset($xmlRoot['table'])) { $primaryTable['name'] = (string) $xmlRoot['table']; @@ -96,44 +96,48 @@ class XmlDriver extends FileDriver // Evaluate named queries if (isset($xmlRoot->{'named-queries'})) { foreach ($xmlRoot->{'named-queries'}->{'named-query'} as $namedQueryElement) { - $metadata->addNamedQuery(array( - 'name' => (string) $namedQueryElement['name'], - 'query' => (string) $namedQueryElement['query'] - )); + $metadata->addNamedQuery( + [ + 'name' => (string) $namedQueryElement['name'], + 'query' => (string) $namedQueryElement['query'] + ] + ); } } // Evaluate native named queries if (isset($xmlRoot->{'named-native-queries'})) { foreach ($xmlRoot->{'named-native-queries'}->{'named-native-query'} as $nativeQueryElement) { - $metadata->addNamedNativeQuery(array( - 'name' => isset($nativeQueryElement['name']) ? (string) $nativeQueryElement['name'] : null, - 'query' => isset($nativeQueryElement->query) ? (string) $nativeQueryElement->query : null, - 'resultClass' => isset($nativeQueryElement['result-class']) ? (string) $nativeQueryElement['result-class'] : null, - 'resultSetMapping' => isset($nativeQueryElement['result-set-mapping']) ? (string) $nativeQueryElement['result-set-mapping'] : null, - )); + $metadata->addNamedNativeQuery( + [ + 'name' => isset($nativeQueryElement['name']) ? (string) $nativeQueryElement['name'] : null, + 'query' => isset($nativeQueryElement->query) ? (string) $nativeQueryElement->query : null, + 'resultClass' => isset($nativeQueryElement['result-class']) ? (string) $nativeQueryElement['result-class'] : null, + 'resultSetMapping' => isset($nativeQueryElement['result-set-mapping']) ? (string) $nativeQueryElement['result-set-mapping'] : null, + ] + ); } } // Evaluate sql result set mapping if (isset($xmlRoot->{'sql-result-set-mappings'})) { foreach ($xmlRoot->{'sql-result-set-mappings'}->{'sql-result-set-mapping'} as $rsmElement) { - $entities = array(); - $columns = array(); + $entities = []; + $columns = []; foreach ($rsmElement as $entityElement) { // if (isset($entityElement['entity-class'])) { - $entityResult = array( - 'fields' => array(), + $entityResult = [ + 'fields' => [], 'entityClass' => (string) $entityElement['entity-class'], 'discriminatorColumn' => isset($entityElement['discriminator-column']) ? (string) $entityElement['discriminator-column'] : null, - ); + ]; foreach ($entityElement as $fieldElement) { - $entityResult['fields'][] = array( + $entityResult['fields'][] = [ 'name' => isset($fieldElement['name']) ? (string) $fieldElement['name'] : null, 'column' => isset($fieldElement['column']) ? (string) $fieldElement['column'] : null, - ); + ]; } $entities[] = $entityResult; @@ -141,17 +145,19 @@ class XmlDriver extends FileDriver // if (isset($entityElement['name'])) { - $columns[] = array( + $columns[] = [ 'name' => (string) $entityElement['name'], - ); + ]; } } - $metadata->addSqlResultSetMapping(array( - 'name' => (string) $rsmElement['name'], - 'entities' => $entities, - 'columns' => $columns - )); + $metadata->addSqlResultSetMapping( + [ + 'name' => (string) $rsmElement['name'], + 'entities' => $entities, + 'columns' => $columns + ] + ); } } @@ -163,19 +169,21 @@ class XmlDriver extends FileDriver // Evaluate if (isset($xmlRoot->{'discriminator-column'})) { $discrColumn = $xmlRoot->{'discriminator-column'}; - $metadata->setDiscriminatorColumn(array( - 'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null, - 'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string', - 'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255, - 'columnDefinition' => isset($discrColumn['column-definition']) ? (string) $discrColumn['column-definition'] : null - )); + $metadata->setDiscriminatorColumn( + [ + 'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null, + 'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string', + 'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255, + 'columnDefinition' => isset($discrColumn['column-definition']) ? (string) $discrColumn['column-definition'] : null + ] + ); } else { - $metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255)); + $metadata->setDiscriminatorColumn(['name' => 'dtype', 'type' => 'string', 'length' => 255]); } // Evaluate if (isset($xmlRoot->{'discriminator-map'})) { - $map = array(); + $map = []; foreach ($xmlRoot->{'discriminator-map'}->{'discriminator-mapping'} as $discrMapElement) { $map[(string) $discrMapElement['value']] = (string) $discrMapElement['class']; } @@ -193,9 +201,9 @@ class XmlDriver extends FileDriver // Evaluate if (isset($xmlRoot->indexes)) { - $metadata->table['indexes'] = array(); + $metadata->table['indexes'] = []; foreach ($xmlRoot->indexes->index as $indexXml) { - $index = array('columns' => explode(',', (string) $indexXml['columns'])); + $index = ['columns' => explode(',', (string) $indexXml['columns'])]; if (isset($indexXml['flags'])) { $index['flags'] = explode(',', (string) $indexXml['flags']); @@ -215,10 +223,9 @@ class XmlDriver extends FileDriver // Evaluate if (isset($xmlRoot->{'unique-constraints'})) { - $metadata->table['uniqueConstraints'] = array(); + $metadata->table['uniqueConstraints'] = []; foreach ($xmlRoot->{'unique-constraints'}->{'unique-constraint'} as $uniqueXml) { - $unique = array('columns' => explode(',', (string) $uniqueXml['columns'])); - + $unique = ['columns' => explode(',', (string) $uniqueXml['columns'])]; if (isset($uniqueXml->options)) { $unique['options'] = $this->_parseOptions($uniqueXml->options->children()); @@ -238,7 +245,7 @@ class XmlDriver extends FileDriver // The mapping assignment is done in 2 times as a bug might occurs on some php/xml lib versions // The internal SimpleXmlIterator get resetted, to this generate a duplicate field exception - $mappings = array(); + $mappings = []; // Evaluate mappings if (isset($xmlRoot->field)) { foreach ($xmlRoot->field as $fieldMapping) { @@ -263,11 +270,11 @@ class XmlDriver extends FileDriver ? $this->evaluateBoolean($embeddedMapping['use-column-prefix']) : true; - $mapping = array( + $mapping = [ 'fieldName' => (string) $embeddedMapping['name'], 'class' => (string) $embeddedMapping['class'], 'columnPrefix' => $useColumnPrefix ? $columnPrefix : false - ); + ]; $metadata->mapEmbedded($mapping); } @@ -282,17 +289,17 @@ class XmlDriver extends FileDriver } // Evaluate mappings - $associationIds = array(); + $associationIds = []; foreach ($xmlRoot->id as $idElement) { if (isset($idElement['association-key']) && $this->evaluateBoolean($idElement['association-key'])) { $associationIds[(string) $idElement['name']] = true; continue; } - $mapping = array( + $mapping = [ 'id' => true, 'fieldName' => (string) $idElement['name'] - ); + ]; if (isset($idElement['type'])) { $mapping['type'] = (string) $idElement['type']; @@ -326,16 +333,20 @@ class XmlDriver extends FileDriver // Check for SequenceGenerator/TableGenerator definition if (isset($idElement->{'sequence-generator'})) { $seqGenerator = $idElement->{'sequence-generator'}; - $metadata->setSequenceGeneratorDefinition(array( - 'sequenceName' => (string) $seqGenerator['sequence-name'], - 'allocationSize' => (string) $seqGenerator['allocation-size'], - 'initialValue' => (string) $seqGenerator['initial-value'] - )); + $metadata->setSequenceGeneratorDefinition( + [ + 'sequenceName' => (string) $seqGenerator['sequence-name'], + 'allocationSize' => (string) $seqGenerator['allocation-size'], + 'initialValue' => (string) $seqGenerator['initial-value'] + ] + ); } else if (isset($idElement->{'custom-id-generator'})) { $customGenerator = $idElement->{'custom-id-generator'}; - $metadata->setCustomGeneratorDefinition(array( - 'class' => (string) $customGenerator['class'] - )); + $metadata->setCustomGeneratorDefinition( + [ + 'class' => (string) $customGenerator['class'] + ] + ); } else if (isset($idElement->{'table-generator'})) { throw MappingException::tableIdGeneratorNotImplemented($className); } @@ -344,10 +355,10 @@ class XmlDriver extends FileDriver // Evaluate mappings if (isset($xmlRoot->{'one-to-one'})) { foreach ($xmlRoot->{'one-to-one'} as $oneToOneElement) { - $mapping = array( + $mapping = [ 'fieldName' => (string) $oneToOneElement['field'], 'targetEntity' => (string) $oneToOneElement['target-entity'] - ); + ]; if (isset($associationIds[$mapping['fieldName']])) { $mapping['id'] = true; @@ -363,7 +374,7 @@ class XmlDriver extends FileDriver if (isset($oneToOneElement['inversed-by'])) { $mapping['inversedBy'] = (string) $oneToOneElement['inversed-by']; } - $joinColumns = array(); + $joinColumns = []; if (isset($oneToOneElement->{'join-column'})) { $joinColumns[] = $this->joinColumnToArray($oneToOneElement->{'join-column'}); @@ -396,11 +407,11 @@ class XmlDriver extends FileDriver // Evaluate mappings if (isset($xmlRoot->{'one-to-many'})) { foreach ($xmlRoot->{'one-to-many'} as $oneToManyElement) { - $mapping = array( + $mapping = [ 'fieldName' => (string) $oneToManyElement['field'], 'targetEntity' => (string) $oneToManyElement['target-entity'], 'mappedBy' => (string) $oneToManyElement['mapped-by'] - ); + ]; if (isset($oneToManyElement['fetch'])) { $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $oneToManyElement['fetch']); @@ -415,7 +426,7 @@ class XmlDriver extends FileDriver } if (isset($oneToManyElement->{'order-by'})) { - $orderBy = array(); + $orderBy = []; foreach ($oneToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) { $orderBy[(string) $orderByField['name']] = (string) $orderByField['direction']; } @@ -440,10 +451,10 @@ class XmlDriver extends FileDriver // Evaluate mappings if (isset($xmlRoot->{'many-to-one'})) { foreach ($xmlRoot->{'many-to-one'} as $manyToOneElement) { - $mapping = array( + $mapping = [ 'fieldName' => (string) $manyToOneElement['field'], 'targetEntity' => (string) $manyToOneElement['target-entity'] - ); + ]; if (isset($associationIds[$mapping['fieldName']])) { $mapping['id'] = true; @@ -457,7 +468,7 @@ class XmlDriver extends FileDriver $mapping['inversedBy'] = (string) $manyToOneElement['inversed-by']; } - $joinColumns = array(); + $joinColumns = []; if (isset($manyToOneElement->{'join-column'})) { $joinColumns[] = $this->joinColumnToArray($manyToOneElement->{'join-column'}); @@ -486,10 +497,10 @@ class XmlDriver extends FileDriver // Evaluate mappings if (isset($xmlRoot->{'many-to-many'})) { foreach ($xmlRoot->{'many-to-many'} as $manyToManyElement) { - $mapping = array( + $mapping = [ 'fieldName' => (string) $manyToManyElement['field'], 'targetEntity' => (string) $manyToManyElement['target-entity'] - ); + ]; if (isset($manyToManyElement['fetch'])) { $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $manyToManyElement['fetch']); @@ -507,9 +518,9 @@ class XmlDriver extends FileDriver } $joinTableElement = $manyToManyElement->{'join-table'}; - $joinTable = array( + $joinTable = [ 'name' => (string) $joinTableElement['name'] - ); + ]; if (isset($joinTableElement['schema'])) { $joinTable['schema'] = (string) $joinTableElement['schema']; @@ -531,7 +542,7 @@ class XmlDriver extends FileDriver } if (isset($manyToManyElement->{'order-by'})) { - $orderBy = array(); + $orderBy = []; foreach ($manyToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) { $orderBy[(string) $orderByField['name']] = (string) $orderByField['direction']; } @@ -569,11 +580,11 @@ class XmlDriver extends FileDriver if (isset($xmlRoot->{'association-overrides'})) { foreach ($xmlRoot->{'association-overrides'}->{'association-override'} as $overrideElement) { $fieldName = (string) $overrideElement['name']; - $override = array(); + $override = []; // Check for join-columns if (isset($overrideElement->{'join-columns'})) { - $joinColumns = array(); + $joinColumns = []; foreach ($overrideElement->{'join-columns'}->{'join-column'} as $joinColumnElement) { $joinColumns[] = $this->joinColumnToArray($joinColumnElement); } @@ -585,10 +596,10 @@ class XmlDriver extends FileDriver $joinTable = null; $joinTableElement = $overrideElement->{'join-table'}; - $joinTable = array( + $joinTable = [ 'name' => (string) $joinTableElement['name'], 'schema' => (string) $joinTableElement['schema'] - ); + ]; if (isset($joinTableElement->{'join-columns'})) { foreach ($joinTableElement->{'join-columns'}->{'join-column'} as $joinColumnElement) { @@ -651,7 +662,7 @@ class XmlDriver extends FileDriver */ private function _parseOptions(SimpleXMLElement $options) { - $array = array(); + $array = []; /* @var $option SimpleXMLElement */ foreach ($options as $option) { @@ -686,10 +697,10 @@ class XmlDriver extends FileDriver */ private function joinColumnToArray(SimpleXMLElement $joinColumnElement) { - $joinColumn = array( + $joinColumn = [ 'name' => (string) $joinColumnElement['name'], 'referencedColumnName' => (string) $joinColumnElement['referenced-column-name'] - ); + ]; if (isset($joinColumnElement['unique'])) { $joinColumn['unique'] = $this->evaluateBoolean($joinColumnElement['unique']); @@ -719,9 +730,9 @@ class XmlDriver extends FileDriver */ private function columnToArray(SimpleXMLElement $fieldMapping) { - $mapping = array( + $mapping = [ 'fieldName' => (string) $fieldMapping['name'], - ); + ]; if (isset($fieldMapping['type'])) { $mapping['type'] = (string) $fieldMapping['type']; @@ -786,10 +797,10 @@ class XmlDriver extends FileDriver $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage); } - return array( + return [ 'usage' => $usage, 'region' => $region, - ); + ]; } /** @@ -801,7 +812,7 @@ class XmlDriver extends FileDriver */ private function _getCascadeMappings(SimpleXMLElement $cascadeElement) { - $cascades = array(); + $cascades = []; /* @var $action SimpleXmlElement */ foreach ($cascadeElement->children() as $action) { // According to the JPA specifications, XML uses "cascade-persist" @@ -820,7 +831,7 @@ class XmlDriver extends FileDriver */ protected function loadMappingFile($file) { - $result = array(); + $result = []; $xmlElement = simplexml_load_file($file); if (isset($xmlElement->entity)) { diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index fe406785f..8793c070b 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -73,7 +73,7 @@ class YamlDriver extends FileDriver } // Evaluate root level properties - $primaryTable = array(); + $primaryTable = []; if (isset($element['table'])) { $primaryTable['name'] = $element['table']; @@ -94,7 +94,7 @@ class YamlDriver extends FileDriver if (isset($element['namedQueries'])) { foreach ($element['namedQueries'] as $name => $queryMapping) { if (is_string($queryMapping)) { - $queryMapping = array('query' => $queryMapping); + $queryMapping = ['query' => $queryMapping]; } if ( ! isset($queryMapping['name'])) { @@ -111,12 +111,14 @@ class YamlDriver extends FileDriver if (!isset($mappingElement['name'])) { $mappingElement['name'] = $name; } - $metadata->addNamedNativeQuery(array( - 'name' => $mappingElement['name'], - 'query' => isset($mappingElement['query']) ? $mappingElement['query'] : null, - 'resultClass' => isset($mappingElement['resultClass']) ? $mappingElement['resultClass'] : null, - 'resultSetMapping' => isset($mappingElement['resultSetMapping']) ? $mappingElement['resultSetMapping'] : null, - )); + $metadata->addNamedNativeQuery( + [ + 'name' => $mappingElement['name'], + 'query' => isset($mappingElement['query']) ? $mappingElement['query'] : null, + 'resultClass' => isset($mappingElement['resultClass']) ? $mappingElement['resultClass'] : null, + 'resultSetMapping' => isset($mappingElement['resultSetMapping']) ? $mappingElement['resultSetMapping'] : null, + ] + ); } } @@ -127,22 +129,22 @@ class YamlDriver extends FileDriver $resultSetMapping['name'] = $name; } - $entities = array(); - $columns = array(); + $entities = []; + $columns = []; if (isset($resultSetMapping['entityResult'])) { foreach ($resultSetMapping['entityResult'] as $entityResultElement) { - $entityResult = array( - 'fields' => array(), + $entityResult = [ + 'fields' => [], 'entityClass' => isset($entityResultElement['entityClass']) ? $entityResultElement['entityClass'] : null, 'discriminatorColumn' => isset($entityResultElement['discriminatorColumn']) ? $entityResultElement['discriminatorColumn'] : null, - ); + ]; if (isset($entityResultElement['fieldResult'])) { foreach ($entityResultElement['fieldResult'] as $fieldResultElement) { - $entityResult['fields'][] = array( + $entityResult['fields'][] = [ 'name' => isset($fieldResultElement['name']) ? $fieldResultElement['name'] : null, 'column' => isset($fieldResultElement['column']) ? $fieldResultElement['column'] : null, - ); + ]; } } @@ -153,17 +155,19 @@ class YamlDriver extends FileDriver if (isset($resultSetMapping['columnResult'])) { foreach ($resultSetMapping['columnResult'] as $columnResultAnnot) { - $columns[] = array( + $columns[] = [ 'name' => isset($columnResultAnnot['name']) ? $columnResultAnnot['name'] : null, - ); + ]; } } - $metadata->addSqlResultSetMapping(array( - 'name' => $resultSetMapping['name'], - 'entities' => $entities, - 'columns' => $columns - )); + $metadata->addSqlResultSetMapping( + [ + 'name' => $resultSetMapping['name'], + 'entities' => $entities, + 'columns' => $columns + ] + ); } } @@ -174,14 +178,16 @@ class YamlDriver extends FileDriver // Evaluate discriminatorColumn if (isset($element['discriminatorColumn'])) { $discrColumn = $element['discriminatorColumn']; - $metadata->setDiscriminatorColumn(array( - 'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null, - 'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string', - 'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255, - 'columnDefinition' => isset($discrColumn['columnDefinition']) ? (string) $discrColumn['columnDefinition'] : null - )); + $metadata->setDiscriminatorColumn( + [ + 'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null, + 'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string', + 'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255, + 'columnDefinition' => isset($discrColumn['columnDefinition']) ? (string) $discrColumn['columnDefinition'] : null + ] + ); } else { - $metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255)); + $metadata->setDiscriminatorColumn(['name' => 'dtype', 'type' => 'string', 'length' => 255]); } // Evaluate discriminatorMap @@ -206,9 +212,9 @@ class YamlDriver extends FileDriver } if (is_string($indexYml['columns'])) { - $index = array('columns' => array_map('trim', explode(',', $indexYml['columns']))); + $index = ['columns' => array_map('trim', explode(',', $indexYml['columns']))]; } else { - $index = array('columns' => $indexYml['columns']); + $index = ['columns' => $indexYml['columns']]; } if (isset($indexYml['flags'])) { @@ -235,9 +241,9 @@ class YamlDriver extends FileDriver } if (is_string($uniqueYml['columns'])) { - $unique = array('columns' => array_map('trim', explode(',', $uniqueYml['columns']))); + $unique = ['columns' => array_map('trim', explode(',', $uniqueYml['columns']))]; } else { - $unique = array('columns' => $uniqueYml['columns']); + $unique = ['columns' => $uniqueYml['columns']]; } if (isset($uniqueYml['options'])) { @@ -252,7 +258,7 @@ class YamlDriver extends FileDriver $metadata->table['options'] = $element['options']; } - $associationIds = array(); + $associationIds = []; if (isset($element['id'])) { // Evaluate identifier settings foreach ($element['id'] as $name => $idElement) { @@ -261,10 +267,10 @@ class YamlDriver extends FileDriver continue; } - $mapping = array( + $mapping = [ 'id' => true, 'fieldName' => $name - ); + ]; if (isset($idElement['type'])) { $mapping['type'] = $idElement['type']; @@ -297,9 +303,11 @@ class YamlDriver extends FileDriver $metadata->setSequenceGeneratorDefinition($idElement['sequenceGenerator']); } else if (isset($idElement['customIdGenerator'])) { $customGenerator = $idElement['customIdGenerator']; - $metadata->setCustomGeneratorDefinition(array( - 'class' => (string) $customGenerator['class'] - )); + $metadata->setCustomGeneratorDefinition( + [ + 'class' => (string) $customGenerator['class'] + ] + ); } else if (isset($idElement['tableGenerator'])) { throw MappingException::tableIdGeneratorNotImplemented($className); } @@ -331,11 +339,11 @@ class YamlDriver extends FileDriver if (isset($element['embedded'])) { foreach ($element['embedded'] as $name => $embeddedMapping) { - $mapping = array( + $mapping = [ 'fieldName' => $name, 'class' => $embeddedMapping['class'], 'columnPrefix' => isset($embeddedMapping['columnPrefix']) ? $embeddedMapping['columnPrefix'] : null, - ); + ]; $metadata->mapEmbedded($mapping); } } @@ -343,10 +351,10 @@ class YamlDriver extends FileDriver // Evaluate oneToOne relationships if (isset($element['oneToOne'])) { foreach ($element['oneToOne'] as $name => $oneToOneElement) { - $mapping = array( + $mapping = [ 'fieldName' => $name, 'targetEntity' => $oneToOneElement['targetEntity'] - ); + ]; if (isset($associationIds[$mapping['fieldName']])) { $mapping['id'] = true; @@ -363,7 +371,7 @@ class YamlDriver extends FileDriver $mapping['inversedBy'] = $oneToOneElement['inversedBy']; } - $joinColumns = array(); + $joinColumns = []; if (isset($oneToOneElement['joinColumn'])) { $joinColumns[] = $this->joinColumnToArray($oneToOneElement['joinColumn']); @@ -400,11 +408,11 @@ class YamlDriver extends FileDriver // Evaluate oneToMany relationships if (isset($element['oneToMany'])) { foreach ($element['oneToMany'] as $name => $oneToManyElement) { - $mapping = array( + $mapping = [ 'fieldName' => $name, 'targetEntity' => $oneToManyElement['targetEntity'], 'mappedBy' => $oneToManyElement['mappedBy'] - ); + ]; if (isset($oneToManyElement['fetch'])) { $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']); @@ -439,10 +447,10 @@ class YamlDriver extends FileDriver // Evaluate manyToOne relationships if (isset($element['manyToOne'])) { foreach ($element['manyToOne'] as $name => $manyToOneElement) { - $mapping = array( + $mapping = [ 'fieldName' => $name, 'targetEntity' => $manyToOneElement['targetEntity'] - ); + ]; if (isset($associationIds[$mapping['fieldName']])) { $mapping['id'] = true; @@ -456,7 +464,7 @@ class YamlDriver extends FileDriver $mapping['inversedBy'] = $manyToOneElement['inversedBy']; } - $joinColumns = array(); + $joinColumns = []; if (isset($manyToOneElement['joinColumn'])) { $joinColumns[] = $this->joinColumnToArray($manyToOneElement['joinColumn']); @@ -488,10 +496,10 @@ class YamlDriver extends FileDriver // Evaluate manyToMany relationships if (isset($element['manyToMany'])) { foreach ($element['manyToMany'] as $name => $manyToManyElement) { - $mapping = array( + $mapping = [ 'fieldName' => $name, 'targetEntity' => $manyToManyElement['targetEntity'] - ); + ]; if (isset($manyToManyElement['fetch'])) { $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']); @@ -502,9 +510,9 @@ class YamlDriver extends FileDriver } else if (isset($manyToManyElement['joinTable'])) { $joinTableElement = $manyToManyElement['joinTable']; - $joinTable = array( + $joinTable = [ 'name' => $joinTableElement['name'] - ); + ]; if (isset($joinTableElement['schema'])) { $joinTable['schema'] = $joinTableElement['schema']; @@ -564,11 +572,11 @@ class YamlDriver extends FileDriver if (isset($element['associationOverride']) && is_array($element['associationOverride'])) { foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) { - $override = array(); + $override = []; // Check for joinColumn if (isset($associationOverrideElement['joinColumn'])) { - $joinColumns = array(); + $joinColumns = []; foreach ($associationOverrideElement['joinColumn'] as $name => $joinColumnElement) { if ( ! isset($joinColumnElement['name'])) { $joinColumnElement['name'] = $name; @@ -582,9 +590,9 @@ class YamlDriver extends FileDriver if (isset($associationOverrideElement['joinTable'])) { $joinTableElement = $associationOverrideElement['joinTable']; - $joinTable = array( + $joinTable = [ 'name' => $joinTableElement['name'] - ); + ]; if (isset($joinTableElement['schema'])) { $joinTable['schema'] = $joinTableElement['schema']; @@ -665,7 +673,7 @@ class YamlDriver extends FileDriver */ private function joinColumnToArray($joinColumnElement) { - $joinColumn = array(); + $joinColumn = []; if (isset($joinColumnElement['referencedColumnName'])) { $joinColumn['referencedColumnName'] = (string) $joinColumnElement['referencedColumnName']; } @@ -707,9 +715,9 @@ class YamlDriver extends FileDriver */ private function columnToArray($fieldName, $column) { - $mapping = array( + $mapping = [ 'fieldName' => $fieldName - ); + ]; if (isset($column['type'])) { $params = explode('(', $column['type']); @@ -781,10 +789,10 @@ class YamlDriver extends FileDriver $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage); } - return array( + return [ 'usage' => $usage, 'region' => $region, - ); + ]; } /** diff --git a/lib/Doctrine/ORM/Mapping/EntityListeners.php b/lib/Doctrine/ORM/Mapping/EntityListeners.php index d9478a497..ae6c9126b 100644 --- a/lib/Doctrine/ORM/Mapping/EntityListeners.php +++ b/lib/Doctrine/ORM/Mapping/EntityListeners.php @@ -37,5 +37,5 @@ final class EntityListeners implements Annotation * * @var array */ - public $value = array(); -} \ No newline at end of file + public $value = []; +} diff --git a/lib/Doctrine/ORM/Mapping/EntityResult.php b/lib/Doctrine/ORM/Mapping/EntityResult.php index 63bbed22f..d8b05730a 100644 --- a/lib/Doctrine/ORM/Mapping/EntityResult.php +++ b/lib/Doctrine/ORM/Mapping/EntityResult.php @@ -45,7 +45,7 @@ final class EntityResult implements Annotation * * @var array<\Doctrine\ORM\Mapping\FieldResult> */ - public $fields = array(); + public $fields = []; /** * Specifies the column name of the column in the SELECT list that is used to determine the type of the entity instance. diff --git a/lib/Doctrine/ORM/Mapping/JoinTable.php b/lib/Doctrine/ORM/Mapping/JoinTable.php index 8a440c614..879316a28 100644 --- a/lib/Doctrine/ORM/Mapping/JoinTable.php +++ b/lib/Doctrine/ORM/Mapping/JoinTable.php @@ -38,10 +38,10 @@ final class JoinTable implements Annotation /** * @var array<\Doctrine\ORM\Mapping\JoinColumn> */ - public $joinColumns = array(); + public $joinColumns = []; /** * @var array<\Doctrine\ORM\Mapping\JoinColumn> */ - public $inverseJoinColumns = array(); + public $inverseJoinColumns = []; } diff --git a/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php b/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php index 7f5460a81..2539107af 100644 --- a/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php +++ b/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php @@ -25,7 +25,7 @@ namespace Doctrine\ORM\Mapping; * * @author Fabio B. Silva * @since 2.3 - * + * * @Annotation * @Target("CLASS") */ @@ -36,5 +36,5 @@ final class NamedNativeQueries implements Annotation * * @var array<\Doctrine\ORM\Mapping\NamedNativeQuery> */ - public $value = array(); + public $value = []; } diff --git a/lib/Doctrine/ORM/Mapping/SqlResultSetMapping.php b/lib/Doctrine/ORM/Mapping/SqlResultSetMapping.php index f5ead7c0f..cb78c9a40 100644 --- a/lib/Doctrine/ORM/Mapping/SqlResultSetMapping.php +++ b/lib/Doctrine/ORM/Mapping/SqlResultSetMapping.php @@ -33,22 +33,22 @@ final class SqlResultSetMapping implements Annotation { /** * The name given to the result set mapping, and used to refer to it in the methods of the Query API. - * + * * @var string */ public $name; /** * Specifies the result set mapping to entities. - * + * * @var array<\Doctrine\ORM\Mapping\EntityResult> */ - public $entities = array(); + public $entities = []; /** * Specifies the result set mapping to scalar values. * * @var array<\Doctrine\ORM\Mapping\ColumnResult> */ - public $columns = array(); + public $columns = []; } diff --git a/lib/Doctrine/ORM/Mapping/SqlResultSetMappings.php b/lib/Doctrine/ORM/Mapping/SqlResultSetMappings.php index c21b2ab82..0b74f2d95 100644 --- a/lib/Doctrine/ORM/Mapping/SqlResultSetMappings.php +++ b/lib/Doctrine/ORM/Mapping/SqlResultSetMappings.php @@ -25,7 +25,7 @@ namespace Doctrine\ORM\Mapping; * * @author Fabio B. Silva * @since 2.3 - * + * * @Annotation * @Target("CLASS") */ @@ -36,5 +36,5 @@ final class SqlResultSetMappings implements Annotation * * @var array<\Doctrine\ORM\Mapping\SqlResultSetMapping> */ - public $value = array(); + public $value = []; } diff --git a/lib/Doctrine/ORM/Mapping/Table.php b/lib/Doctrine/ORM/Mapping/Table.php index f9f8d4a65..6ed703750 100644 --- a/lib/Doctrine/ORM/Mapping/Table.php +++ b/lib/Doctrine/ORM/Mapping/Table.php @@ -48,5 +48,5 @@ final class Table implements Annotation /** * @var array */ - public $options = array(); + public $options = []; } diff --git a/lib/Doctrine/ORM/NativeQuery.php b/lib/Doctrine/ORM/NativeQuery.php index b19f81805..ddc5418d6 100644 --- a/lib/Doctrine/ORM/NativeQuery.php +++ b/lib/Doctrine/ORM/NativeQuery.php @@ -63,8 +63,8 @@ final class NativeQuery extends AbstractQuery */ protected function _doExecute() { - $parameters = array(); - $types = array(); + $parameters = []; + $types = []; foreach ($this->getParameters() as $parameter) { $name = $parameter->getName(); diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index b5948149a..11205df04 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -49,7 +49,7 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec * * @var array */ - private $snapshot = array(); + private $snapshot = []; /** * The entity that owns this collection. @@ -585,7 +585,7 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec */ public function __sleep() { - return array('collection', 'initialized'); + return ['collection', 'initialized']; } /** @@ -633,7 +633,7 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec $this->initialize(); $this->owner = null; - $this->snapshot = array(); + $this->snapshot = []; $this->changed(); } @@ -695,7 +695,7 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec protected function doInitialize() { // Has NEW objects added through add(). Remember them. - $newObjects = array(); + $newObjects = []; if ($this->isDirty) { $newObjects = $this->collection->toArray(); diff --git a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php index 525ab34b3..ca8575d2a 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php @@ -47,7 +47,7 @@ class ManyToManyPersister extends AbstractCollectionPersister return; // ignore inverse side } - $types = array(); + $types = []; $class = $this->em->getClassMetadata($mapping['sourceEntity']); foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) { @@ -104,7 +104,7 @@ class ManyToManyPersister extends AbstractCollectionPersister ? $mapping['inversedBy'] : $mapping['mappedBy']; - return $persister->load(array($mappedKey => $collection->getOwner(), $mapping['indexBy'] => $index), null, $mapping, array(), 0, 1); + return $persister->load([$mappedKey => $collection->getOwner(), $mapping['indexBy'] => $index], null, $mapping, [], 0, 1); } /** @@ -112,9 +112,9 @@ class ManyToManyPersister extends AbstractCollectionPersister */ public function count(PersistentCollection $collection) { - $conditions = array(); - $params = array(); - $types = array(); + $conditions = []; + $params = []; + $types = []; $mapping = $collection->getMapping(); $id = $this->uow->getEntityIdentifier($collection->getOwner()); $sourceClass = $this->em->getClassMetadata($mapping['sourceEntity']); @@ -238,7 +238,7 @@ class ManyToManyPersister extends AbstractCollectionPersister $id = $this->uow->getEntityIdentifier($owner); $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); $onConditions = $this->getOnConditionSQL($mapping); - $whereClauses = $params = array(); + $whereClauses = $params = []; if ( ! $mapping['isOwningSide']) { $associationSourceClass = $targetClass; @@ -311,7 +311,7 @@ class ManyToManyPersister extends AbstractCollectionPersister $filterSql = $this->generateFilterConditionSQL($rootClass, 'te'); if ('' === $filterSql) { - return array('', ''); + return ['', '']; } // A join is needed if there is filtering on the target entity @@ -319,7 +319,7 @@ class ManyToManyPersister extends AbstractCollectionPersister $joinSql = ' JOIN ' . $tableName . ' te' . ' ON' . implode(' AND ', $this->getOnConditionSQL($mapping)); - return array($joinSql, $filterSql); + return [$joinSql, $filterSql]; } /** @@ -332,7 +332,7 @@ class ManyToManyPersister extends AbstractCollectionPersister */ protected function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias) { - $filterClauses = array(); + $filterClauses = []; foreach ($this->em->getFilters()->getEnabledFilters() as $filter) { if ($filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { @@ -363,7 +363,7 @@ class ManyToManyPersister extends AbstractCollectionPersister ? $association['joinTable']['inverseJoinColumns'] : $association['joinTable']['joinColumns']; - $conditions = array(); + $conditions = []; foreach ($joinColumns as $joinColumn) { $joinColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform); @@ -382,7 +382,7 @@ class ManyToManyPersister extends AbstractCollectionPersister */ protected function getDeleteSQL(PersistentCollection $collection) { - $columns = array(); + $columns = []; $mapping = $collection->getMapping(); $class = $this->em->getClassMetadata(get_class($collection->getOwner())); $joinTable = $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform); @@ -408,12 +408,12 @@ class ManyToManyPersister extends AbstractCollectionPersister // Optimization for single column identifier if (count($mapping['relationToSourceKeyColumns']) === 1) { - return array(reset($identifier)); + return [reset($identifier)]; } // Composite identifier $sourceClass = $this->em->getClassMetadata($mapping['sourceEntity']); - $params = array(); + $params = []; foreach ($mapping['relationToSourceKeyColumns'] as $columnName => $refColumnName) { $params[] = isset($sourceClass->fieldNames[$refColumnName]) @@ -437,8 +437,8 @@ class ManyToManyPersister extends AbstractCollectionPersister $mapping = $collection->getMapping(); $class = $this->em->getClassMetadata($mapping['sourceEntity']); $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); - $columns = array(); - $types = array(); + $columns = []; + $types = []; foreach ($mapping['joinTable']['joinColumns'] as $joinColumn) { $columns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); @@ -450,11 +450,11 @@ class ManyToManyPersister extends AbstractCollectionPersister $types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); } - return array( + return [ 'DELETE FROM ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform) . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?', $types, - ); + ]; } /** @@ -483,8 +483,8 @@ class ManyToManyPersister extends AbstractCollectionPersister */ protected function getInsertRowSQL(PersistentCollection $collection) { - $columns = array(); - $types = array(); + $columns = []; + $types = []; $mapping = $collection->getMapping(); $class = $this->em->getClassMetadata($mapping['sourceEntity']); $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); @@ -499,13 +499,13 @@ class ManyToManyPersister extends AbstractCollectionPersister $types[] = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); } - return array( + return [ 'INSERT INTO ' . $this->quoteStrategy->getJoinTableName($mapping, $class, $this->platform) . ' (' . implode(', ', $columns) . ')' . ' VALUES' . ' (' . implode(', ', array_fill(0, count($columns), '?')) . ')', $types, - ); + ]; } /** @@ -535,7 +535,7 @@ class ManyToManyPersister extends AbstractCollectionPersister */ private function collectJoinTableColumnParameters(PersistentCollection $collection, $element) { - $params = array(); + $params = []; $mapping = $collection->getMapping(); $isComposite = count($mapping['joinTableColumns']) > 2; @@ -602,14 +602,14 @@ class ManyToManyPersister extends AbstractCollectionPersister } $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $associationSourceClass, $this->platform). ' t'; - $whereClauses = array(); - $params = array(); - $types = array(); + $whereClauses = []; + $params = []; + $types = []; $joinNeeded = ! in_array($indexBy, $targetClass->identifier); if ($joinNeeded) { // extra join needed if indexBy is not a @id - $joinConditions = array(); + $joinConditions = []; foreach ($joinColumns as $joinTableColumn) { $joinConditions[] = 't.' . $joinTableColumn['name'] . ' = tr.' . $joinTableColumn['referencedColumnName']; @@ -650,7 +650,7 @@ class ManyToManyPersister extends AbstractCollectionPersister } } - return array($quotedJoinTable, $whereClauses, $params, $types); + return [$quotedJoinTable, $whereClauses, $params, $types]; } /** @@ -684,9 +684,9 @@ class ManyToManyPersister extends AbstractCollectionPersister } $quotedJoinTable = $this->quoteStrategy->getJoinTableName($mapping, $sourceClass, $this->platform); - $whereClauses = array(); - $params = array(); - $types = array(); + $whereClauses = []; + $params = []; + $types = []; foreach ($mapping['joinTableColumns'] as $joinTableColumn) { $whereClauses[] = ($addFilters ? 't.' : '') . $joinTableColumn . ' = ?'; @@ -716,7 +716,7 @@ class ManyToManyPersister extends AbstractCollectionPersister } } - return array($quotedJoinTable, $whereClauses, $params, $types); + return [$quotedJoinTable, $whereClauses, $params, $types]; } /** @@ -732,7 +732,7 @@ class ManyToManyPersister extends AbstractCollectionPersister $expression = $criteria->getWhereExpression(); if ($expression === null) { - return array(); + return []; } $valueVisitor = new SqlValueVisitor(); diff --git a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php index 0e2fda868..82115071f 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php @@ -83,13 +83,13 @@ class OneToManyPersister extends AbstractCollectionPersister $persister = $this->uow->getEntityPersister($mapping['targetEntity']); return $persister->load( - array( + [ $mapping['mappedBy'] => $collection->getOwner(), $mapping['indexBy'] => $index - ), + ], null, $mapping, - array(), + [], null, 1 ); @@ -249,10 +249,10 @@ class OneToManyPersister extends AbstractCollectionPersister $columnDefinitions = []; foreach ($idColumnNames as $idColumnName) { - $columnDefinitions[$idColumnName] = array( + $columnDefinitions[$idColumnName] = [ 'notnull' => true, 'type' => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $this->em)), - ); + ]; } $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable @@ -271,7 +271,7 @@ class OneToManyPersister extends AbstractCollectionPersister $numDeleted = $this->conn->executeUpdate($statement, $parameters); // 3) Delete records on each table in the hierarchy - $classNames = array_merge($targetClass->parentClasses, array($targetClass->name), $targetClass->subClasses); + $classNames = array_merge($targetClass->parentClasses, [$targetClass->name], $targetClass->subClasses); foreach (array_reverse($classNames) as $className) { $tableName = $this->quoteStrategy->getTableName($this->em->getClassMetadata($className), $this->platform); diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index d577df6d9..e3d0a165f 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -86,7 +86,7 @@ class BasicEntityPersister implements EntityPersister /** * @var array */ - static private $comparisonMap = array( + static private $comparisonMap = [ Comparison::EQ => '= %s', Comparison::IS => '= %s', Comparison::NEQ => '!= %s', @@ -97,7 +97,7 @@ class BasicEntityPersister implements EntityPersister Comparison::IN => 'IN (%s)', Comparison::NIN => 'NOT IN (%s)', Comparison::CONTAINS => 'LIKE %s', - ); + ]; /** * Metadata object that describes the mapping of the mapped entity class. @@ -132,7 +132,7 @@ class BasicEntityPersister implements EntityPersister * * @var array */ - protected $queuedInserts = array(); + protected $queuedInserts = []; /** * The map of column names to DBAL mapping types of all prepared columns used @@ -143,7 +143,7 @@ class BasicEntityPersister implements EntityPersister * @see prepareInsertData($entity) * @see prepareUpdateData($entity) */ - protected $columnTypes = array(); + protected $columnTypes = []; /** * The map of quoted column names. @@ -153,7 +153,7 @@ class BasicEntityPersister implements EntityPersister * @see prepareInsertData($entity) * @see prepareUpdateData($entity) */ - protected $quotedColumns = array(); + protected $quotedColumns = []; /** * The INSERT SQL statement used for entities handled by this persister. @@ -257,10 +257,10 @@ class BasicEntityPersister implements EntityPersister public function executeInserts() { if ( ! $this->queuedInserts) { - return array(); + return []; } - $postInsertIds = array(); + $postInsertIds = []; $idGenerator = $this->class->idGenerator; $isPostInsertId = $idGenerator->isPostInsertGenerator(); @@ -282,13 +282,13 @@ class BasicEntityPersister implements EntityPersister if ($isPostInsertId) { $generatedId = $idGenerator->generate($this->em, $entity); - $id = array( + $id = [ $this->class->identifier[0] => $generatedId - ); - $postInsertIds[] = array( + ]; + $postInsertIds[] = [ 'generatedId' => $generatedId, 'entity' => $entity, - ); + ]; } else { $id = $this->class->getIdentifierValues($entity); } @@ -299,7 +299,7 @@ class BasicEntityPersister implements EntityPersister } $stmt->closeCursor(); - $this->queuedInserts = array(); + $this->queuedInserts = []; return $postInsertIds; } @@ -389,9 +389,9 @@ class BasicEntityPersister implements EntityPersister */ protected final function updateTable($entity, $quotedTableName, array $updateData, $versioned = false) { - $set = array(); - $types = array(); - $params = array(); + $set = []; + $types = []; + $params = []; foreach ($updateData as $columnName => $value) { $placeholder = '?'; @@ -420,7 +420,7 @@ class BasicEntityPersister implements EntityPersister $types[] = $this->columnTypes[$columnName]; } - $where = array(); + $where = []; $identifier = $this->em->getUnitOfWork()->getEntityIdentifier($entity); foreach ($this->class->identifier as $idField) { @@ -503,9 +503,9 @@ class BasicEntityPersister implements EntityPersister $selfReferential = ($mapping['targetEntity'] == $mapping['sourceEntity']); $class = $this->class; $association = $mapping; - $otherColumns = array(); - $otherKeys = array(); - $keys = array(); + $otherColumns = []; + $otherKeys = []; + $keys = []; if ( ! $mapping['isOwningSide']) { $class = $this->em->getClassMetadata($mapping['targetEntity']); @@ -603,7 +603,7 @@ class BasicEntityPersister implements EntityPersister protected function prepareUpdateData($entity) { $versionField = null; - $result = array(); + $result = []; $uow = $this->em->getUnitOfWork(); if (($versioned = $this->class->isVersioned) != false) { @@ -646,7 +646,7 @@ class BasicEntityPersister implements EntityPersister // The associated entity $newVal is not yet persisted, so we must // set $newVal = null, in order to insert a null value and schedule an // extra update on the UnitOfWork. - $uow->scheduleExtraUpdate($entity, array($field => array(null, $newVal))); + $uow->scheduleExtraUpdate($entity, [$field => [null, $newVal]]); $newVal = null; } @@ -705,7 +705,7 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritdoc} */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = null, $limit = null, array $orderBy = null) + public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = null, $limit = null, array $orderBy = null) { $this->switchPersisterContext(null, $limit); @@ -735,7 +735,7 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritdoc} */ - public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = array()) + public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = []) { if (($foundEntity = $this->em->getUnitOfWork()->tryGetById($identifier, $assoc['targetEntity'])) != false) { return $foundEntity; @@ -748,7 +748,7 @@ class BasicEntityPersister implements EntityPersister // Mark inverse side as fetched in the hints, otherwise the UoW would // try to load it in a separate query (remember: to-one inverse sides can not be lazy). - $hints = array(); + $hints = []; if ($isInverseSingleValued) { $hints['fetched']["r"][$assoc['inversedBy']] = true; @@ -808,13 +808,13 @@ class BasicEntityPersister implements EntityPersister $stmt = $this->conn->executeQuery($sql, $params, $types); $hydrator = $this->em->newHydrator(Query::HYDRATE_OBJECT); - $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, array(Query::HINT_REFRESH => true)); + $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, [Query::HINT_REFRESH => true]); } /** * {@inheritDoc} */ - public function count($criteria = array()) + public function count($criteria = []) { $sql = $this->getCountSQL($criteria); @@ -840,7 +840,8 @@ class BasicEntityPersister implements EntityPersister $stmt = $this->conn->executeQuery($query, $params, $types); $hydrator = $this->em->newHydrator(($this->currentPersisterContext->selectJoinSql) ? Query::HYDRATE_OBJECT : Query::HYDRATE_SIMPLEOBJECT); - return $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, array(UnitOfWork::HINT_DEFEREAGERLOAD => true)); + return $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, [UnitOfWork::HINT_DEFEREAGERLOAD => true] + ); } /** @@ -849,11 +850,11 @@ class BasicEntityPersister implements EntityPersister public function expandCriteriaParameters(Criteria $criteria) { $expression = $criteria->getWhereExpression(); - $sqlParams = array(); - $sqlTypes = array(); + $sqlParams = []; + $sqlTypes = []; if ($expression === null) { - return array($sqlParams, $sqlTypes); + return [$sqlParams, $sqlTypes]; } $valueVisitor = new SqlValueVisitor(); @@ -871,13 +872,13 @@ class BasicEntityPersister implements EntityPersister $sqlTypes = array_merge($sqlTypes, $this->getTypes($field, $value, $this->class)); } - return array($sqlParams, $sqlTypes); + return [$sqlParams, $sqlTypes]; } /** * {@inheritdoc} */ - public function loadAll(array $criteria = array(), array $orderBy = null, $limit = null, $offset = null) + public function loadAll(array $criteria = [], array $orderBy = null, $limit = null, $offset = null) { $this->switchPersisterContext($offset, $limit); @@ -887,7 +888,8 @@ class BasicEntityPersister implements EntityPersister $hydrator = $this->em->newHydrator(($this->currentPersisterContext->selectJoinSql) ? Query::HYDRATE_OBJECT : Query::HYDRATE_SIMPLEOBJECT); - return $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, array(UnitOfWork::HINT_DEFEREAGERLOAD => true)); + return $hydrator->hydrateAll($stmt, $this->currentPersisterContext->rsm, [UnitOfWork::HINT_DEFEREAGERLOAD => true] + ); } /** @@ -913,7 +915,7 @@ class BasicEntityPersister implements EntityPersister private function loadArrayFromStatement($assoc, $stmt) { $rsm = $this->currentPersisterContext->rsm; - $hints = array(UnitOfWork::HINT_DEFEREAGERLOAD => true); + $hints = [UnitOfWork::HINT_DEFEREAGERLOAD => true]; if (isset($assoc['indexBy'])) { $rsm = clone ($this->currentPersisterContext->rsm); // this is necessary because the "default rsm" should be changed. @@ -935,10 +937,10 @@ class BasicEntityPersister implements EntityPersister private function loadCollectionFromStatement($assoc, $stmt, $coll) { $rsm = $this->currentPersisterContext->rsm; - $hints = array( + $hints = [ UnitOfWork::HINT_DEFEREAGERLOAD => true, 'collection' => $coll - ); + ]; if (isset($assoc['indexBy'])) { $rsm = clone ($this->currentPersisterContext->rsm); // this is necessary because the "default rsm" should be changed. @@ -975,8 +977,8 @@ class BasicEntityPersister implements EntityPersister $sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']); $class = $sourceClass; $association = $assoc; - $criteria = array(); - $parameters = array(); + $criteria = []; + $parameters = []; if ( ! $assoc['isOwningSide']) { $class = $this->em->getClassMetadata($assoc['targetEntity']); @@ -1018,11 +1020,11 @@ class BasicEntityPersister implements EntityPersister } $criteria[$quotedJoinTable . '.' . $quotedKeyColumn] = $value; - $parameters[] = array( + $parameters[] = [ 'value' => $value, 'field' => $field, 'class' => $sourceClass, - ); + ]; } $sql = $this->getSelectSQL($criteria, $assoc, null, $limit, $offset); @@ -1096,7 +1098,7 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritDoc} */ - public function getCountSQL($criteria = array()) + public function getCountSQL($criteria = []) { $tableName = $this->quoteStrategy->getTableName($this->class, $this->platform); $tableAlias = $this->getSQLTableAlias($this->class->name); @@ -1132,7 +1134,7 @@ class BasicEntityPersister implements EntityPersister */ protected final function getOrderBySQL(array $orderBy, $baseTableAlias) { - $orderByList = array(); + $orderByList = []; foreach ($orderBy as $fieldName => $orientation) { @@ -1194,7 +1196,7 @@ class BasicEntityPersister implements EntityPersister return $this->currentPersisterContext->selectColumnListSql; } - $columnList = array(); + $columnList = []; $this->currentPersisterContext->rsm->addEntityResult($this->class->name, 'r'); // r for root // Add regular columns to select list @@ -1247,7 +1249,7 @@ class BasicEntityPersister implements EntityPersister } $association = $assoc; - $joinCondition = array(); + $joinCondition = []; if (isset($assoc['indexBy'])) { $this->currentPersisterContext->rsm->addIndexBy($assocAlias, $assoc['indexBy']); @@ -1315,7 +1317,7 @@ class BasicEntityPersister implements EntityPersister return ''; } - $columnList = array(); + $columnList = []; $targetClass = $this->em->getClassMetadata($assoc['targetEntity']); $isIdentifier = isset($assoc['id']) && $assoc['id'] === true; $sqlTableAlias = $this->getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias)); @@ -1343,7 +1345,7 @@ class BasicEntityPersister implements EntityPersister */ protected function getSelectManyToManyJoinSQL(array $manyToMany) { - $conditions = array(); + $conditions = []; $association = $manyToMany; $sourceTableAlias = $this->getSQLTableAlias($this->class->name); @@ -1385,7 +1387,7 @@ class BasicEntityPersister implements EntityPersister return $this->insertSql; } - $values = array(); + $values = []; $columns = array_unique($columns); foreach ($columns as $column) { @@ -1419,7 +1421,7 @@ class BasicEntityPersister implements EntityPersister */ protected function getInsertColumnList() { - $columns = array(); + $columns = []; foreach ($this->class->reflFields as $name => $field) { if ($this->class->isVersioned && $this->class->versionField == $name) { @@ -1579,7 +1581,7 @@ class BasicEntityPersister implements EntityPersister */ public function getSelectConditionStatementSQL($field, $value, $assoc = null, $comparison = null) { - $selectedColumns = array(); + $selectedColumns = []; $columns = $this->getSelectConditionStatementColumnSQL($field, $assoc); if (count($columns) > 1 && $comparison === Comparison::IN) { @@ -1660,13 +1662,13 @@ class BasicEntityPersister implements EntityPersister ? $this->class->fieldMappings[$field]['inherited'] : $this->class->name; - return array($this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getColumnName($field, $this->class, $this->platform)); + return [$this->getSQLTableAlias($className) . '.' . $this->quoteStrategy->getColumnName($field, $this->class, $this->platform)]; } if (isset($this->class->associationMappings[$field])) { $association = $this->class->associationMappings[$field]; // Many-To-Many requires join table check for joinColumn - $columns = array(); + $columns = []; $class = $this->class; if ($association['type'] === ClassMetadata::MANY_TO_MANY) { @@ -1705,7 +1707,7 @@ class BasicEntityPersister implements EntityPersister // therefore checking for spaces and function calls which are not allowed. // found a join column condition, not really a "field" - return array($field); + return [$field]; } throw ORMException::unrecognizedField($field); @@ -1725,7 +1727,7 @@ class BasicEntityPersister implements EntityPersister */ protected function getSelectConditionSQL(array $criteria, $assoc = null) { - $conditions = array(); + $conditions = []; foreach ($criteria as $field => $value) { $conditions[] = $this->getSelectConditionStatementSQL($field, $value, $assoc); @@ -1770,8 +1772,8 @@ class BasicEntityPersister implements EntityPersister { $this->switchPersisterContext($offset, $limit); - $criteria = array(); - $parameters = array(); + $criteria = []; + $parameters = []; $owningAssoc = $this->class->associationMappings[$assoc['mappedBy']]; $sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']); $tableAlias = $this->getSQLTableAlias(isset($owningAssoc['inherited']) ? $owningAssoc['inherited'] : $this->class->name); @@ -1787,11 +1789,11 @@ class BasicEntityPersister implements EntityPersister } $criteria[$tableAlias . "." . $targetKeyColumn] = $value; - $parameters[] = array( + $parameters[] = [ 'value' => $value, 'field' => $field, 'class' => $sourceClass, - ); + ]; continue; } @@ -1800,11 +1802,11 @@ class BasicEntityPersister implements EntityPersister $value = $sourceClass->reflFields[$field]->getValue($sourceEntity); $criteria[$tableAlias . "." . $targetKeyColumn] = $value; - $parameters[] = array( + $parameters[] = [ 'value' => $value, 'field' => $field, 'class' => $sourceClass, - ); + ]; } @@ -1819,8 +1821,8 @@ class BasicEntityPersister implements EntityPersister */ public function expandParameters($criteria) { - $params = array(); - $types = array(); + $params = []; + $types = []; foreach ($criteria as $field => $value) { if ($value === null) { @@ -1831,7 +1833,7 @@ class BasicEntityPersister implements EntityPersister $params = array_merge($params, $this->getValues($value)); } - return array($params, $types); + return [$params, $types]; } /** @@ -1848,8 +1850,8 @@ class BasicEntityPersister implements EntityPersister */ private function expandToManyParameters($criteria) { - $params = array(); - $types = array(); + $params = []; + $types = []; foreach ($criteria as $criterion) { if ($criterion['value'] === null) { @@ -1860,7 +1862,7 @@ class BasicEntityPersister implements EntityPersister $params = array_merge($params, $this->getValues($criterion['value'])); } - return array($params, $types); + return [$params, $types]; } /** @@ -1875,11 +1877,11 @@ class BasicEntityPersister implements EntityPersister */ private function getTypes($field, $value, ClassMetadata $class) { - $types = array(); + $types = []; switch (true) { case (isset($class->fieldMappings[$field])): - $types = array_merge($types, array($class->fieldMappings[$field]['type'])); + $types = array_merge($types, [$class->fieldMappings[$field]['type']]); break; case (isset($class->associationMappings[$field])): @@ -1926,19 +1928,19 @@ class BasicEntityPersister implements EntityPersister private function getValues($value) { if (is_array($value)) { - $newValue = array(); + $newValue = []; foreach ($value as $itemValue) { $newValue = array_merge($newValue, $this->getValues($itemValue)); } - return array($newValue); + return [$newValue]; } if (is_object($value) && $this->em->getMetadataFactory()->hasMetadataFor(ClassUtils::getClass($value))) { $class = $this->em->getClassMetadata(get_class($value)); if ($class->isIdentifierComposite) { - $newValue = array(); + $newValue = []; foreach ($class->getIdentifierValues($value) as $innerValue) { $newValue = array_merge($newValue, $this->getValues($innerValue)); @@ -1948,7 +1950,7 @@ class BasicEntityPersister implements EntityPersister } } - return array($this->getIndividualValue($value)); + return [$this->getIndividualValue($value)]; } /** @@ -2038,7 +2040,7 @@ class BasicEntityPersister implements EntityPersister */ protected function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias) { - $filterClauses = array(); + $filterClauses = []; foreach ($this->em->getFilters()->getEnabledFilters() as $filter) { if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { diff --git a/lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php b/lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php index 81fde938b..132dac7e4 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php +++ b/lib/Doctrine/ORM/Persisters/Entity/CachedPersisterContext.php @@ -76,7 +76,7 @@ class CachedPersisterContext * * @var array */ - public $sqlTableAliases = array(); + public $sqlTableAliases = []; /** * Whether this persistent context is considering limit operations applied to the selection queries diff --git a/lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php index ff018a050..9ac631668 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php @@ -81,7 +81,7 @@ interface EntityPersister * * @return string */ - public function getCountSQL($criteria = array()); + public function getCountSQL($criteria = []); /** * Expands the parameters from the given criteria and use the correct binding types if found. @@ -165,7 +165,7 @@ interface EntityPersister * * @return int */ - public function count($criteria = array()); + public function count($criteria = []); /** * Gets the name of the table that owns the column the given field is mapped to. @@ -197,7 +197,7 @@ interface EntityPersister * * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = null, $limit = null, array $orderBy = null); + public function load(array $criteria, $entity = null, $assoc = null, array $hints = [], $lockMode = null, $limit = null, array $orderBy = null); /** * Loads an entity by identifier. @@ -225,7 +225,7 @@ interface EntityPersister * * @throws \Doctrine\ORM\Mapping\MappingException */ - public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = array()); + public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = []); /** * Refreshes a managed entity. @@ -260,7 +260,7 @@ interface EntityPersister * * @return array */ - public function loadAll(array $criteria = array(), array $orderBy = null, $limit = null, $offset = null); + public function loadAll(array $criteria = [], array $orderBy = null, $limit = null, $offset = null); /** * Gets (sliced or full) elements of the given collection. diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 0975cf56e..e3e7d2b43 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -45,14 +45,14 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister * * @var array */ - private $owningTableMap = array(); + private $owningTableMap = []; /** * Map of table to quoted table names. * * @var array */ - private $quotedTableMap = array(); + private $quotedTableMap = []; /** * {@inheritdoc} @@ -127,10 +127,10 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister public function executeInserts() { if ( ! $this->queuedInserts) { - return array(); + return []; } - $postInsertIds = array(); + $postInsertIds = []; $idGenerator = $this->class->idGenerator; $isPostInsertId = $idGenerator->isPostInsertGenerator(); $rootClass = ($this->class->name !== $this->class->rootEntityName) @@ -143,7 +143,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister $rootTableStmt = $this->conn->prepare($rootPersister->getInsertSQL()); // Prepare statements for sub tables. - $subTableStmts = array(); + $subTableStmts = []; if ($rootClass !== $this->class) { $subTableStmts[$this->class->getTableName()] = $this->conn->prepare($this->getInsertSQL()); @@ -176,13 +176,13 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister if ($isPostInsertId) { $generatedId = $idGenerator->generate($this->em, $entity); - $id = array( + $id = [ $this->class->identifier[0] => $generatedId - ); - $postInsertIds[] = array( + ]; + $postInsertIds[] = [ 'generatedId' => $generatedId, 'entity' => $entity, - ); + ]; } else { $id = $this->em->getUnitOfWork()->getEntityIdentifier($entity); } @@ -198,7 +198,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister $paramIndex = 1; $data = isset($insertData[$tableName]) ? $insertData[$tableName] - : array(); + : []; foreach ((array) $id as $idName => $idVal) { $type = isset($this->columnTypes[$idName]) ? $this->columnTypes[$idName] : Type::STRING; @@ -222,7 +222,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister $stmt->closeCursor(); } - $this->queuedInserts = array(); + $this->queuedInserts = []; return $postInsertIds; } @@ -258,7 +258,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister if ( ! isset($updateData[$versionedTable])) { $tableName = $this->quoteStrategy->getTableName($versionedClass, $this->platform); - $this->updateTable($entity, $tableName, array(), true); + $this->updateTable($entity, $tableName, [], true); } $identifiers = $this->em->getUnitOfWork()->getEntityIdentifier($entity); @@ -369,7 +369,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister /** * {@inheritDoc} */ - public function getCountSQL($criteria = array()) + public function getCountSQL($criteria = []) { $tableName = $this->quoteStrategy->getTableName($this->class, $this->platform); $baseTableAlias = $this->getSQLTableAlias($this->class->name); @@ -406,7 +406,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister // INNER JOIN parent tables foreach ($this->class->parentClasses as $parentClassName) { - $conditions = array(); + $conditions = []; $tableAlias = $this->getSQLTableAlias($parentClassName); $parentClass = $this->em->getClassMetadata($parentClassName); $joinSql .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; @@ -433,7 +433,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister return $this->currentPersisterContext->selectColumnListSql; } - $columnList = array(); + $columnList = []; $discrColumn = $this->class->discriminatorColumn['name']; $discrColumnType = $this->class->discriminatorColumn['type']; $baseTableAlias = $this->getSQLTableAlias($this->class->name); @@ -545,7 +545,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister // Identifier columns must always come first in the column list of subclasses. $columns = $this->class->parentClasses ? $this->class->getIdentifierColumnNames() - : array(); + : []; foreach ($this->class->reflFields as $name => $field) { if (isset($this->class->fieldMappings[$name]['inherited']) @@ -599,7 +599,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister // INNER JOIN parent tables foreach ($this->class->parentClasses as $parentClassName) { - $conditions = array(); + $conditions = []; $parentClass = $this->em->getClassMetadata($parentClassName); $tableAlias = $this->getSQLTableAlias($parentClassName); $joinSql .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; @@ -614,7 +614,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister // OUTER JOIN sub tables foreach ($this->class->subClasses as $subClassName) { - $conditions = array(); + $conditions = []; $subClass = $this->em->getClassMetadata($subClassName); $tableAlias = $this->getSQLTableAlias($subClassName); $joinSql .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON '; diff --git a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php index 8dc71bb1d..d3eb5d8ac 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php @@ -164,7 +164,7 @@ class SingleTablePersister extends AbstractEntityInheritancePersister */ protected function getSelectConditionDiscriminatorValueSQL() { - $values = array(); + $values = []; if ($this->class->discriminatorValue !== null) { // discriminators can be 0 $values[] = $this->conn->quote($this->class->discriminatorValue); diff --git a/lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php b/lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php index f23bfa3da..476ecaba8 100644 --- a/lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php +++ b/lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php @@ -70,7 +70,7 @@ class SqlExpressionVisitor extends ExpressionVisitor if (isset($this->classMetadata->associationMappings[$field]) && $value !== null && ! is_object($value) && - ! in_array($comparison->getOperator(), array(Comparison::IN, Comparison::NIN))) { + ! in_array($comparison->getOperator(), [Comparison::IN, Comparison::NIN])) { throw PersisterException::matchingAssocationFieldRequiresObject($this->classMetadata->name, $field); } @@ -89,7 +89,7 @@ class SqlExpressionVisitor extends ExpressionVisitor */ public function walkCompositeExpression(CompositeExpression $expr) { - $expressionList = array(); + $expressionList = []; foreach ($expr->getExpressionList() as $child) { $expressionList[] = $this->dispatch($child); diff --git a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php index 0e680ad07..2b3bdedc4 100644 --- a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php +++ b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php @@ -34,12 +34,12 @@ class SqlValueVisitor extends ExpressionVisitor /** * @var array */ - private $values = array(); + private $values = []; /** * @var array */ - private $types = array(); + private $types = []; /** * Converts a comparison expression into the target query language output. @@ -61,7 +61,7 @@ class SqlValueVisitor extends ExpressionVisitor } $this->values[] = $value; - $this->types[] = array($field, $value); + $this->types[] = [$field, $value]; } /** @@ -97,7 +97,7 @@ class SqlValueVisitor extends ExpressionVisitor */ public function getParamsAndTypes() { - return array($this->values, $this->types); + return [$this->values, $this->types]; } /** diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 6a8a50ae0..12fb3f560 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -135,7 +135,7 @@ final class Query extends AbstractQuery * * @var array */ - private $_parsedTypes = array(); + private $_parsedTypes = []; /** * Cached DQL query. @@ -241,7 +241,7 @@ final class Query extends AbstractQuery */ private function _parse() { - $types = array(); + $types = []; foreach ($this->parameters as $parameter) { /** @var Query\Parameter $parameter */ @@ -354,8 +354,8 @@ final class Query extends AbstractQuery */ private function processParameterMappings($paramMappings) { - $sqlParams = array(); - $types = array(); + $sqlParams = []; + $types = []; foreach ($this->parameters as $parameter) { $key = $parameter->getName(); @@ -383,7 +383,7 @@ final class Query extends AbstractQuery // optimized multi value sql positions away for now, // they are not allowed in DQL anyways. - $value = array($value); + $value = [$value]; $countValue = count($value); for ($i = 0, $l = count($sqlPositions); $i < $l; $i++) { @@ -403,7 +403,7 @@ final class Query extends AbstractQuery $types = array_values($types); } - return array($sqlParams, $types); + return [$sqlParams, $types]; } /** @@ -667,7 +667,7 @@ final class Query extends AbstractQuery */ public function setLockMode($lockMode) { - if (in_array($lockMode, array(LockMode::NONE, LockMode::PESSIMISTIC_READ, LockMode::PESSIMISTIC_WRITE), true)) { + if (in_array($lockMode, [LockMode::NONE, LockMode::PESSIMISTIC_READ, LockMode::PESSIMISTIC_WRITE], true)) { if ( ! $this->_em->getConnection()->isTransactionActive()) { throw TransactionRequiredException::transactionRequired(); } diff --git a/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php b/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php index 194f9ace5..9e3b4c526 100644 --- a/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php +++ b/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php @@ -23,7 +23,7 @@ namespace Doctrine\ORM\Query\AST; * CoalesceExpression ::= "COALESCE" "(" ScalarExpression {"," ScalarExpression}* ")" * * @since 2.1 - * + * * @link www.doctrine-project.org * @author Benjamin Eberlei * @author Guilherme Blanco @@ -35,7 +35,7 @@ class CoalesceExpression extends Node /** * @var array */ - public $scalarExpressions = array(); + public $scalarExpressions = []; /** * @param array $scalarExpressions diff --git a/lib/Doctrine/ORM/Query/AST/ConditionalExpression.php b/lib/Doctrine/ORM/Query/AST/ConditionalExpression.php index 62c7b2bca..bf823629b 100644 --- a/lib/Doctrine/ORM/Query/AST/ConditionalExpression.php +++ b/lib/Doctrine/ORM/Query/AST/ConditionalExpression.php @@ -33,7 +33,7 @@ class ConditionalExpression extends Node /** * @var array */ - public $conditionalTerms = array(); + public $conditionalTerms = []; /** * @param array $conditionalTerms diff --git a/lib/Doctrine/ORM/Query/AST/ConditionalTerm.php b/lib/Doctrine/ORM/Query/AST/ConditionalTerm.php index bb92db119..7122c9c68 100644 --- a/lib/Doctrine/ORM/Query/AST/ConditionalTerm.php +++ b/lib/Doctrine/ORM/Query/AST/ConditionalTerm.php @@ -32,7 +32,7 @@ class ConditionalTerm extends Node /** * @var array */ - public $conditionalFactors = array(); + public $conditionalFactors = []; /** * @param array $conditionalFactors diff --git a/lib/Doctrine/ORM/Query/AST/FromClause.php b/lib/Doctrine/ORM/Query/AST/FromClause.php index b1d8dfe6b..fdb61ca37 100644 --- a/lib/Doctrine/ORM/Query/AST/FromClause.php +++ b/lib/Doctrine/ORM/Query/AST/FromClause.php @@ -22,7 +22,7 @@ namespace Doctrine\ORM\Query\AST; /** * FromClause ::= "FROM" IdentificationVariableDeclaration {"," IdentificationVariableDeclaration} * - * + * * @link www.doctrine-project.org * @since 2.0 * @author Guilherme Blanco @@ -34,7 +34,7 @@ class FromClause extends Node /** * @var array */ - public $identificationVariableDeclarations = array(); + public $identificationVariableDeclarations = []; /** * @param array $identificationVariableDeclarations diff --git a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php index 1c58f6cbd..71da374df 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php @@ -38,7 +38,7 @@ class ConcatFunction extends FunctionNode public $secondStringPrimary; - public $concatExpressions = array(); + public $concatExpressions = []; /** * @override @@ -47,13 +47,13 @@ class ConcatFunction extends FunctionNode { $platform = $sqlWalker->getConnection()->getDatabasePlatform(); - $args = array(); + $args = []; foreach ($this->concatExpressions as $expression) { $args[] = $sqlWalker->walkStringPrimary($expression); } - return call_user_func_array(array($platform,'getConcatExpression'), $args); + return call_user_func_array([$platform,'getConcatExpression'], $args); } /** diff --git a/lib/Doctrine/ORM/Query/AST/GeneralCaseExpression.php b/lib/Doctrine/ORM/Query/AST/GeneralCaseExpression.php index a74eed599..e7937d60d 100644 --- a/lib/Doctrine/ORM/Query/AST/GeneralCaseExpression.php +++ b/lib/Doctrine/ORM/Query/AST/GeneralCaseExpression.php @@ -23,7 +23,7 @@ namespace Doctrine\ORM\Query\AST; * GeneralCaseExpression ::= "CASE" WhenClause {WhenClause}* "ELSE" ScalarExpression "END" * * @since 2.2 - * + * * @link www.doctrine-project.org * @author Benjamin Eberlei * @author Guilherme Blanco @@ -35,7 +35,7 @@ class GeneralCaseExpression extends Node /** * @var array */ - public $whenClauses = array(); + public $whenClauses = []; /** * @var mixed diff --git a/lib/Doctrine/ORM/Query/AST/GroupByClause.php b/lib/Doctrine/ORM/Query/AST/GroupByClause.php index c05fa5863..687512a4c 100644 --- a/lib/Doctrine/ORM/Query/AST/GroupByClause.php +++ b/lib/Doctrine/ORM/Query/AST/GroupByClause.php @@ -33,7 +33,7 @@ class GroupByClause extends Node /** * @var array */ - public $groupByItems = array(); + public $groupByItems = []; /** * @param array $groupByItems diff --git a/lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php b/lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php index a8f7f6d35..2e2032ca3 100644 --- a/lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php +++ b/lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php @@ -43,7 +43,7 @@ class IdentificationVariableDeclaration extends Node /** * @var array */ - public $joins = array(); + public $joins = []; /** * @param RangeVariableDeclaration|null $rangeVariableDecl diff --git a/lib/Doctrine/ORM/Query/AST/InExpression.php b/lib/Doctrine/ORM/Query/AST/InExpression.php index 9d0a8b54e..64ef13405 100644 --- a/lib/Doctrine/ORM/Query/AST/InExpression.php +++ b/lib/Doctrine/ORM/Query/AST/InExpression.php @@ -42,7 +42,7 @@ class InExpression extends Node /** * @var array */ - public $literals = array(); + public $literals = []; /** * @var Subselect|null diff --git a/lib/Doctrine/ORM/Query/AST/OrderByClause.php b/lib/Doctrine/ORM/Query/AST/OrderByClause.php index 75d16c731..e0e30e9d9 100644 --- a/lib/Doctrine/ORM/Query/AST/OrderByClause.php +++ b/lib/Doctrine/ORM/Query/AST/OrderByClause.php @@ -33,7 +33,7 @@ class OrderByClause extends Node /** * @var array */ - public $orderByItems = array(); + public $orderByItems = []; /** * @param array $orderByItems diff --git a/lib/Doctrine/ORM/Query/AST/SelectClause.php b/lib/Doctrine/ORM/Query/AST/SelectClause.php index 1df143677..f8e6f472a 100644 --- a/lib/Doctrine/ORM/Query/AST/SelectClause.php +++ b/lib/Doctrine/ORM/Query/AST/SelectClause.php @@ -38,7 +38,7 @@ class SelectClause extends Node /** * @var array */ - public $selectExpressions = array(); + public $selectExpressions = []; /** * @param array $selectExpressions diff --git a/lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php b/lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php index 9bd485045..80ecd15ce 100644 --- a/lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php +++ b/lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php @@ -33,7 +33,7 @@ class SimpleArithmeticExpression extends Node /** * @var array */ - public $arithmeticTerms = array(); + public $arithmeticTerms = []; /** * @param array $arithmeticTerms diff --git a/lib/Doctrine/ORM/Query/AST/SimpleCaseExpression.php b/lib/Doctrine/ORM/Query/AST/SimpleCaseExpression.php index 5272f3962..67e354e55 100644 --- a/lib/Doctrine/ORM/Query/AST/SimpleCaseExpression.php +++ b/lib/Doctrine/ORM/Query/AST/SimpleCaseExpression.php @@ -23,7 +23,7 @@ namespace Doctrine\ORM\Query\AST; * SimpleCaseExpression ::= "CASE" CaseOperand SimpleWhenClause {SimpleWhenClause}* "ELSE" ScalarExpression "END" * * @since 2.2 - * + * * @link www.doctrine-project.org * @author Benjamin Eberlei * @author Guilherme Blanco @@ -40,7 +40,7 @@ class SimpleCaseExpression extends Node /** * @var array */ - public $simpleWhenClauses = array(); + public $simpleWhenClauses = []; /** * @var mixed diff --git a/lib/Doctrine/ORM/Query/AST/SubselectFromClause.php b/lib/Doctrine/ORM/Query/AST/SubselectFromClause.php index 8d009fcfd..9704061e8 100644 --- a/lib/Doctrine/ORM/Query/AST/SubselectFromClause.php +++ b/lib/Doctrine/ORM/Query/AST/SubselectFromClause.php @@ -33,7 +33,7 @@ class SubselectFromClause extends Node /** * @var array */ - public $identificationVariableDeclarations = array(); + public $identificationVariableDeclarations = []; /** * @param array $identificationVariableDeclarations diff --git a/lib/Doctrine/ORM/Query/AST/UpdateClause.php b/lib/Doctrine/ORM/Query/AST/UpdateClause.php index 430ed14eb..23c722a62 100644 --- a/lib/Doctrine/ORM/Query/AST/UpdateClause.php +++ b/lib/Doctrine/ORM/Query/AST/UpdateClause.php @@ -43,7 +43,7 @@ class UpdateClause extends Node /** * @var array */ - public $updateItems = array(); + public $updateItems = []; /** * @param string $abstractSchemaName diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php index b14ddb534..aaf94d7ff 100644 --- a/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php +++ b/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php @@ -81,7 +81,7 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor . ' SELECT t0.' . implode(', t0.', $idColumnNames); $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $primaryDqlAlias); - $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array()))); + $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]); $this->_insertSql .= $sqlWalker->walkFromClause($fromClause); // Append WHERE clause, if there is one. @@ -93,7 +93,7 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable; // 3. Create and store DELETE statements - $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses); + $classNames = array_merge($primaryClass->parentClasses, [$primaryClass->name], $primaryClass->subClasses); foreach (array_reverse($classNames) as $className) { $tableName = $quoteStrategy->getTableName($em->getClassMetadata($className), $platform); $this->_sqlStatements[] = 'DELETE FROM ' . $tableName @@ -101,12 +101,12 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor } // 4. Store DDL for temporary identifier table. - $columnDefinitions = array(); + $columnDefinitions = []; foreach ($idColumnNames as $idColumnName) { - $columnDefinitions[$idColumnName] = array( + $columnDefinitions[$idColumnName] = [ 'notnull' => true, 'type' => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)), - ); + ]; } $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' (' . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')'; diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php index 995f9cad1..acad25a92 100644 --- a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php +++ b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php @@ -52,7 +52,7 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor /** * @var array */ - private $_sqlParameters = array(); + private $_sqlParameters = []; /** * @var int @@ -92,7 +92,7 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor . ' SELECT t0.' . implode(', t0.', $idColumnNames); $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $updateClause->aliasIdentificationVariable); - $fromClause = new AST\FromClause(array(new AST\IdentificationVariableDeclaration($rangeDecl, null, array()))); + $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]); $this->_insertSql .= $sqlWalker->walkFromClause($fromClause); @@ -100,7 +100,7 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable; // 3. Create and store UPDATE statements - $classNames = array_merge($primaryClass->parentClasses, array($primaryClass->name), $primaryClass->subClasses); + $classNames = array_merge($primaryClass->parentClasses, [$primaryClass->name], $primaryClass->subClasses); $i = -1; foreach (array_reverse($classNames) as $className) { @@ -143,13 +143,13 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor } // 4. Store DDL for temporary identifier table. - $columnDefinitions = array(); + $columnDefinitions = []; foreach ($idColumnNames as $idColumnName) { - $columnDefinitions[$idColumnName] = array( + $columnDefinitions[$idColumnName] = [ 'notnull' => true, 'type' => Type::getType(PersisterHelper::getTypeOfColumn($idColumnName, $rootClass, $em)), - ); + ]; } $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' (' @@ -176,8 +176,8 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor // Execute UPDATE statements foreach ($this->_sqlStatements as $key => $statement) { - $paramValues = array(); - $paramTypes = array(); + $paramValues = []; + $paramTypes = []; if (isset($this->_sqlParameters[$key])) { foreach ($this->_sqlParameters[$key] as $parameterKey => $parameterName) { diff --git a/lib/Doctrine/ORM/Query/Expr.php b/lib/Doctrine/ORM/Query/Expr.php index 70f9ac9e2..eada61058 100644 --- a/lib/Doctrine/ORM/Query/Expr.php +++ b/lib/Doctrine/ORM/Query/Expr.php @@ -220,7 +220,7 @@ class Expr */ public function avg($x) { - return new Expr\Func('AVG', array($x)); + return new Expr\Func('AVG', [$x]); } /** @@ -232,7 +232,7 @@ class Expr */ public function max($x) { - return new Expr\Func('MAX', array($x)); + return new Expr\Func('MAX', [$x]); } /** @@ -244,7 +244,7 @@ class Expr */ public function min($x) { - return new Expr\Func('MIN', array($x)); + return new Expr\Func('MIN', [$x]); } /** @@ -256,7 +256,7 @@ class Expr */ public function count($x) { - return new Expr\Func('COUNT', array($x)); + return new Expr\Func('COUNT', [$x]); } /** @@ -280,7 +280,7 @@ class Expr */ public function exists($subquery) { - return new Expr\Func('EXISTS', array($subquery)); + return new Expr\Func('EXISTS', [$subquery]); } /** @@ -292,7 +292,7 @@ class Expr */ public function all($subquery) { - return new Expr\Func('ALL', array($subquery)); + return new Expr\Func('ALL', [$subquery]); } /** @@ -304,7 +304,7 @@ class Expr */ public function some($subquery) { - return new Expr\Func('SOME', array($subquery)); + return new Expr\Func('SOME', [$subquery]); } /** @@ -316,7 +316,7 @@ class Expr */ public function any($subquery) { - return new Expr\Func('ANY', array($subquery)); + return new Expr\Func('ANY', [$subquery]); } /** @@ -328,7 +328,7 @@ class Expr */ public function not($restriction) { - return new Expr\Func('NOT', array($restriction)); + return new Expr\Func('NOT', [$restriction]); } /** @@ -340,7 +340,7 @@ class Expr */ public function abs($x) { - return new Expr\Func('ABS', array($x)); + return new Expr\Func('ABS', [$x]); } /** @@ -429,7 +429,7 @@ class Expr */ public function sqrt($x) { - return new Expr\Func('SQRT', array($x)); + return new Expr\Func('SQRT', [$x]); } /** @@ -548,7 +548,7 @@ class Expr */ public function substring($x, $from, $len = null) { - $args = array($x, $from); + $args = [$x, $from]; if (null !== $len) { $args[] = $len; } @@ -565,7 +565,7 @@ class Expr */ public function lower($x) { - return new Expr\Func('LOWER', array($x)); + return new Expr\Func('LOWER', [$x]); } /** @@ -577,7 +577,7 @@ class Expr */ public function upper($x) { - return new Expr\Func('UPPER', array($x)); + return new Expr\Func('UPPER', [$x]); } /** @@ -589,7 +589,7 @@ class Expr */ public function length($x) { - return new Expr\Func('LENGTH', array($x)); + return new Expr\Func('LENGTH', [$x]); } /** diff --git a/lib/Doctrine/ORM/Query/Expr/Andx.php b/lib/Doctrine/ORM/Query/Expr/Andx.php index 432f714f6..cc64ab1a8 100644 --- a/lib/Doctrine/ORM/Query/Expr/Andx.php +++ b/lib/Doctrine/ORM/Query/Expr/Andx.php @@ -38,12 +38,12 @@ class Andx extends Composite /** * @var array */ - protected $allowedClasses = array( + protected $allowedClasses = [ 'Doctrine\ORM\Query\Expr\Comparison', 'Doctrine\ORM\Query\Expr\Func', 'Doctrine\ORM\Query\Expr\Orx', 'Doctrine\ORM\Query\Expr\Andx', - ); + ]; /** * @return array diff --git a/lib/Doctrine/ORM/Query/Expr/Base.php b/lib/Doctrine/ORM/Query/Expr/Base.php index 6eac70a27..d13031383 100644 --- a/lib/Doctrine/ORM/Query/Expr/Base.php +++ b/lib/Doctrine/ORM/Query/Expr/Base.php @@ -48,17 +48,17 @@ abstract class Base /** * @var array */ - protected $allowedClasses = array(); + protected $allowedClasses = []; /** * @var array */ - protected $parts = array(); + protected $parts = []; /** * @param array $args */ - public function __construct($args = array()) + public function __construct($args = []) { $this->addMultiple($args); } @@ -68,7 +68,7 @@ abstract class Base * * @return Base */ - public function addMultiple($args = array()) + public function addMultiple($args = []) { foreach ((array) $args as $arg) { $this->add($arg); diff --git a/lib/Doctrine/ORM/Query/Expr/Composite.php b/lib/Doctrine/ORM/Query/Expr/Composite.php index 4d9a25198..6b8a04fa5 100644 --- a/lib/Doctrine/ORM/Query/Expr/Composite.php +++ b/lib/Doctrine/ORM/Query/Expr/Composite.php @@ -39,7 +39,7 @@ class Composite extends Base return (string) $this->parts[0]; } - $components = array(); + $components = []; foreach ($this->parts as $part) { $components[] = $this->processQueryPart($part); diff --git a/lib/Doctrine/ORM/Query/Expr/OrderBy.php b/lib/Doctrine/ORM/Query/Expr/OrderBy.php index 932548bd6..b9da73b98 100644 --- a/lib/Doctrine/ORM/Query/Expr/OrderBy.php +++ b/lib/Doctrine/ORM/Query/Expr/OrderBy.php @@ -48,12 +48,12 @@ class OrderBy /** * @var array */ - protected $allowedClasses = array(); + protected $allowedClasses = []; /** * @var array */ - protected $parts = array(); + protected $parts = []; /** * @param string|null $sort diff --git a/lib/Doctrine/ORM/Query/Expr/Orx.php b/lib/Doctrine/ORM/Query/Expr/Orx.php index c4ff7ae30..35f88e831 100644 --- a/lib/Doctrine/ORM/Query/Expr/Orx.php +++ b/lib/Doctrine/ORM/Query/Expr/Orx.php @@ -38,12 +38,12 @@ class Orx extends Composite /** * @var array */ - protected $allowedClasses = array( + protected $allowedClasses = [ 'Doctrine\ORM\Query\Expr\Comparison', 'Doctrine\ORM\Query\Expr\Func', 'Doctrine\ORM\Query\Expr\Andx', 'Doctrine\ORM\Query\Expr\Orx', - ); + ]; /** * @return array diff --git a/lib/Doctrine/ORM/Query/Expr/Select.php b/lib/Doctrine/ORM/Query/Expr/Select.php index 21df6c735..00bdc94f3 100644 --- a/lib/Doctrine/ORM/Query/Expr/Select.php +++ b/lib/Doctrine/ORM/Query/Expr/Select.php @@ -43,9 +43,7 @@ class Select extends Base /** * @var array */ - protected $allowedClasses = array( - 'Doctrine\ORM\Query\Expr\Func' - ); + protected $allowedClasses = ['Doctrine\ORM\Query\Expr\Func']; /** * @return array diff --git a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php index b0248fbac..c48edd43f 100644 --- a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php +++ b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php @@ -75,7 +75,7 @@ abstract class SQLFilter $type = ParameterTypeInferer::inferType($value); } - $this->parameters[$name] = array('value' => $value, 'type' => $type); + $this->parameters[$name] = ['value' => $value, 'type' => $type]; // Keep the parameters sorted for the hash ksort($this->parameters); @@ -122,7 +122,7 @@ abstract class SQLFilter return true; } - + /** * Returns as string representation of the SQLFilter parameters (the state). * diff --git a/lib/Doctrine/ORM/Query/FilterCollection.php b/lib/Doctrine/ORM/Query/FilterCollection.php index ffbaeaf12..ca7f1ac32 100644 --- a/lib/Doctrine/ORM/Query/FilterCollection.php +++ b/lib/Doctrine/ORM/Query/FilterCollection.php @@ -59,7 +59,7 @@ class FilterCollection * * @var \Doctrine\ORM\Query\Filter\SQLFilter[] */ - private $enabledFilters = array(); + private $enabledFilters = []; /** * @var string The filter hash from the last time the query was parsed. @@ -176,16 +176,16 @@ class FilterCollection /** * Checks if a filter is enabled. - * + * * @param string $name Name of the filter. - * + * * @return boolean True if the filter is enabled, false otherwise. */ public function isEnabled($name) { return isset($this->enabledFilters[$name]); } - + /** * @return boolean True, if the filter collection is clean. */ diff --git a/lib/Doctrine/ORM/Query/Lexer.php b/lib/Doctrine/ORM/Query/Lexer.php index b31b93b87..b889ecfae 100644 --- a/lib/Doctrine/ORM/Query/Lexer.php +++ b/lib/Doctrine/ORM/Query/Lexer.php @@ -129,13 +129,13 @@ class Lexer extends \Doctrine\Common\Lexer */ protected function getCatchablePatterns() { - return array( + return [ '[a-z_][a-z0-9_]*\:[a-z_][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // aliased name '[a-z_\\\][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // identifier or qualified name '(?:[0-9]+(?:[\.][0-9]+)*)(?:e[+-]?[0-9]+)?', // numbers "'(?:[^']|'')*'", // quoted strings '\?[0-9]*|:[a-z_][a-z0-9_]*' // parameters - ); + ]; } /** @@ -143,7 +143,7 @@ class Lexer extends \Doctrine\Common\Lexer */ protected function getNonCatchablePatterns() { - return array('\s+', '(.)'); + return ['\s+', '(.)']; } /** diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 6f8eda514..ae8fcd3eb 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -40,21 +40,21 @@ class Parser * * @var array */ - private static $_STRING_FUNCTIONS = array( + private static $_STRING_FUNCTIONS = [ 'concat' => 'Doctrine\ORM\Query\AST\Functions\ConcatFunction', 'substring' => 'Doctrine\ORM\Query\AST\Functions\SubstringFunction', 'trim' => 'Doctrine\ORM\Query\AST\Functions\TrimFunction', 'lower' => 'Doctrine\ORM\Query\AST\Functions\LowerFunction', 'upper' => 'Doctrine\ORM\Query\AST\Functions\UpperFunction', 'identity' => 'Doctrine\ORM\Query\AST\Functions\IdentityFunction', - ); + ]; /** * READ-ONLY: Maps BUILT-IN numeric function names to AST class names. * * @var array */ - private static $_NUMERIC_FUNCTIONS = array( + private static $_NUMERIC_FUNCTIONS = [ 'length' => 'Doctrine\ORM\Query\AST\Functions\LengthFunction', 'locate' => 'Doctrine\ORM\Query\AST\Functions\LocateFunction', 'abs' => 'Doctrine\ORM\Query\AST\Functions\AbsFunction', @@ -64,20 +64,20 @@ class Parser 'date_diff' => 'Doctrine\ORM\Query\AST\Functions\DateDiffFunction', 'bit_and' => 'Doctrine\ORM\Query\AST\Functions\BitAndFunction', 'bit_or' => 'Doctrine\ORM\Query\AST\Functions\BitOrFunction', - ); + ]; /** * READ-ONLY: Maps BUILT-IN datetime function names to AST class names. * * @var array */ - private static $_DATETIME_FUNCTIONS = array( + private static $_DATETIME_FUNCTIONS = [ 'current_date' => 'Doctrine\ORM\Query\AST\Functions\CurrentDateFunction', 'current_time' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimeFunction', 'current_timestamp' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimestampFunction', 'date_add' => 'Doctrine\ORM\Query\AST\Functions\DateAddFunction', 'date_sub' => 'Doctrine\ORM\Query\AST\Functions\DateSubFunction', - ); + ]; /* * Expressions that were encountered during parsing of identifiers and expressions @@ -87,27 +87,27 @@ class Parser /** * @var array */ - private $deferredIdentificationVariables = array(); + private $deferredIdentificationVariables = []; /** * @var array */ - private $deferredPartialObjectExpressions = array(); + private $deferredPartialObjectExpressions = []; /** * @var array */ - private $deferredPathExpressions = array(); + private $deferredPathExpressions = []; /** * @var array */ - private $deferredResultVariables = array(); + private $deferredResultVariables = []; /** * @var array */ - private $deferredNewObjectExpressions = array(); + private $deferredNewObjectExpressions = []; /** * The lexer. @@ -142,7 +142,7 @@ class Parser * * @var array */ - private $queryComponents = array(); + private $queryComponents = []; /** * Keeps the nesting level of defined ResultVariables. @@ -156,7 +156,7 @@ class Parser * * @var array */ - private $customTreeWalkers = array(); + private $customTreeWalkers = []; /** * The custom last tree walker, if any, that is responsible for producing the output. @@ -168,7 +168,7 @@ class Parser /** * @var array */ - private $identVariableExpressions = array(); + private $identVariableExpressions = []; /** * Checks if a function is internally defined. Used to prevent overwriting @@ -541,7 +541,7 @@ class Parser */ private function isMathOperator($token) { - return in_array($token['type'], array(Lexer::T_PLUS, Lexer::T_MINUS, Lexer::T_DIVIDE, Lexer::T_MULTIPLY)); + return in_array($token['type'], [Lexer::T_PLUS, Lexer::T_MINUS, Lexer::T_DIVIDE, Lexer::T_MULTIPLY]); } /** @@ -568,7 +568,7 @@ class Parser */ private function isAggregateFunction($tokenType) { - return in_array($tokenType, array(Lexer::T_AVG, Lexer::T_MIN, Lexer::T_MAX, Lexer::T_SUM, Lexer::T_COUNT)); + return in_array($tokenType, [Lexer::T_AVG, Lexer::T_MIN, Lexer::T_MAX, Lexer::T_SUM, Lexer::T_COUNT]); } /** @@ -578,7 +578,7 @@ class Parser */ private function isNextAllAnySome() { - return in_array($this->lexer->lookahead['type'], array(Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME)); + return in_array($this->lexer->lookahead['type'], [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME]); } /** @@ -787,7 +787,7 @@ class Parser if ( ! ($expectedType & $fieldType)) { // We need to recognize which was expected type(s) - $expectedStringTypes = array(); + $expectedStringTypes = []; // Validate state field type if ($expectedType & AST\PathExpression::TYPE_STATE_FIELD) { @@ -929,11 +929,11 @@ class Parser $identVariable = $this->lexer->token['value']; - $this->deferredIdentificationVariables[] = array( + $this->deferredIdentificationVariables[] = [ 'expression' => $identVariable, 'nestingLevel' => $this->nestingLevel, 'token' => $this->lexer->token, - ); + ]; return $identVariable; } @@ -1028,11 +1028,11 @@ class Parser $resultVariable = $this->lexer->token['value']; // Defer ResultVariable validation - $this->deferredResultVariables[] = array( + $this->deferredResultVariables[] = [ 'expression' => $resultVariable, 'nestingLevel' => $this->nestingLevel, 'token' => $this->lexer->token, - ); + ]; return $resultVariable; } @@ -1100,11 +1100,11 @@ class Parser $pathExpr = new AST\PathExpression($expectedTypes, $identVariable, $field); // Defer PathExpression validation if requested to be deferred - $this->deferredPathExpressions[] = array( + $this->deferredPathExpressions[] = [ 'expression' => $pathExpr, 'nestingLevel' => $this->nestingLevel, 'token' => $this->lexer->token, - ); + ]; return $pathExpr; } @@ -1183,7 +1183,7 @@ class Parser } // Process SelectExpressions (1..N) - $selectExpressions = array(); + $selectExpressions = []; $selectExpressions[] = $this->SelectExpression(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -1237,20 +1237,20 @@ class Parser $class = $this->em->getClassMetadata($abstractSchemaName); // Building queryComponent - $queryComponent = array( + $queryComponent = [ 'metadata' => $class, 'parent' => null, 'relation' => null, 'map' => null, 'nestingLevel' => $this->nestingLevel, 'token' => $token, - ); + ]; $this->queryComponents[$aliasIdentificationVariable] = $queryComponent; $this->match(Lexer::T_SET); - $updateItems = array(); + $updateItems = []; $updateItems[] = $this->UpdateItem(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -1295,14 +1295,14 @@ class Parser $class = $this->em->getClassMetadata($deleteClause->abstractSchemaName); // Building queryComponent - $queryComponent = array( + $queryComponent = [ 'metadata' => $class, 'parent' => null, 'relation' => null, 'map' => null, 'nestingLevel' => $this->nestingLevel, 'token' => $token, - ); + ]; $this->queryComponents[$aliasIdentificationVariable] = $queryComponent; @@ -1318,7 +1318,7 @@ class Parser { $this->match(Lexer::T_FROM); - $identificationVariableDeclarations = array(); + $identificationVariableDeclarations = []; $identificationVariableDeclarations[] = $this->IdentificationVariableDeclaration(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -1339,7 +1339,7 @@ class Parser { $this->match(Lexer::T_FROM); - $identificationVariables = array(); + $identificationVariables = []; $identificationVariables[] = $this->SubselectIdentificationVariableDeclaration(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -1385,7 +1385,7 @@ class Parser $this->match(Lexer::T_GROUP); $this->match(Lexer::T_BY); - $groupByItems = array($this->GroupByItem()); + $groupByItems = [$this->GroupByItem()]; while ($this->lexer->isNextToken(Lexer::T_COMMA)) { $this->match(Lexer::T_COMMA); @@ -1406,7 +1406,7 @@ class Parser $this->match(Lexer::T_ORDER); $this->match(Lexer::T_BY); - $orderByItems = array(); + $orderByItems = []; $orderByItems[] = $this->OrderByItem(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -1583,7 +1583,7 @@ class Parser */ public function IdentificationVariableDeclaration() { - $joins = array(); + $joins = []; $rangeVariableDeclaration = $this->RangeVariableDeclaration(); $indexBy = $this->lexer->isNextToken(Lexer::T_INDEX) ? $this->IndexBy() @@ -1739,14 +1739,14 @@ class Parser $classMetadata = $this->em->getClassMetadata($abstractSchemaName); // Building queryComponent - $queryComponent = array( + $queryComponent = [ 'metadata' => $classMetadata, 'parent' => null, 'relation' => null, 'map' => null, 'nestingLevel' => $this->nestingLevel, 'token' => $token - ); + ]; $this->queryComponents[$aliasIdentificationVariable] = $queryComponent; @@ -1776,14 +1776,14 @@ class Parser $targetClass = $this->em->getClassMetadata($class->associationMappings[$field]['targetEntity']); // Building queryComponent - $joinQueryComponent = array( + $joinQueryComponent = [ 'metadata' => $targetClass, 'parent' => $joinAssociationPathExpression->identificationVariable, 'relation' => $class->getAssociationMapping($field), 'map' => null, 'nestingLevel' => $this->nestingLevel, 'token' => $this->lexer->lookahead - ); + ]; $this->queryComponents[$aliasIdentificationVariable] = $joinQueryComponent; @@ -1800,7 +1800,7 @@ class Parser { $this->match(Lexer::T_PARTIAL); - $partialFieldSet = array(); + $partialFieldSet = []; $identificationVariable = $this->IdentificationVariable(); @@ -1822,15 +1822,15 @@ class Parser while ($this->lexer->isNextToken(Lexer::T_COMMA)) { $this->match(Lexer::T_COMMA); $this->match(Lexer::T_IDENTIFIER); - + $field = $this->lexer->token['value']; - + while ($this->lexer->isNextToken(Lexer::T_DOT)) { $this->match(Lexer::T_DOT); $this->match(Lexer::T_IDENTIFIER); $field .= '.'.$this->lexer->token['value']; } - + $partialFieldSet[] = $field; } @@ -1839,11 +1839,11 @@ class Parser $partialObjectExpression = new AST\PartialObjectExpression($identificationVariable, $partialFieldSet); // Defer PartialObjectExpression validation - $this->deferredPartialObjectExpressions[] = array( + $this->deferredPartialObjectExpressions[] = [ 'expression' => $partialObjectExpression, 'nestingLevel' => $this->nestingLevel, 'token' => $this->lexer->token, - ); + ]; return $partialObjectExpression; } @@ -1875,11 +1875,11 @@ class Parser $expression = new AST\NewObjectExpression($className, $args); // Defer NewObjectExpression validation - $this->deferredNewObjectExpressions[] = array( + $this->deferredNewObjectExpressions[] = [ 'token' => $token, 'expression' => $expression, 'nestingLevel' => $this->nestingLevel, - ); + ]; return $expression; } @@ -2058,7 +2058,7 @@ class Parser $this->match(Lexer::T_OPEN_PARENTHESIS); // Process ScalarExpressions (1..N) - $scalarExpressions = array(); + $scalarExpressions = []; $scalarExpressions[] = $this->ScalarExpression(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -2101,7 +2101,7 @@ class Parser $this->match(Lexer::T_CASE); // Process WhenClause (1..N) - $whenClauses = array(); + $whenClauses = []; do { $whenClauses[] = $this->WhenClause(); @@ -2126,7 +2126,7 @@ class Parser $caseOperand = $this->StateFieldPathExpression(); // Process SimpleWhenClause (1..N) - $simpleWhenClauses = array(); + $simpleWhenClauses = []; do { $simpleWhenClauses[] = $this->SimpleWhenClause(); @@ -2283,11 +2283,11 @@ class Parser $aliasResultVariable = $this->AliasResultVariable(); // Include AliasResultVariable in query components. - $this->queryComponents[$aliasResultVariable] = array( + $this->queryComponents[$aliasResultVariable] = [ 'resultVariable' => $expression, 'nestingLevel' => $this->nestingLevel, 'token' => $token, - ); + ]; } // AST @@ -2377,11 +2377,11 @@ class Parser $expr->fieldIdentificationVariable = $resultVariable; // Include AliasResultVariable in query components. - $this->queryComponents[$resultVariable] = array( + $this->queryComponents[$resultVariable] = [ 'resultvariable' => $expr, 'nestingLevel' => $this->nestingLevel, 'token' => $token, - ); + ]; } return $expr; @@ -2394,7 +2394,7 @@ class Parser */ public function ConditionalExpression() { - $conditionalTerms = array(); + $conditionalTerms = []; $conditionalTerms[] = $this->ConditionalTerm(); while ($this->lexer->isNextToken(Lexer::T_OR)) { @@ -2419,7 +2419,7 @@ class Parser */ public function ConditionalTerm() { - $conditionalFactors = array(); + $conditionalFactors = []; $conditionalFactors[] = $this->ConditionalFactor(); while ($this->lexer->isNextToken(Lexer::T_AND)) { @@ -2484,8 +2484,8 @@ class Parser // Peek beyond the matching closing parenthesis ')' $peek = $this->peekBeyondClosingParenthesis(); - if (in_array($peek['value'], array("=", "<", "<=", "<>", ">", ">=", "!=")) || - in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS)) || + if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) || + in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) || $this->isMathOperator($peek)) { $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression(); @@ -2741,7 +2741,7 @@ class Parser */ public function SimpleArithmeticExpression() { - $terms = array(); + $terms = []; $terms[] = $this->ArithmeticTerm(); while (($isPlus = $this->lexer->isNextToken(Lexer::T_PLUS)) || $this->lexer->isNextToken(Lexer::T_MINUS)) { @@ -2767,7 +2767,7 @@ class Parser */ public function ArithmeticTerm() { - $factors = array(); + $factors = []; $factors[] = $this->ArithmeticFactor(); while (($isMult = $this->lexer->isNextToken(Lexer::T_MULTIPLY)) || $this->lexer->isNextToken(Lexer::T_DIVIDE)) { @@ -2988,7 +2988,7 @@ class Parser $lookaheadType = $this->lexer->lookahead['type']; $isDistinct = false; - if ( ! in_array($lookaheadType, array(Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM))) { + if ( ! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM])) { $this->syntaxError('One of: MAX, MIN, AVG, SUM, COUNT'); } @@ -3018,7 +3018,7 @@ class Parser $lookaheadType = $this->lexer->lookahead['type']; $value = $this->lexer->lookahead['value']; - if ( ! in_array($lookaheadType, array(Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME))) { + if ( ! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME])) { $this->syntaxError('ALL, ANY or SOME'); } @@ -3097,7 +3097,7 @@ class Parser if ($this->lexer->isNextToken(Lexer::T_SELECT)) { $inExpression->subselect = $this->Subselect(); } else { - $literals = array(); + $literals = []; $literals[] = $this->InParameter(); while ($this->lexer->isNextToken(Lexer::T_COMMA)) { @@ -3130,7 +3130,7 @@ class Parser $this->match(Lexer::T_INSTANCE); $this->match(Lexer::T_OF); - $exprValues = array(); + $exprValues = []; if ($this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) { $this->match(Lexer::T_OPEN_PARENTHESIS); diff --git a/lib/Doctrine/ORM/Query/ParserResult.php b/lib/Doctrine/ORM/Query/ParserResult.php index dfc7361f8..84ad17822 100644 --- a/lib/Doctrine/ORM/Query/ParserResult.php +++ b/lib/Doctrine/ORM/Query/ParserResult.php @@ -51,7 +51,7 @@ class ParserResult * * @var array */ - private $_parameterMappings = array(); + private $_parameterMappings = []; /** * Initializes a new instance of the ParserResult class. diff --git a/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php b/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php index 73a1b4dd1..dbdaeb40c 100644 --- a/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php +++ b/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php @@ -37,12 +37,12 @@ class QueryExpressionVisitor extends ExpressionVisitor /** * @var array */ - private static $operatorMap = array( + private static $operatorMap = [ Comparison::GT => Expr\Comparison::GT, Comparison::GTE => Expr\Comparison::GTE, Comparison::LT => Expr\Comparison::LT, Comparison::LTE => Expr\Comparison::LTE - ); + ]; /** * @var array @@ -57,7 +57,7 @@ class QueryExpressionVisitor extends ExpressionVisitor /** * @var array */ - private $parameters = array(); + private $parameters = []; /** * Constructor @@ -88,7 +88,7 @@ class QueryExpressionVisitor extends ExpressionVisitor */ public function clearParameters() { - $this->parameters = array(); + $this->parameters = []; } /** @@ -108,7 +108,7 @@ class QueryExpressionVisitor extends ExpressionVisitor */ public function walkCompositeExpression(CompositeExpression $expr) { - $expressionList = array(); + $expressionList = []; foreach ($expr->getExpressionList() as $child) { $expressionList[] = $this->dispatch($child); @@ -160,11 +160,11 @@ class QueryExpressionVisitor extends ExpressionVisitor switch ($comparison->getOperator()) { case Comparison::IN: $this->parameters[] = $parameter; - + return $this->expr->in($field, $placeholder); case Comparison::NIN: $this->parameters[] = $parameter; - + return $this->expr->notIn($field, $placeholder); case Comparison::EQ: case Comparison::IS: @@ -172,19 +172,19 @@ class QueryExpressionVisitor extends ExpressionVisitor return $this->expr->isNull($field); } $this->parameters[] = $parameter; - + return $this->expr->eq($field, $placeholder); case Comparison::NEQ: if ($this->walkValue($comparison->getValue()) === null) { return $this->expr->isNotNull($field); } $this->parameters[] = $parameter; - + return $this->expr->neq($field, $placeholder); case Comparison::CONTAINS: $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType()); $this->parameters[] = $parameter; - + return $this->expr->like($field, $placeholder); default: $operator = self::convertComparisonOperator($comparison->getOperator()); diff --git a/lib/Doctrine/ORM/Query/ResultSetMapping.php b/lib/Doctrine/ORM/Query/ResultSetMapping.php index b80acf0cc..5c4550980 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMapping.php +++ b/lib/Doctrine/ORM/Query/ResultSetMapping.php @@ -57,7 +57,7 @@ class ResultSetMapping * @ignore * @var array */ - public $aliasMap = array(); + public $aliasMap = []; /** * Maps alias names to related association field names. @@ -65,7 +65,7 @@ class ResultSetMapping * @ignore * @var array */ - public $relationMap = array(); + public $relationMap = []; /** * Maps alias names to parent alias names. @@ -73,7 +73,7 @@ class ResultSetMapping * @ignore * @var array */ - public $parentAliasMap = array(); + public $parentAliasMap = []; /** * Maps column names in the result set to field names for each class. @@ -81,7 +81,7 @@ class ResultSetMapping * @ignore * @var array */ - public $fieldMappings = array(); + public $fieldMappings = []; /** * Maps column names in the result set to the alias/field name to use in the mapped result. @@ -89,7 +89,7 @@ class ResultSetMapping * @ignore * @var array */ - public $scalarMappings = array(); + public $scalarMappings = []; /** * Maps column names in the result set to the alias/field type to use in the mapped result. @@ -97,7 +97,7 @@ class ResultSetMapping * @ignore * @var array */ - public $typeMappings = array(); + public $typeMappings = []; /** * Maps entities in the result set to the alias name to use in the mapped result. @@ -105,7 +105,7 @@ class ResultSetMapping * @ignore * @var array */ - public $entityMappings = array(); + public $entityMappings = []; /** * Maps column names of meta columns (foreign keys, discriminator columns, ...) to field names. @@ -113,7 +113,7 @@ class ResultSetMapping * @ignore * @var array */ - public $metaMappings = array(); + public $metaMappings = []; /** * Maps column names in the result set to the alias they belong to. @@ -121,7 +121,7 @@ class ResultSetMapping * @ignore * @var array */ - public $columnOwnerMap = array(); + public $columnOwnerMap = []; /** * List of columns in the result set that are used as discriminator columns. @@ -129,7 +129,7 @@ class ResultSetMapping * @ignore * @var array */ - public $discriminatorColumns = array(); + public $discriminatorColumns = []; /** * Maps alias names to field names that should be used for indexing. @@ -137,7 +137,7 @@ class ResultSetMapping * @ignore * @var array */ - public $indexByMap = array(); + public $indexByMap = []; /** * Map from column names to class names that declare the field the column is mapped to. @@ -145,28 +145,28 @@ class ResultSetMapping * @ignore * @var array */ - public $declaringClasses = array(); + public $declaringClasses = []; /** * This is necessary to hydrate derivate foreign keys correctly. * * @var array */ - public $isIdentifierColumn = array(); + public $isIdentifierColumn = []; /** * Maps column names in the result set to field names for each new object expression. * * @var array */ - public $newObjectMappings = array(); + public $newObjectMappings = []; /** * Maps metadata parameter names to the metadata attribute. * * @var array */ - public $metadataParameterMapping = array(); + public $metadataParameterMapping = []; /** * Adds an entity result to this ResultSetMapping. diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index 73eb5ae5a..887d02c6f 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -97,7 +97,7 @@ class ResultSetMappingBuilder extends ResultSetMapping * * @return void */ - public function addRootEntityFromClassMetadata($class, $alias, $renamedColumns = array(), $renameMode = null) + public function addRootEntityFromClassMetadata($class, $alias, $renamedColumns = [], $renameMode = null) { $renameMode = $renameMode ?: $this->defaultRenameMode; $columnAliasMap = $this->getColumnAliasMap($class, $renameMode, $renamedColumns); @@ -119,7 +119,7 @@ class ResultSetMappingBuilder extends ResultSetMapping * * @return void */ - public function addJoinedEntityFromClassMetadata($class, $alias, $parentAlias, $relation, $renamedColumns = array(), $renameMode = null) + public function addJoinedEntityFromClassMetadata($class, $alias, $parentAlias, $relation, $renamedColumns = [], $renameMode = null) { $renameMode = $renameMode ?: $this->defaultRenameMode; $columnAliasMap = $this->getColumnAliasMap($class, $renameMode, $renamedColumns); @@ -139,7 +139,7 @@ class ResultSetMappingBuilder extends ResultSetMapping * * @throws \InvalidArgumentException */ - protected function addAllClassFields($class, $alias, $columnAliasMap = array()) + protected function addAllClassFields($class, $alias, $columnAliasMap = []) { $classMetadata = $this->em->getClassMetadata($class); $platform = $this->em->getConnection()->getDatabasePlatform(); @@ -232,7 +232,7 @@ class ResultSetMappingBuilder extends ResultSetMapping $mode = self::COLUMN_RENAMING_CUSTOM; } - $columnAlias = array(); + $columnAlias = []; $class = $this->em->getClassMetadata($className); foreach ($class->getColumnNames() as $columnName) { @@ -436,7 +436,7 @@ class ResultSetMappingBuilder extends ResultSetMapping * * @return string */ - public function generateSelectClause($tableAliases = array()) + public function generateSelectClause($tableAliases = []) { $sql = ""; @@ -470,6 +470,6 @@ class ResultSetMappingBuilder extends ResultSetMapping */ public function __toString() { - return $this->generateSelectClause(array()); + return $this->generateSelectClause([]); } } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 6e607ffa9..fb6efb9c7 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -109,28 +109,28 @@ class SqlWalker implements TreeWalker /** * @var array */ - private $tableAliasMap = array(); + private $tableAliasMap = []; /** * Map from result variable names to their SQL column alias names. * * @var array */ - private $scalarResultAliasMap = array(); + private $scalarResultAliasMap = []; /** * Map from Table-Alias + Column-Name to OrderBy-Direction. * * @var array */ - private $orderedColumnsMap = array(); + private $orderedColumnsMap = []; /** * Map from DQL-Alias + Field-Name to SQL Column Alias. * * @var array */ - private $scalarFields = array(); + private $scalarFields = []; /** * Map of all components/classes that appear in the DQL query. @@ -144,14 +144,14 @@ class SqlWalker implements TreeWalker * * @var array */ - private $selectedClasses = array(); + private $selectedClasses = []; /** * The DQL alias of the root class of the currently traversed query. * * @var array */ - private $rootAliases = array(); + private $rootAliases = []; /** * Flag that indicates whether to generate SQL table aliases in the SQL. @@ -245,7 +245,7 @@ class SqlWalker implements TreeWalker */ public function setQueryComponent($dqlAlias, array $queryComponent) { - $requiredKeys = array('metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token'); + $requiredKeys = ['metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token']; if (array_diff($requiredKeys, array_keys($queryComponent))) { throw QueryException::invalidQueryComponent($dqlAlias); @@ -354,7 +354,7 @@ class SqlWalker implements TreeWalker $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER '; $sql .= 'JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; - $sqlParts = array(); + $sqlParts = []; foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) { $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName; @@ -380,7 +380,7 @@ class SqlWalker implements TreeWalker $sql .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON '; - $sqlParts = array(); + $sqlParts = []; foreach ($this->quoteStrategy->getIdentifierColumnNames($subClass, $this->platform) as $columnName) { $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName; @@ -397,7 +397,7 @@ class SqlWalker implements TreeWalker */ private function _generateOrderedCollectionOrderByItems() { - $orderedColumns = array(); + $orderedColumns = []; foreach ($this->selectedClasses as $selectedClass) { $dqlAlias = $selectedClass['dqlAlias']; @@ -439,7 +439,7 @@ class SqlWalker implements TreeWalker */ private function _generateDiscriminatorColumnConditionSQL(array $dqlAliases) { - $sqlParts = array(); + $sqlParts = []; foreach ($dqlAliases as $dqlAlias) { $class = $this->queryComponents[$dqlAlias]['metadata']; @@ -447,7 +447,7 @@ class SqlWalker implements TreeWalker if ( ! $class->isInheritanceTypeSingleTable()) continue; $conn = $this->em->getConnection(); - $values = array(); + $values = []; if ($class->discriminatorValue !== null) { // discriminators can be 0 $values[] = $conn->quote($class->discriminatorValue); @@ -503,7 +503,7 @@ class SqlWalker implements TreeWalker return ''; } - $filterClauses = array(); + $filterClauses = []; foreach ($this->em->getFilters()->getEnabledFilters() as $filter) { if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { $filterClauses[] = '(' . $filterExpr . ')'; @@ -606,7 +606,7 @@ class SqlWalker implements TreeWalker { $class = $this->queryComponents[$identVariable]['metadata']; $tableAlias = $this->getSQLTableAlias($class->getTableName(), $identVariable); - $sqlParts = array(); + $sqlParts = []; foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) { $sqlParts[] = $tableAlias . '.' . $columnName; @@ -699,7 +699,7 @@ class SqlWalker implements TreeWalker public function walkSelectClause($selectClause) { $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : ''); - $sqlSelectExpressions = array_filter(array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions)); + $sqlSelectExpressions = array_filter(array_map([$this, 'walkSelectExpression'], $selectClause->selectExpressions)); if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && $selectClause->isDistinct) { $this->query->setHint(self::HINT_DISTINCT, true); @@ -812,7 +812,7 @@ class SqlWalker implements TreeWalker public function walkFromClause($fromClause) { $identificationVarDecls = $fromClause->identificationVariableDeclarations; - $sqlParts = array(); + $sqlParts = []; foreach ($identificationVarDecls as $identificationVariableDecl) { $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl); @@ -937,7 +937,7 @@ class SqlWalker implements TreeWalker // The owning side is necessary at this point because only it contains the JoinColumn information. switch (true) { case ($assoc['type'] & ClassMetadata::TO_ONE): - $conditions = array(); + $conditions = []; foreach ($assoc['joinColumns'] as $joinColumn) { $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform); @@ -953,7 +953,7 @@ class SqlWalker implements TreeWalker } // Apply remaining inheritance restrictions - $discrSql = $this->_generateDiscriminatorColumnConditionSQL(array($joinedDqlAlias)); + $discrSql = $this->_generateDiscriminatorColumnConditionSQL([$joinedDqlAlias]); if ($discrSql) { $conditions[] = $discrSql; @@ -966,10 +966,10 @@ class SqlWalker implements TreeWalker $conditions[] = $filterExpr; } - $targetTableJoin = array( + $targetTableJoin = [ 'table' => $targetTableName . ' ' . $targetTableAlias, 'condition' => implode(' AND ', $conditions), - ); + ]; break; case ($assoc['type'] == ClassMetadata::MANY_TO_MANY): @@ -978,7 +978,7 @@ class SqlWalker implements TreeWalker $joinTableAlias = $this->getSQLTableAlias($joinTable['name'], $joinedDqlAlias); $joinTableName = $this->quoteStrategy->getJoinTableName($assoc, $sourceClass, $this->platform); - $conditions = array(); + $conditions = []; $relationColumns = ($relation['isOwningSide']) ? $assoc['joinTable']['joinColumns'] : $assoc['joinTable']['inverseJoinColumns']; @@ -995,7 +995,7 @@ class SqlWalker implements TreeWalker // Join target table $sql .= ($joinType == AST\Join::JOIN_TYPE_LEFT || $joinType == AST\Join::JOIN_TYPE_LEFTOUTER) ? ' LEFT JOIN ' : ' INNER JOIN '; - $conditions = array(); + $conditions = []; $relationColumns = ($relation['isOwningSide']) ? $assoc['joinTable']['inverseJoinColumns'] : $assoc['joinTable']['joinColumns']; @@ -1008,7 +1008,7 @@ class SqlWalker implements TreeWalker } // Apply remaining inheritance restrictions - $discrSql = $this->_generateDiscriminatorColumnConditionSQL(array($joinedDqlAlias)); + $discrSql = $this->_generateDiscriminatorColumnConditionSQL([$joinedDqlAlias]); if ($discrSql) { $conditions[] = $discrSql; @@ -1021,10 +1021,10 @@ class SqlWalker implements TreeWalker $conditions[] = $filterExpr; } - $targetTableJoin = array( + $targetTableJoin = [ 'table' => $targetTableName . ' ' . $targetTableAlias, 'condition' => implode(' AND ', $conditions), - ); + ]; break; default: @@ -1074,7 +1074,7 @@ class SqlWalker implements TreeWalker */ public function walkOrderByClause($orderByClause) { - $orderByItems = array_map(array($this, 'walkOrderByItem'), $orderByClause->orderByItems); + $orderByItems = array_map([$this, 'walkOrderByItem'], $orderByClause->orderByItems); if (($collectionOrderByItems = $this->_generateOrderedCollectionOrderByItems()) !== '') { $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems); @@ -1141,7 +1141,7 @@ class SqlWalker implements TreeWalker $sql .= $this->walkRangeVariableDeclaration($joinDeclaration); // Apply remaining inheritance restrictions - $discrSql = $this->_generateDiscriminatorColumnConditionSQL(array($dqlAlias)); + $discrSql = $this->_generateDiscriminatorColumnConditionSQL([$dqlAlias]); if ($discrSql) { $conditions[] = $discrSql; @@ -1206,7 +1206,7 @@ class SqlWalker implements TreeWalker { $sql = 'COALESCE('; - $scalarExpressions = array(); + $scalarExpressions = []; foreach ($coalesceExpression->scalarExpressions as $scalarExpression) { $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression); @@ -1375,7 +1375,7 @@ class SqlWalker implements TreeWalker $partialFieldSet = $expr->partialFieldSet; } else { $dqlAlias = $expr; - $partialFieldSet = array(); + $partialFieldSet = []; } $queryComp = $this->queryComponents[$dqlAlias]; @@ -1383,14 +1383,14 @@ class SqlWalker implements TreeWalker $resultAlias = $selectExpression->fieldIdentificationVariable ?: null; if ( ! isset($this->selectedClasses[$dqlAlias])) { - $this->selectedClasses[$dqlAlias] = array( + $this->selectedClasses[$dqlAlias] = [ 'class' => $class, 'dqlAlias' => $dqlAlias, 'resultAlias' => $resultAlias - ); + ]; } - $sqlParts = array(); + $sqlParts = []; // Select all fields from the queried class foreach ($class->fieldMappings as $fieldName => $mapping) { @@ -1475,7 +1475,7 @@ class SqlWalker implements TreeWalker $useAliasesBefore = $this->useSqlTableAliases; $rootAliasesBefore = $this->rootAliases; - $this->rootAliases = array(); // reset the rootAliases for the subselect + $this->rootAliases = []; // reset the rootAliases for the subselect $this->useSqlTableAliases = true; $sql = $this->walkSimpleSelectClause($subselect->simpleSelectClause); @@ -1498,7 +1498,7 @@ class SqlWalker implements TreeWalker public function walkSubselectFromClause($subselectFromClause) { $identificationVarDecls = $subselectFromClause->identificationVariableDeclarations; - $sqlParts = array (); + $sqlParts = []; foreach ($identificationVarDecls as $subselectIdVarDecl) { $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl); @@ -1533,7 +1533,7 @@ class SqlWalker implements TreeWalker */ public function walkNewObject($newObjectExpression, $newObjectResultAlias=null) { - $sqlSelectExpressions = array(); + $sqlSelectExpressions = []; $objIndex = $newObjectResultAlias?:$this->newObjectCounter++; foreach ($newObjectExpression->args as $argIndex => $e) { @@ -1581,11 +1581,11 @@ class SqlWalker implements TreeWalker $this->scalarResultAliasMap[$resultAlias] = $columnAlias; $this->rsm->addScalarResult($columnAlias, $resultAlias, $fieldType); - $this->rsm->newObjectMappings[$columnAlias] = array( + $this->rsm->newObjectMappings[$columnAlias] = [ 'className' => $newObjectExpression->className, 'objIndex' => $objIndex, 'argIndex' => $argIndex - ); + ]; } return implode(', ', $sqlSelectExpressions); @@ -1662,7 +1662,7 @@ class SqlWalker implements TreeWalker */ public function walkGroupByClause($groupByClause) { - $sqlParts = array(); + $sqlParts = []; foreach ($groupByClause->groupByItems as $groupByItem) { $sqlParts[] = $this->walkGroupByItem($groupByItem); @@ -1697,7 +1697,7 @@ class SqlWalker implements TreeWalker } // IdentificationVariable - $sqlParts = array(); + $sqlParts = []; foreach ($this->queryComponents[$groupByItem]['metadata']->fieldNames as $field) { $item = new AST\PathExpression(AST\PathExpression::TYPE_STATE_FIELD, $groupByItem, $field); @@ -1745,7 +1745,7 @@ class SqlWalker implements TreeWalker $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable); $this->rootAliases[] = $updateClause->aliasIdentificationVariable; - $sql .= ' SET ' . implode(', ', array_map(array($this, 'walkUpdateItem'), $updateClause->updateItems)); + $sql .= ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems)); return $sql; } @@ -1789,7 +1789,7 @@ class SqlWalker implements TreeWalker $discrSql = $this->_generateDiscriminatorColumnConditionSql($this->rootAliases); if ($this->em->hasFilters()) { - $filterClauses = array(); + $filterClauses = []; foreach ($this->rootAliases as $dqlAlias) { $class = $this->queryComponents[$dqlAlias]['metadata']; $tableAlias = $this->getSQLTableAlias($class->table['name'], $dqlAlias); @@ -1830,7 +1830,7 @@ class SqlWalker implements TreeWalker return $this->walkConditionalTerm($condExpr); } - return implode(' OR ', array_map(array($this, 'walkConditionalTerm'), $condExpr->conditionalTerms)); + return implode(' OR ', array_map([$this, 'walkConditionalTerm'], $condExpr->conditionalTerms)); } /** @@ -1844,7 +1844,7 @@ class SqlWalker implements TreeWalker return $this->walkConditionalFactor($condTerm); } - return implode(' AND ', array_map(array($this, 'walkConditionalFactor'), $condTerm->conditionalFactors)); + return implode(' AND ', array_map([$this, 'walkConditionalFactor'], $condTerm->conditionalFactors)); } /** @@ -1929,7 +1929,7 @@ class SqlWalker implements TreeWalker $sql .= $this->quoteStrategy->getTableName($targetClass, $this->platform) . ' ' . $targetTableAlias . ' WHERE '; $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']]; - $sqlParts = array(); + $sqlParts = []; foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) { $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $this->platform); @@ -1963,7 +1963,7 @@ class SqlWalker implements TreeWalker // join conditions $joinColumns = $assoc['isOwningSide'] ? $joinTable['inverseJoinColumns'] : $joinTable['joinColumns']; - $joinSqlParts = array(); + $joinSqlParts = []; foreach ($joinColumns as $joinColumn) { $targetColumn = $this->quoteStrategy->getColumnName($targetClass->fieldNames[$joinColumn['referencedColumnName']], $targetClass, $this->platform); @@ -1975,7 +1975,7 @@ class SqlWalker implements TreeWalker $sql .= ' WHERE '; $joinColumns = $assoc['isOwningSide'] ? $joinTable['joinColumns'] : $joinTable['inverseJoinColumns']; - $sqlParts = array(); + $sqlParts = []; foreach ($joinColumns as $joinColumn) { $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$joinColumn['referencedColumnName']], $class, $this->platform); @@ -2038,7 +2038,7 @@ class SqlWalker implements TreeWalker $sql .= ($inExpr->subselect) ? $this->walkSubselect($inExpr->subselect) - : implode(', ', array_map(array($this, 'walkInParameter'), $inExpr->literals)); + : implode(', ', array_map([$this, 'walkInParameter'], $inExpr->literals)); $sql .= ')'; @@ -2065,7 +2065,7 @@ class SqlWalker implements TreeWalker $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN '); - $sqlParameterList = array(); + $sqlParameterList = []; foreach ($instanceOfExpr->value as $parameter) { if ($parameter instanceof AST\InputParameter) { @@ -2239,7 +2239,7 @@ class SqlWalker implements TreeWalker return $this->walkArithmeticTerm($simpleArithmeticExpr); } - return implode(' ', array_map(array($this, 'walkArithmeticTerm'), $simpleArithmeticExpr->arithmeticTerms)); + return implode(' ', array_map([$this, 'walkArithmeticTerm'], $simpleArithmeticExpr->arithmeticTerms)); } /** @@ -2259,7 +2259,7 @@ class SqlWalker implements TreeWalker return $this->walkArithmeticFactor($term); } - return implode(' ', array_map(array($this, 'walkArithmeticFactor'), $term->arithmeticFactors)); + return implode(' ', array_map([$this, 'walkArithmeticFactor'], $term->arithmeticFactors)); } /** diff --git a/lib/Doctrine/ORM/Query/TreeWalkerAdapter.php b/lib/Doctrine/ORM/Query/TreeWalkerAdapter.php index 529d855aa..deee03ab5 100644 --- a/lib/Doctrine/ORM/Query/TreeWalkerAdapter.php +++ b/lib/Doctrine/ORM/Query/TreeWalkerAdapter.php @@ -72,7 +72,7 @@ abstract class TreeWalkerAdapter implements TreeWalker */ public function setQueryComponent($dqlAlias, array $queryComponent) { - $requiredKeys = array('metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token'); + $requiredKeys = ['metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token']; if (array_diff($requiredKeys, array_keys($queryComponent))) { throw QueryException::invalidQueryComponent($dqlAlias); diff --git a/lib/Doctrine/ORM/Query/TreeWalkerChain.php b/lib/Doctrine/ORM/Query/TreeWalkerChain.php index 573ef88ff..074aa9387 100644 --- a/lib/Doctrine/ORM/Query/TreeWalkerChain.php +++ b/lib/Doctrine/ORM/Query/TreeWalkerChain.php @@ -72,7 +72,7 @@ class TreeWalkerChain implements TreeWalker */ public function setQueryComponent($dqlAlias, array $queryComponent) { - $requiredKeys = array('metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token'); + $requiredKeys = ['metadata', 'parent', 'relation', 'map', 'nestingLevel', 'token']; if (array_diff($requiredKeys, array_keys($queryComponent))) { throw QueryException::invalidQueryComponent($dqlAlias); diff --git a/lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php b/lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php index 30db08175..e72e1d4dc 100644 --- a/lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php +++ b/lib/Doctrine/ORM/Query/TreeWalkerChainIterator.php @@ -27,7 +27,7 @@ class TreeWalkerChainIterator implements \Iterator, \ArrayAccess /** * @var TreeWalker[] */ - private $walkers = array(); + private $walkers = []; /** * @var TreeWalkerChain */ diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 455e39ab3..70b55f17d 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -57,17 +57,17 @@ class QueryBuilder * * @var array */ - private $_dqlParts = array( + private $_dqlParts = [ 'distinct' => false, - 'select' => array(), - 'from' => array(), - 'join' => array(), - 'set' => array(), + 'select' => [], + 'from' => [], + 'join' => [], + 'set' => [], 'where' => null, - 'groupBy' => array(), + 'groupBy' => [], 'having' => null, - 'orderBy' => array() - ); + 'orderBy' => [] + ]; /** * The type of query this is. Can be select, update or delete. @@ -116,7 +116,7 @@ class QueryBuilder * * @var array */ - private $joinRootAliases = array(); + private $joinRootAliases = []; /** * Whether to use second level cache, if available. @@ -444,7 +444,7 @@ class QueryBuilder */ public function getRootAliases() { - $aliases = array(); + $aliases = []; foreach ($this->_dqlParts['from'] as &$fromClause) { if (is_string($fromClause)) { @@ -496,7 +496,7 @@ class QueryBuilder */ public function getRootEntities() { - $entities = array(); + $entities = []; foreach ($this->_dqlParts['from'] as &$fromClause) { if (is_string($fromClause)) { @@ -707,7 +707,7 @@ class QueryBuilder // This is introduced for backwards compatibility reasons. // TODO: Remove for 3.0 if ($dqlPartName == 'join') { - $newDqlPart = array(); + $newDqlPart = []; foreach ($dqlPart as $k => $v) { $k = is_numeric($k) ? $this->getRootAlias() : $k; @@ -727,7 +727,7 @@ class QueryBuilder $this->_dqlParts[$dqlPartName][] = $dqlPart; } } else { - $this->_dqlParts[$dqlPartName] = ($isMultiple) ? array($dqlPart) : $dqlPart; + $this->_dqlParts[$dqlPartName] = ($isMultiple) ? [$dqlPart] : $dqlPart; } $this->_state = self::STATE_DIRTY; @@ -990,7 +990,7 @@ class QueryBuilder Expr\Join::INNER_JOIN, $join, $alias, $conditionType, $condition, $indexBy ); - return $this->add('join', array($rootAlias => $join), true); + return $this->add('join', [$rootAlias => $join], true); } /** @@ -1025,7 +1025,7 @@ class QueryBuilder Expr\Join::LEFT_JOIN, $join, $alias, $conditionType, $condition, $indexBy ); - return $this->add('join', array($rootAlias => $join), true); + return $this->add('join', [$rootAlias => $join], true); } /** @@ -1374,9 +1374,9 @@ class QueryBuilder private function _getDQLForDelete() { return 'DELETE' - . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', ')) - . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE ')) - . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', ')); + . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); } /** @@ -1385,10 +1385,10 @@ class QueryBuilder private function _getDQLForUpdate() { return 'UPDATE' - . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', ')) - . $this->_getReducedDQLQueryPart('set', array('pre' => ' SET ', 'separator' => ', ')) - . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE ')) - . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', ')); + . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) + . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', ']) + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); } /** @@ -1398,11 +1398,11 @@ class QueryBuilder { $dql = 'SELECT' . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '') - . $this->_getReducedDQLQueryPart('select', array('pre' => ' ', 'separator' => ', ')); + . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']); $fromParts = $this->getDQLPart('from'); $joinParts = $this->getDQLPart('join'); - $fromClauses = array(); + $fromClauses = []; // Loop through all FROM clauses if ( ! empty($fromParts)) { @@ -1422,10 +1422,10 @@ class QueryBuilder } $dql .= implode(', ', $fromClauses) - . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE ')) - . $this->_getReducedDQLQueryPart('groupBy', array('pre' => ' GROUP BY ', 'separator' => ', ')) - . $this->_getReducedDQLQueryPart('having', array('pre' => ' HAVING ')) - . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', ')); + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) + . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', ']) + . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING ']) + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); return $dql; } @@ -1436,7 +1436,7 @@ class QueryBuilder * * @return string */ - private function _getReducedDQLQueryPart($queryPartName, $options = array()) + private function _getReducedDQLQueryPart($queryPartName, $options = []) { $queryPart = $this->getDQLPart($queryPartName); @@ -1478,7 +1478,7 @@ class QueryBuilder */ public function resetDQLPart($part) { - $this->_dqlParts[$part] = is_array($this->_dqlParts[$part]) ? array() : null; + $this->_dqlParts[$part] = is_array($this->_dqlParts[$part]) ? [] : null; $this->_state = self::STATE_DIRTY; return $this; @@ -1514,7 +1514,7 @@ class QueryBuilder } } - $parameters = array(); + $parameters = []; foreach ($this->parameters as $parameter) { $parameters[] = clone $parameter; diff --git a/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php b/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php index 12163eff6..680962413 100644 --- a/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php +++ b/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php @@ -34,7 +34,7 @@ final class DefaultRepositoryFactory implements RepositoryFactory * * @var \Doctrine\Common\Persistence\ObjectRepository[] */ - private $repositoryList = array(); + private $repositoryList = []; /** * {@inheritdoc} diff --git a/lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php b/lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php index bb0ca81b2..cf7cc8b8b 100644 --- a/lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php +++ b/lib/Doctrine/ORM/Tools/AttachEntityListenersListener.php @@ -33,7 +33,7 @@ class AttachEntityListenersListener /** * @var array[] */ - private $entityListeners = array(); + private $entityListeners = []; /** * Adds a entity listener for a specific entity. @@ -47,11 +47,11 @@ class AttachEntityListenersListener */ public function addEntityListener($entityClass, $listenerClass, $eventName, $listenerCallback = null) { - $this->entityListeners[ltrim($entityClass, '\\')][] = array( + $this->entityListeners[ltrim($entityClass, '\\')][] = [ 'event' => $eventName, 'class' => $listenerClass, 'method' => $listenerCallback ?: $eventName - ); + ]; } /** diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php index e23d36b24..5bc0c859d 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php @@ -46,12 +46,14 @@ class MetadataCommand extends Command $this ->setName('orm:clear-cache:metadata') ->setDescription('Clear all metadata cache of the various cache drivers.') - ->setDefinition(array( - new InputOption( - 'flush', null, InputOption::VALUE_NONE, - 'If defined, cache entries will be flushed instead of deleted/invalidated.' - ) - )); + ->setDefinition( + [ + new InputOption( + 'flush', null, InputOption::VALUE_NONE, + 'If defined, cache entries will be flushed instead of deleted/invalidated.' + ) + ] + ); $this->setHelp(<<%command.name% command is meant to clear the metadata cache of associated Entity Manager. diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php index f1be98d30..5828d0771 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php @@ -46,12 +46,14 @@ class QueryCommand extends Command $this ->setName('orm:clear-cache:query') ->setDescription('Clear all query cache of the various cache drivers.') - ->setDefinition(array( - new InputOption( - 'flush', null, InputOption::VALUE_NONE, - 'If defined, cache entries will be flushed instead of deleted/invalidated.' - ) - )); + ->setDefinition( + [ + new InputOption( + 'flush', null, InputOption::VALUE_NONE, + 'If defined, cache entries will be flushed instead of deleted/invalidated.' + ) + ] + ); $this->setHelp(<<%command.name% command is meant to clear the query cache of associated Entity Manager. @@ -91,7 +93,7 @@ EOT if ($cacheDriver instanceof XcacheCache) { throw new \LogicException("Cannot clear XCache Cache from Console, its shared in the Webserver memory and not accessible from the CLI."); } - + $output->write('Clearing ALL Query cache entries' . PHP_EOL); $result = $cacheDriver->deleteAll(); diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php index c21f55452..55b89efa8 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php @@ -46,12 +46,14 @@ class ResultCommand extends Command $this ->setName('orm:clear-cache:result') ->setDescription('Clear all result cache of the various cache drivers.') - ->setDefinition(array( - new InputOption( - 'flush', null, InputOption::VALUE_NONE, - 'If defined, cache entries will be flushed instead of deleted/invalidated.' - ) - )); + ->setDefinition( + [ + new InputOption( + 'flush', null, InputOption::VALUE_NONE, + 'If defined, cache entries will be flushed instead of deleted/invalidated.' + ) + ] + ); $this->setHelp(<<%command.name% command is meant to clear the result cache of associated Entity Manager. @@ -92,7 +94,7 @@ EOT if ($cacheDriver instanceof XcacheCache) { throw new \LogicException("Cannot clear XCache Cache from Console, its shared in the Webserver memory and not accessible from the CLI."); } - + $output->writeln('Clearing ALL Result cache entries'); $result = $cacheDriver->deleteAll(); diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php index 71d72deb8..ee370dd0f 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php @@ -102,33 +102,35 @@ class ConvertDoctrine1SchemaCommand extends Command { $this ->setName('orm:convert-d1-schema') - ->setAliases(array('orm:convert:d1-schema')) + ->setAliases(['orm:convert:d1-schema']) ->setDescription('Converts Doctrine 1.X schema into a Doctrine 2.X schema.') - ->setDefinition(array( - new InputArgument( - 'from-path', InputArgument::REQUIRED, 'The path of Doctrine 1.X schema information.' - ), - new InputArgument( - 'to-type', InputArgument::REQUIRED, 'The destination Doctrine 2.X mapping type.' - ), - new InputArgument( - 'dest-path', InputArgument::REQUIRED, - 'The path to generate your Doctrine 2.X mapping information.' - ), - new InputOption( - 'from', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, - 'Optional paths of Doctrine 1.X schema information.', - array() - ), - new InputOption( - 'extend', null, InputOption::VALUE_OPTIONAL, - 'Defines a base class to be extended by generated entity classes.' - ), - new InputOption( - 'num-spaces', null, InputOption::VALUE_OPTIONAL, - 'Defines the number of indentation spaces', 4 - ) - )) + ->setDefinition( + [ + new InputArgument( + 'from-path', InputArgument::REQUIRED, 'The path of Doctrine 1.X schema information.' + ), + new InputArgument( + 'to-type', InputArgument::REQUIRED, 'The destination Doctrine 2.X mapping type.' + ), + new InputArgument( + 'dest-path', InputArgument::REQUIRED, + 'The path to generate your Doctrine 2.X mapping information.' + ), + new InputOption( + 'from', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'Optional paths of Doctrine 1.X schema information.', + [] + ), + new InputOption( + 'extend', null, InputOption::VALUE_OPTIONAL, + 'Defines a base class to be extended by generated entity classes.' + ), + new InputOption( + 'num-spaces', null, InputOption::VALUE_OPTIONAL, + 'Defines the number of indentation spaces', 4 + ) + ] + ) ->setHelp(<<getArgument('from-path')), $input->getOption('from')); + $fromPaths = array_merge([$input->getArgument('from-path')], $input->getOption('from')); // Process destination directory $destPath = realpath($input->getArgument('dest-path')); diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index b229f4a6c..798dbe728 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -49,40 +49,42 @@ class ConvertMappingCommand extends Command { $this ->setName('orm:convert-mapping') - ->setAliases(array('orm:convert:mapping')) + ->setAliases(['orm:convert:mapping']) ->setDescription('Convert mapping information between supported formats.') - ->setDefinition(array( - new InputOption( - 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, - 'A string pattern used to match entities that should be processed.' - ), - new InputArgument( - 'to-type', InputArgument::REQUIRED, 'The mapping type to be converted.' - ), - new InputArgument( - 'dest-path', InputArgument::REQUIRED, - 'The path to generate your entities classes.' - ), - new InputOption( - 'force', 'f', InputOption::VALUE_NONE, - 'Force to overwrite existing mapping files.' - ), - new InputOption( - 'from-database', null, null, 'Whether or not to convert mapping information from existing database.' - ), - new InputOption( - 'extend', null, InputOption::VALUE_OPTIONAL, - 'Defines a base class to be extended by generated entity classes.' - ), - new InputOption( - 'num-spaces', null, InputOption::VALUE_OPTIONAL, - 'Defines the number of indentation spaces', 4 - ), - new InputOption( - 'namespace', null, InputOption::VALUE_OPTIONAL, - 'Defines a namespace for the generated entity classes, if converted from database.' - ), - )) + ->setDefinition( + [ + new InputOption( + 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'A string pattern used to match entities that should be processed.' + ), + new InputArgument( + 'to-type', InputArgument::REQUIRED, 'The mapping type to be converted.' + ), + new InputArgument( + 'dest-path', InputArgument::REQUIRED, + 'The path to generate your entities classes.' + ), + new InputOption( + 'force', 'f', InputOption::VALUE_NONE, + 'Force to overwrite existing mapping files.' + ), + new InputOption( + 'from-database', null, null, 'Whether or not to convert mapping information from existing database.' + ), + new InputOption( + 'extend', null, InputOption::VALUE_OPTIONAL, + 'Defines a base class to be extended by generated entity classes.' + ), + new InputOption( + 'num-spaces', null, InputOption::VALUE_OPTIONAL, + 'Defines the number of indentation spaces', 4 + ), + new InputOption( + 'namespace', null, InputOption::VALUE_OPTIONAL, + 'Defines a namespace for the generated entity classes, if converted from database.' + ), + ] + ) ->setHelp(<<setName('orm:ensure-production-settings') ->setDescription('Verify that Doctrine is properly configured for a production environment.') - ->setDefinition(array( - new InputOption( - 'complete', null, InputOption::VALUE_NONE, - 'Flag to also inspect database connection existence.' - ) - )) + ->setDefinition( + [ + new InputOption( + 'complete', null, InputOption::VALUE_NONE, + 'Flag to also inspect database connection existence.' + ) + ] + ) ->setHelp(<<setName('orm:generate-entities') - ->setAliases(array('orm:generate:entities')) + ->setAliases(['orm:generate:entities']) ->setDescription('Generate entity classes and method stubs from your mapping information.') - ->setDefinition(array( - new InputOption( - 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, - 'A string pattern used to match entities that should be processed.' - ), - new InputArgument( - 'dest-path', InputArgument::REQUIRED, 'The path to generate your entity classes.' - ), - new InputOption( - 'generate-annotations', null, InputOption::VALUE_OPTIONAL, - 'Flag to define if generator should generate annotation metadata on entities.', false - ), - new InputOption( - 'generate-methods', null, InputOption::VALUE_OPTIONAL, - 'Flag to define if generator should generate stub methods on entities.', true - ), - new InputOption( - 'regenerate-entities', null, InputOption::VALUE_OPTIONAL, - 'Flag to define if generator should regenerate entity if it exists.', false - ), - new InputOption( - 'update-entities', null, InputOption::VALUE_OPTIONAL, - 'Flag to define if generator should only update entity if it exists.', true - ), - new InputOption( - 'extend', null, InputOption::VALUE_REQUIRED, - 'Defines a base class to be extended by generated entity classes.' - ), - new InputOption( - 'num-spaces', null, InputOption::VALUE_REQUIRED, - 'Defines the number of indentation spaces', 4 - ), - new InputOption( - 'no-backup', null, InputOption::VALUE_NONE, - 'Flag to define if generator should avoid backuping existing entity file if it exists.' - ) - )) + ->setDefinition( + [ + new InputOption( + 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'A string pattern used to match entities that should be processed.' + ), + new InputArgument( + 'dest-path', InputArgument::REQUIRED, 'The path to generate your entity classes.' + ), + new InputOption( + 'generate-annotations', null, InputOption::VALUE_OPTIONAL, + 'Flag to define if generator should generate annotation metadata on entities.', false + ), + new InputOption( + 'generate-methods', null, InputOption::VALUE_OPTIONAL, + 'Flag to define if generator should generate stub methods on entities.', true + ), + new InputOption( + 'regenerate-entities', null, InputOption::VALUE_OPTIONAL, + 'Flag to define if generator should regenerate entity if it exists.', false + ), + new InputOption( + 'update-entities', null, InputOption::VALUE_OPTIONAL, + 'Flag to define if generator should only update entity if it exists.', true + ), + new InputOption( + 'extend', null, InputOption::VALUE_REQUIRED, + 'Defines a base class to be extended by generated entity classes.' + ), + new InputOption( + 'num-spaces', null, InputOption::VALUE_REQUIRED, + 'Defines the number of indentation spaces', 4 + ), + new InputOption( + 'no-backup', null, InputOption::VALUE_NONE, + 'Flag to define if generator should avoid backuping existing entity file if it exists.' + ) + ] + ) ->setHelp(<<setName('orm:generate-proxies') - ->setAliases(array('orm:generate:proxies')) + ->setAliases(['orm:generate:proxies']) ->setDescription('Generates proxy classes for entity classes.') - ->setDefinition(array( - new InputOption( - 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, - 'A string pattern used to match entities that should be processed.' - ), - new InputArgument( - 'dest-path', InputArgument::OPTIONAL, - 'The path to generate your proxy classes. If none is provided, it will attempt to grab from configuration.' - ), - )) + ->setDefinition( + [ + new InputOption( + 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'A string pattern used to match entities that should be processed.' + ), + new InputArgument( + 'dest-path', InputArgument::OPTIONAL, + 'The path to generate your proxy classes. If none is provided, it will attempt to grab from configuration.' + ), + ] + ) ->setHelp(<<setName('orm:generate-repositories') - ->setAliases(array('orm:generate:repositories')) + ->setAliases(['orm:generate:repositories']) ->setDescription('Generate repository classes from your mapping information.') - ->setDefinition(array( - new InputOption( - 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, - 'A string pattern used to match entities that should be processed.' - ), - new InputArgument( - 'dest-path', InputArgument::REQUIRED, 'The path to generate your repository classes.' - ) - )) + ->setDefinition( + [ + new InputOption( + 'filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, + 'A string pattern used to match entities that should be processed.' + ), + new InputArgument( + 'dest-path', InputArgument::REQUIRED, 'The path to generate your repository classes.' + ) + ] + ) ->setHelp(<<setHeaders(array('Field', 'Value')); + $table->setHeaders(['Field', 'Value']); $metadata = $this->getClassMetadata($entityName, $entityManager); array_map( - array($table, 'addRow'), + [$table, 'addRow'], array_merge( - array( + [ $this->formatField('Name', $metadata->name), $this->formatField('Root entity name', $metadata->rootEntityName), $this->formatField('Custom generator definition', $metadata->customGeneratorDefinition), @@ -118,10 +118,10 @@ EOT $this->formatField('Read only?', $metadata->isReadOnly), $this->formatEntityListeners($metadata->entityListeners), - ), - array($this->formatField('Association mappings:', '')), + ], + [$this->formatField('Association mappings:', '')], $this->formatMappings($metadata->associationMappings), - array($this->formatField('Field mappings:', '')), + [$this->formatField('Field mappings:', '')], $this->formatMappings($metadata->fieldMappings) ) ); @@ -251,7 +251,7 @@ EOT $value = 'None'; } - return array(sprintf('%s', $label), $this->formatValue($value)); + return [sprintf('%s', $label), $this->formatValue($value)]; } /** @@ -263,7 +263,7 @@ EOT */ private function formatMappings(array $propertyMappings) { - $output = array(); + $output = []; foreach ($propertyMappings as $propertyName => $mapping) { $output[] = $this->formatField(sprintf(' %s', $propertyName), ''); diff --git a/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php index abd999aef..b246850a9 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php @@ -46,30 +46,32 @@ class RunDqlCommand extends Command $this ->setName('orm:run-dql') ->setDescription('Executes arbitrary DQL directly from the command line.') - ->setDefinition(array( - new InputArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.'), - new InputOption( - 'hydrate', null, InputOption::VALUE_REQUIRED, - 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', - 'object' - ), - new InputOption( - 'first-result', null, InputOption::VALUE_REQUIRED, - 'The first result in the result set.' - ), - new InputOption( - 'max-result', null, InputOption::VALUE_REQUIRED, - 'The maximum number of results in the result set.' - ), - new InputOption( - 'depth', null, InputOption::VALUE_REQUIRED, - 'Dumping depth of Entity graph.', 7 - ), - new InputOption( - 'show-sql', null, InputOption::VALUE_NONE, - 'Dump generated SQL instead of executing query' - ) - )) + ->setDefinition( + [ + new InputArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.'), + new InputOption( + 'hydrate', null, InputOption::VALUE_REQUIRED, + 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', + 'object' + ), + new InputOption( + 'first-result', null, InputOption::VALUE_REQUIRED, + 'The first result in the result set.' + ), + new InputOption( + 'max-result', null, InputOption::VALUE_REQUIRED, + 'The maximum number of results in the result set.' + ), + new InputOption( + 'depth', null, InputOption::VALUE_REQUIRED, + 'Dumping depth of Entity graph.', 7 + ), + new InputOption( + 'show-sql', null, InputOption::VALUE_NONE, + 'Dump generated SQL instead of executing query' + ) + ] + ) ->setHelp(<<execute(array(), constant($hydrationMode)); + $resultSet = $query->execute([], constant($hydrationMode)); $output->writeln(Debug::dump($resultSet, $input->getOption('depth'), true, false)); } diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php index b2af0ca2c..73fbcbabb 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php @@ -46,12 +46,14 @@ class CreateCommand extends AbstractCommand ->setDescription( 'Processes the schema and either create it directly on EntityManager Storage Connection or generate the SQL output.' ) - ->setDefinition(array( - new InputOption( - 'dump-sql', null, InputOption::VALUE_NONE, - 'Instead of trying to apply generated SQLs into EntityManager Storage Connection, output them.' - ) - )) + ->setDefinition( + [ + new InputOption( + 'dump-sql', null, InputOption::VALUE_NONE, + 'Instead of trying to apply generated SQLs into EntityManager Storage Connection, output them.' + ) + ] + ) ->setHelp(<<setDescription( 'Drop the complete database schema of EntityManager Storage Connection or generate the corresponding SQL output.' ) - ->setDefinition(array( - new InputOption( - 'dump-sql', null, InputOption::VALUE_NONE, - 'Instead of trying to apply generated SQLs into EntityManager Storage Connection, output them.' - ), - new InputOption( - 'force', 'f', InputOption::VALUE_NONE, - "Don't ask for the deletion of the database, but force the operation to run." - ), - new InputOption( - 'full-database', null, InputOption::VALUE_NONE, - 'Instead of using the Class Metadata to detect the database table schema, drop ALL assets that the database contains.' - ), - )) + ->setDefinition( + [ + new InputOption( + 'dump-sql', null, InputOption::VALUE_NONE, + 'Instead of trying to apply generated SQLs into EntityManager Storage Connection, output them.' + ), + new InputOption( + 'force', 'f', InputOption::VALUE_NONE, + "Don't ask for the deletion of the database, but force the operation to run." + ), + new InputOption( + 'full-database', null, InputOption::VALUE_NONE, + 'Instead of using the Class Metadata to detect the database table schema, drop ALL assets that the database contains.' + ), + ] + ) ->setHelp(<<setDescription( 'Executes (or dumps) the SQL needed to update the database schema to match the current mapping metadata.' ) - ->setDefinition(array( - new InputOption( - 'complete', null, InputOption::VALUE_NONE, - 'If defined, all assets of the database which are not relevant to the current metadata will be dropped.' - ), + ->setDefinition( + [ + new InputOption( + 'complete', null, InputOption::VALUE_NONE, + 'If defined, all assets of the database which are not relevant to the current metadata will be dropped.' + ), - new InputOption( - 'dump-sql', null, InputOption::VALUE_NONE, - 'Dumps the generated SQL statements to the screen (does not execute them).' - ), - new InputOption( - 'force', 'f', InputOption::VALUE_NONE, - 'Causes the generated SQL statements to be physically executed against your database.' - ), - )); + new InputOption( + 'dump-sql', null, InputOption::VALUE_NONE, + 'Dumps the generated SQL statements to the screen (does not execute them).' + ), + new InputOption( + 'force', 'f', InputOption::VALUE_NONE, + 'Causes the generated SQL statements to be physically executed against your database.' + ), + ] + ); $this->setHelp(<<%command.name% command generates the SQL needed to diff --git a/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php b/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php index 64f2abe69..706d99d33 100644 --- a/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php +++ b/lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php @@ -40,10 +40,12 @@ class ConsoleRunner */ public static function createHelperSet(EntityManagerInterface $entityManager) { - return new HelperSet(array( - 'db' => new ConnectionHelper($entityManager->getConnection()), - 'em' => new EntityManagerHelper($entityManager) - )); + return new HelperSet( + [ + 'db' => new ConnectionHelper($entityManager->getConnection()), + 'em' => new EntityManagerHelper($entityManager) + ] + ); } /** @@ -54,7 +56,7 @@ class ConsoleRunner * * @return void */ - static public function run(HelperSet $helperSet, $commands = array()) + static public function run(HelperSet $helperSet, $commands = []) { $cli = self::createApplication($helperSet, $commands); $cli->run(); @@ -69,7 +71,7 @@ class ConsoleRunner * * @return \Symfony\Component\Console\Application */ - static public function createApplication(HelperSet $helperSet, $commands = array()) + static public function createApplication(HelperSet $helperSet, $commands = []) { $cli = new Application('Doctrine Command Line Interface', Version::VERSION); $cli->setCatchExceptions(true); @@ -87,29 +89,31 @@ class ConsoleRunner */ static public function addCommands(Application $cli) { - $cli->addCommands(array( - // DBAL Commands - new \Doctrine\DBAL\Tools\Console\Command\RunSqlCommand(), - new \Doctrine\DBAL\Tools\Console\Command\ImportCommand(), + $cli->addCommands( + [ + // DBAL Commands + new \Doctrine\DBAL\Tools\Console\Command\RunSqlCommand(), + new \Doctrine\DBAL\Tools\Console\Command\ImportCommand(), - // ORM Commands - new \Doctrine\ORM\Tools\Console\Command\ClearCache\MetadataCommand(), - new \Doctrine\ORM\Tools\Console\Command\ClearCache\ResultCommand(), - new \Doctrine\ORM\Tools\Console\Command\ClearCache\QueryCommand(), - new \Doctrine\ORM\Tools\Console\Command\SchemaTool\CreateCommand(), - new \Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand(), - new \Doctrine\ORM\Tools\Console\Command\SchemaTool\DropCommand(), - new \Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand(), - new \Doctrine\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommand(), - new \Doctrine\ORM\Tools\Console\Command\GenerateRepositoriesCommand(), - new \Doctrine\ORM\Tools\Console\Command\GenerateEntitiesCommand(), - new \Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand(), - new \Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand(), - new \Doctrine\ORM\Tools\Console\Command\RunDqlCommand(), - new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(), - new \Doctrine\ORM\Tools\Console\Command\InfoCommand(), - new \Doctrine\ORM\Tools\Console\Command\MappingDescribeCommand(), - )); + // ORM Commands + new \Doctrine\ORM\Tools\Console\Command\ClearCache\MetadataCommand(), + new \Doctrine\ORM\Tools\Console\Command\ClearCache\ResultCommand(), + new \Doctrine\ORM\Tools\Console\Command\ClearCache\QueryCommand(), + new \Doctrine\ORM\Tools\Console\Command\SchemaTool\CreateCommand(), + new \Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand(), + new \Doctrine\ORM\Tools\Console\Command\SchemaTool\DropCommand(), + new \Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand(), + new \Doctrine\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommand(), + new \Doctrine\ORM\Tools\Console\Command\GenerateRepositoriesCommand(), + new \Doctrine\ORM\Tools\Console\Command\GenerateEntitiesCommand(), + new \Doctrine\ORM\Tools\Console\Command\GenerateProxiesCommand(), + new \Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand(), + new \Doctrine\ORM\Tools\Console\Command\RunDqlCommand(), + new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(), + new \Doctrine\ORM\Tools\Console\Command\InfoCommand(), + new \Doctrine\ORM\Tools\Console\Command\MappingDescribeCommand(), + ] + ); } static public function printCliConfigTemplate() diff --git a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php index 5a72b7d6d..f480c3063 100644 --- a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php +++ b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php @@ -35,7 +35,7 @@ class MetadataFilter extends \FilterIterator implements \Countable /** * @var array */ - private $filter = array(); + private $filter = []; /** * Filter Metadatas by one or more filter options. diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index 52f3c92b9..408cb52d2 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -44,12 +44,12 @@ class ConvertDoctrine1Schema /** * @var array */ - private $legacyTypeMap = array( + private $legacyTypeMap = [ // TODO: This list may need to be updated 'clob' => 'text', 'timestamp' => 'datetime', 'enum' => 'string' - ); + ]; /** * Constructor passes the directory or array of directories @@ -72,7 +72,7 @@ class ConvertDoctrine1Schema */ public function getMetadata() { - $schema = array(); + $schema = []; foreach ($this->from as $path) { if (is_dir($path)) { $files = glob($path . '/*.yml'); @@ -84,7 +84,7 @@ class ConvertDoctrine1Schema } } - $metadatas = array(); + $metadatas = []; foreach ($schema as $className => $mappingInformation) { $metadatas[] = $this->convertToClassMetadataInfo($className, $mappingInformation); } @@ -153,12 +153,12 @@ class ConvertDoctrine1Schema } if ( ! $id) { - $fieldMapping = array( + $fieldMapping = [ 'fieldName' => 'id', 'columnName' => 'id', 'type' => 'integer', 'id' => true - ); + ]; $metadata->mapField($fieldMapping); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); } @@ -178,7 +178,7 @@ class ConvertDoctrine1Schema { if (is_string($column)) { $string = $column; - $column = array(); + $column = []; $column['type'] = $string; } @@ -208,7 +208,7 @@ class ConvertDoctrine1Schema throw ToolsException::couldNotMapDoctrine1Type($column['type']); } - $fieldMapping = array(); + $fieldMapping = []; if (isset($column['primary'])) { $fieldMapping['id'] = true; @@ -222,7 +222,7 @@ class ConvertDoctrine1Schema $fieldMapping['length'] = $column['length']; } - $allowed = array('precision', 'scale', 'unique', 'options', 'notnull', 'version'); + $allowed = ['precision', 'scale', 'unique', 'options', 'notnull', 'version']; foreach ($column as $key => $value) { if (in_array($key, $allowed)) { @@ -237,9 +237,9 @@ class ConvertDoctrine1Schema } elseif (isset($column['sequence'])) { $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); - $definition = array( + $definition = [ 'sequenceName' => is_array($column['sequence']) ? $column['sequence']['name']:$column['sequence'] - ); + ]; if (isset($column['sequence']['size'])) { $definition['allocationSize'] = $column['sequence']['size']; @@ -272,9 +272,9 @@ class ConvertDoctrine1Schema $type = (isset($index['type']) && $index['type'] == 'unique') ? 'uniqueConstraints' : 'indexes'; - $metadata->table[$type][$name] = array( + $metadata->table[$type][$name] = [ 'columns' => $index['fields'] - ); + ]; } } @@ -311,17 +311,17 @@ class ConvertDoctrine1Schema if (isset($relation['refClass'])) { $type = 'many'; $foreignType = 'many'; - $joinColumns = array(); + $joinColumns = []; } else { $type = isset($relation['type']) ? $relation['type'] : 'one'; $foreignType = isset($relation['foreignType']) ? $relation['foreignType'] : 'many'; - $joinColumns = array( - array( + $joinColumns = [ + [ 'name' => $relation['local'], 'referencedColumnName' => $relation['foreign'], 'onDelete' => isset($relation['onDelete']) ? $relation['onDelete'] : null, - ) - ); + ] + ]; } if ($type == 'one' && $foreignType == 'one') { @@ -332,7 +332,7 @@ class ConvertDoctrine1Schema $method = 'mapOneToMany'; } - $associationMapping = array(); + $associationMapping = []; $associationMapping['fieldName'] = $relation['alias']; $associationMapping['targetEntity'] = $relation['class']; $associationMapping['mappedBy'] = $relation['foreignAlias']; diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 22d5b412a..03e964817 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -78,7 +78,7 @@ class EntityGenerator /** * @var array */ - protected $staticReflection = array(); + protected $staticReflection = []; /** * Number of spaces to use for indention in generated code. @@ -151,7 +151,7 @@ class EntityGenerator * * @var array */ - protected $typeAlias = array( + protected $typeAlias = [ Type::DATETIMETZ => '\DateTime', Type::DATETIME => '\DateTime', Type::DATE => '\DateTime', @@ -166,14 +166,14 @@ class EntityGenerator Type::JSON_ARRAY => 'array', Type::SIMPLE_ARRAY => 'array', Type::BOOLEAN => 'bool', - ); + ]; /** * Hash-map to handle generator types string. * * @var array */ - protected static $generatorStrategyMap = array( + protected static $generatorStrategyMap = [ ClassMetadataInfo::GENERATOR_TYPE_AUTO => 'AUTO', ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE => 'SEQUENCE', ClassMetadataInfo::GENERATOR_TYPE_TABLE => 'TABLE', @@ -181,30 +181,30 @@ class EntityGenerator ClassMetadataInfo::GENERATOR_TYPE_NONE => 'NONE', ClassMetadataInfo::GENERATOR_TYPE_UUID => 'UUID', ClassMetadataInfo::GENERATOR_TYPE_CUSTOM => 'CUSTOM' - ); + ]; /** * Hash-map to handle the change tracking policy string. * * @var array */ - protected static $changeTrackingPolicyMap = array( + protected static $changeTrackingPolicyMap = [ ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT => 'DEFERRED_IMPLICIT', ClassMetadataInfo::CHANGETRACKING_DEFERRED_EXPLICIT => 'DEFERRED_EXPLICIT', ClassMetadataInfo::CHANGETRACKING_NOTIFY => 'NOTIFY', - ); + ]; /** * Hash-map to handle the inheritance type string. * * @var array */ - protected static $inheritanceTypeMap = array( + protected static $inheritanceTypeMap = [ ClassMetadataInfo::INHERITANCE_TYPE_NONE => 'NONE', ClassMetadataInfo::INHERITANCE_TYPE_JOINED => 'JOINED', ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE => 'SINGLE_TABLE', ClassMetadataInfo::INHERITANCE_TYPE_TABLE_PER_CLASS => 'TABLE_PER_CLASS', - ); + ]; /** * @var string @@ -376,7 +376,7 @@ public function __construct() if ( ! $this->isNew) { $this->parseTokensInEntityFile(file_get_contents($path)); } else { - $this->staticReflection[$metadata->name] = array('properties' => array(), 'methods' => array()); + $this->staticReflection[$metadata->name] = ['properties' => [], 'methods' => []]; } if ($this->backupExisting && file_exists($path)) { @@ -405,21 +405,21 @@ public function __construct() */ public function generateEntityClass(ClassMetadataInfo $metadata) { - $placeHolders = array( + $placeHolders = [ '', '', '', '', '' - ); + ]; - $replacements = array( + $replacements = [ $this->generateEntityNamespace($metadata), $this->generateEntityUse(), $this->generateEntityDocBlock($metadata), $this->generateEntityClassName($metadata), $this->generateEntityBody($metadata) - ); + ]; $code = str_replace($placeHolders, $replacements, static::$classTemplate) . "\n"; @@ -641,7 +641,7 @@ public function __construct() $stubMethods = $this->generateEntityStubMethods ? $this->generateEntityStubMethods($metadata) : null; $lifecycleCallbackMethods = $this->generateEntityLifecycleCallbackMethods($metadata); - $code = array(); + $code = []; if ($fieldMappingProperties) { $code[] = $fieldMappingProperties; @@ -683,7 +683,7 @@ public function __construct() return $this->generateEmbeddableConstructor($metadata); } - $collections = array(); + $collections = []; foreach ($metadata->associationMappings as $mapping) { if ($mapping['type'] & ClassMetadataInfo::TO_MANY) { @@ -705,14 +705,14 @@ public function __construct() */ private function generateEmbeddableConstructor(ClassMetadataInfo $metadata) { - $paramTypes = array(); - $paramVariables = array(); - $params = array(); - $fields = array(); + $paramTypes = []; + $paramVariables = []; + $params = []; + $fields = []; // Resort fields to put optional fields at the end of the method signature. - $requiredFields = array(); - $optionalFields = array(); + $requiredFields = []; + $optionalFields = []; foreach ($metadata->fieldMappings as $fieldMapping) { if (empty($fieldMapping['nullable'])) { @@ -777,11 +777,11 @@ public function __construct() $params = implode(', ', $params); } - $replacements = array( + $replacements = [ '' => implode("\n * ", $paramTags), '' => $params, '' => implode("\n" . $this->spaces, $fields), - ); + ]; $constructor = str_replace( array_keys($replacements), @@ -811,14 +811,14 @@ public function __construct() for ($i = 0; $i < $tokensCount; $i++) { $token = $tokens[$i]; - if (in_array($token[0], array(T_WHITESPACE, T_COMMENT, T_DOC_COMMENT), true)) { + if (in_array($token[0], [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], true)) { continue; } if ($inNamespace) { - if (in_array($token[0], array(T_NS_SEPARATOR, T_STRING), true)) { + if (in_array($token[0], [T_NS_SEPARATOR, T_STRING], true)) { $lastSeenNamespace .= $token[1]; - } elseif (is_string($token) && in_array($token, array(';', '{'), true)) { + } elseif (is_string($token) && in_array($token, [';', '{'], true)) { $inNamespace = false; } } @@ -826,8 +826,8 @@ public function __construct() if ($inClass) { $inClass = false; $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1]; - $this->staticReflection[$lastSeenClass]['properties'] = array(); - $this->staticReflection[$lastSeenClass]['methods'] = array(); + $this->staticReflection[$lastSeenClass]['properties'] = []; + $this->staticReflection[$lastSeenClass]['methods'] = []; } if (T_NAMESPACE === $token[0]) { @@ -841,7 +841,7 @@ public function __construct() } elseif ($tokens[$i+2] == '&' && T_STRING === $tokens[$i+3][0]) { $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]); } - } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED), true) && T_FUNCTION !== $tokens[$i+2][0]) { + } elseif (in_array($token[0], [T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED], true) && T_FUNCTION !== $tokens[$i+2][0]) { $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1); } } @@ -921,7 +921,7 @@ public function __construct() ? new \ReflectionClass($metadata->name) : $metadata->reflClass; - $traits = array(); + $traits = []; while ($reflClass !== false) { $traits = array_merge($traits, $reflClass->getTraits()); @@ -996,20 +996,20 @@ public function __construct() */ protected function generateEntityDocBlock(ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; $lines[] = '/**'; $lines[] = ' * ' . $this->getClassName($metadata); if ($this->generateAnnotations) { $lines[] = ' *'; - $methods = array( + $methods = [ 'generateTableAnnotation', 'generateInheritanceAnnotation', 'generateDiscriminatorColumnAnnotation', 'generateDiscriminatorMapAnnotation', 'generateEntityAnnotation', - ); + ]; foreach ($methods as $method) { if ($code = $this->$method($metadata)) { @@ -1058,7 +1058,7 @@ public function __construct() return ''; } - $table = array(); + $table = []; if (isset($metadata->table['schema'])) { $table[] = 'schema="' . $metadata->table['schema'] . '"'; @@ -1093,9 +1093,9 @@ public function __construct() */ protected function generateTableConstraints($constraintName, array $constraints) { - $annotations = array(); + $annotations = []; foreach ($constraints as $name => $constraint) { - $columns = array(); + $columns = []; foreach ($constraint['columns'] as $column) { $columns[] = '"' . $column . '"'; } @@ -1142,7 +1142,7 @@ public function __construct() protected function generateDiscriminatorMapAnnotation(ClassMetadataInfo $metadata) { if ($metadata->inheritanceType != ClassMetadataInfo::INHERITANCE_TYPE_NONE) { - $inheritanceClassMap = array(); + $inheritanceClassMap = []; foreach ($metadata->discriminatorMap as $type => $class) { $inheritanceClassMap[] .= '"' . $type . '" = "' . $class . '"'; @@ -1159,7 +1159,7 @@ public function __construct() */ protected function generateEntityStubMethods(ClassMetadataInfo $metadata) { - $methods = array(); + $methods = []; foreach ($metadata->fieldMappings as $fieldMapping) { if (isset($fieldMapping['declaredField']) && @@ -1240,7 +1240,7 @@ public function __construct() $joinColumns = $associationMapping['joinColumns']; } else { //@todo there is no way to retrieve targetEntity metadata - $joinColumns = array(); + $joinColumns = []; } foreach ($joinColumns as $joinColumn) { @@ -1281,7 +1281,7 @@ public function __construct() */ protected function generateEntityAssociationMappingProperties(ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; foreach ($metadata->associationMappings as $associationMapping) { if ($this->hasProperty($associationMapping['fieldName'], $metadata)) { @@ -1303,7 +1303,7 @@ public function __construct() */ protected function generateEntityFieldMappingProperties(ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; foreach ($metadata->fieldMappings as $fieldMapping) { if ($this->hasProperty($fieldMapping['fieldName'], $metadata) || @@ -1331,7 +1331,7 @@ public function __construct() */ protected function generateEntityEmbeddedProperties(ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; foreach ($metadata->embeddedClasses as $fieldName => $embeddedClass) { if (isset($embeddedClass['declaredField']) || $this->hasProperty($fieldName, $metadata)) { @@ -1358,7 +1358,7 @@ public function __construct() { $methodName = $type . Inflector::classify($fieldName); $variableName = Inflector::camelize($fieldName); - if (in_array($type, array("add", "remove"))) { + if (in_array($type, ["add", "remove"])) { $methodName = Inflector::singularize($methodName); $variableName = Inflector::singularize($variableName); } @@ -1380,7 +1380,7 @@ public function __construct() $methodTypeHint = '\\' . $typeHint . ' '; } - $replacements = array( + $replacements = [ '' => ucfirst($type) . ' ' . $variableName . '.', '' => $methodTypeHint, '' => $variableType . (null !== $defaultValue ? ('|' . $defaultValue) : ''), @@ -1389,7 +1389,7 @@ public function __construct() '' => $fieldName, '' => ($defaultValue !== null ) ? (' = ' . $defaultValue) : '', '' => $this->getClassName($metadata) - ); + ]; $method = str_replace( array_keys($replacements), @@ -1414,10 +1414,10 @@ public function __construct() } $this->staticReflection[$metadata->name]['methods'][] = $methodName; - $replacements = array( + $replacements = [ '' => $this->annotationsPrefix . ucfirst($name), '' => $methodName, - ); + ]; $method = str_replace( array_keys($replacements), @@ -1435,7 +1435,7 @@ public function __construct() */ protected function generateJoinColumnAnnotation(array $joinColumn) { - $joinColumnAnnot = array(); + $joinColumnAnnot = []; if (isset($joinColumn['name'])) { $joinColumnAnnot[] = 'name="' . $joinColumn['name'] . '"'; @@ -1472,7 +1472,7 @@ public function __construct() */ protected function generateAssociationMappingPropertyDocBlock(array $associationMapping, ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; $lines[] = $this->spaces . '/**'; if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) { @@ -1507,7 +1507,7 @@ public function __construct() $type = 'ManyToMany'; break; } - $typeOptions = array(); + $typeOptions = []; if (isset($associationMapping['targetEntity'])) { $typeOptions[] = 'targetEntity="' . $associationMapping['targetEntity'] . '"'; @@ -1522,7 +1522,7 @@ public function __construct() } if ($associationMapping['cascade']) { - $cascades = array(); + $cascades = []; if ($associationMapping['isCascadePersist']) $cascades[] = '"persist"'; if ($associationMapping['isCascadeRemove']) $cascades[] = '"remove"'; @@ -1531,7 +1531,7 @@ public function __construct() if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"'; if (count($cascades) === 5) { - $cascades = array('"all"'); + $cascades = ['"all"']; } $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}'; @@ -1542,10 +1542,10 @@ public function __construct() } if (isset($associationMapping['fetch']) && $associationMapping['fetch'] !== ClassMetadataInfo::FETCH_LAZY) { - $fetchMap = array( + $fetchMap = [ ClassMetadataInfo::FETCH_EXTRA_LAZY => 'EXTRA_LAZY', ClassMetadataInfo::FETCH_EAGER => 'EAGER', - ); + ]; $typeOptions[] = 'fetch="' . $fetchMap[$associationMapping['fetch']] . '"'; } @@ -1555,7 +1555,7 @@ public function __construct() if (isset($associationMapping['joinColumns']) && $associationMapping['joinColumns']) { $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinColumns({'; - $joinColumnsLines = array(); + $joinColumnsLines = []; foreach ($associationMapping['joinColumns'] as $joinColumn) { if ($joinColumnAnnot = $this->generateJoinColumnAnnotation($joinColumn)) { @@ -1568,7 +1568,7 @@ public function __construct() } if (isset($associationMapping['joinTable']) && $associationMapping['joinTable']) { - $joinTable = array(); + $joinTable = []; $joinTable[] = 'name="' . $associationMapping['joinTable']['name'] . '"'; if (isset($associationMapping['joinTable']['schema'])) { @@ -1578,7 +1578,7 @@ public function __construct() $lines[] = $this->spaces . ' * @' . $this->annotationsPrefix . 'JoinTable(' . implode(', ', $joinTable) . ','; $lines[] = $this->spaces . ' * joinColumns={'; - $joinColumnsLines = array(); + $joinColumnsLines = []; foreach ($associationMapping['joinTable']['joinColumns'] as $joinColumn) { $joinColumnsLines[] = $this->spaces . ' * ' . $this->generateJoinColumnAnnotation($joinColumn); @@ -1588,7 +1588,7 @@ public function __construct() $lines[] = $this->spaces . ' * },'; $lines[] = $this->spaces . ' * inverseJoinColumns={'; - $inverseJoinColumnsLines = array(); + $inverseJoinColumnsLines = []; foreach ($associationMapping['joinTable']['inverseJoinColumns'] as $joinColumn) { $inverseJoinColumnsLines[] = $this->spaces . ' * ' . $this->generateJoinColumnAnnotation($joinColumn); @@ -1624,7 +1624,7 @@ public function __construct() */ protected function generateFieldMappingPropertyDocBlock(array $fieldMapping, ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; $lines[] = $this->spaces . '/**'; $lines[] = $this->spaces . ' * @var ' . $this->getType($fieldMapping['type']) @@ -1633,7 +1633,7 @@ public function __construct() if ($this->generateAnnotations) { $lines[] = $this->spaces . ' *'; - $column = array(); + $column = []; if (isset($fieldMapping['columnName'])) { $column[] = 'name="' . $fieldMapping['columnName'] . '"'; } @@ -1686,7 +1686,7 @@ public function __construct() } if ($metadata->sequenceGeneratorDefinition) { - $sequenceGenerator = array(); + $sequenceGenerator = []; if (isset($metadata->sequenceGeneratorDefinition['sequenceName'])) { $sequenceGenerator[] = 'sequenceName="' . $metadata->sequenceGeneratorDefinition['sequenceName'] . '"'; @@ -1721,14 +1721,14 @@ public function __construct() */ protected function generateEmbeddedPropertyDocBlock(array $embeddedClass) { - $lines = array(); + $lines = []; $lines[] = $this->spaces . '/**'; $lines[] = $this->spaces . ' * @var \\' . ltrim($embeddedClass['class'], '\\'); if ($this->generateAnnotations) { $lines[] = $this->spaces . ' *'; - $embedded = array('class="' . $embeddedClass['class'] . '"'); + $embedded = ['class="' . $embeddedClass['class'] . '"']; if (isset($fieldMapping['columnPrefix'])) { $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); @@ -1833,7 +1833,7 @@ public function __construct() */ private function exportTableOptions(array $options) { - $optionsStr = array(); + $optionsStr = []; foreach ($options as $name => $option) { if (is_array($option)) { diff --git a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php index f431588fb..927738cba 100644 --- a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php @@ -57,11 +57,11 @@ class extends */ public function generateEntityRepositoryClass($fullClassName) { - $variables = array( + $variables = [ '' => $this->generateEntityRepositoryNamespace($fullClassName), '' => $this->generateEntityRepositoryName($fullClassName), '' => $this->generateClassName($fullClassName) - ); + ]; return str_replace(array_keys($variables), array_values($variables), self::$_template); } @@ -70,7 +70,7 @@ class extends * Generates the namespace, if class do not have namespace, return empty string instead. * * @param string $fullClassName - * + * * @return string $namespace */ private function getClassNamespace($fullClassName) @@ -82,9 +82,9 @@ class extends /** * Generates the class name - * + * * @param string $fullClassName - * + * * @return string */ private function generateClassName($fullClassName) @@ -102,7 +102,7 @@ class extends /** * Generates the namespace statement, if class do not have namespace, return empty string instead. - * + * * @param string $fullClassName The full repository class name. * * @return string $namespace @@ -158,7 +158,7 @@ class extends /** * @param string $repositoryName - * + * * @return \Doctrine\ORM\Tools\EntityRepositoryGenerator */ public function setDefaultRepositoryName($repositoryName) diff --git a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php index 1ea2a3735..94c781bef 100644 --- a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php @@ -32,13 +32,13 @@ class ClassMetadataExporter /** * @var array */ - private static $_exporterDrivers = array( + private static $_exporterDrivers = [ 'xml' => 'Doctrine\ORM\Tools\Export\Driver\XmlExporter', 'yaml' => 'Doctrine\ORM\Tools\Export\Driver\YamlExporter', 'yml' => 'Doctrine\ORM\Tools\Export\Driver\YamlExporter', 'php' => 'Doctrine\ORM\Tools\Export\Driver\PhpExporter', 'annotation' => 'Doctrine\ORM\Tools\Export\Driver\AnnotationExporter' - ); + ]; /** * Registers a new exporter driver class under a specified name. diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php index ae8650525..100e16fd0 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php @@ -35,7 +35,7 @@ abstract class AbstractExporter /** * @var array */ - protected $_metadata = array(); + protected $_metadata = []; /** * @var string|null diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php index 5d88901a5..00a4be596 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php @@ -40,7 +40,7 @@ class PhpExporter extends AbstractExporter */ public function exportClassMetadata(ClassMetadataInfo $metadata) { - $lines = array(); + $lines = []; $lines[] = 'associationMappings as $associationMapping) { - $cascade = array('remove', 'persist', 'refresh', 'merge', 'detach'); + $cascade = ['remove', 'persist', 'refresh', 'merge', 'detach']; foreach ($cascade as $key => $value) { if ( ! $associationMapping['isCascade'.ucfirst($value)]) { unset($cascade[$key]); @@ -99,14 +99,14 @@ class PhpExporter extends AbstractExporter } if (count($cascade) === 5) { - $cascade = array('all'); + $cascade = ['all']; } - $associationMappingArray = array( + $associationMappingArray = [ 'fieldName' => $associationMapping['fieldName'], 'targetEntity' => $associationMapping['targetEntity'], 'cascade' => $cascade, - ); + ]; if (isset($associationMapping['fetch'])) { $associationMappingArray['fetch'] = $associationMapping['fetch']; @@ -114,21 +114,21 @@ class PhpExporter extends AbstractExporter if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) { $method = 'mapOneToOne'; - $oneToOneMappingArray = array( + $oneToOneMappingArray = [ 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'joinColumns' => $associationMapping['isOwningSide'] ? $associationMapping['joinColumns'] : [], 'orphanRemoval' => $associationMapping['orphanRemoval'], - ); + ]; $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); } elseif ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) { $method = 'mapOneToMany'; - $potentialAssociationMappingIndexes = array( + $potentialAssociationMappingIndexes = [ 'mappedBy', 'orphanRemoval', 'orderBy', - ); + ]; foreach ($potentialAssociationMappingIndexes as $index) { if (isset($associationMapping[$index])) { $oneToManyMappingArray[$index] = $associationMapping[$index]; @@ -137,11 +137,11 @@ class PhpExporter extends AbstractExporter $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); } elseif ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_MANY) { $method = 'mapManyToMany'; - $potentialAssociationMappingIndexes = array( + $potentialAssociationMappingIndexes = [ 'mappedBy', 'joinTable', 'orderBy', - ); + ]; foreach ($potentialAssociationMappingIndexes as $index) { if (isset($associationMapping[$index])) { $manyToManyMappingArray[$index] = $associationMapping[$index]; diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php index ba41d9986..fbcbf42d1 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php @@ -126,7 +126,7 @@ class XmlExporter extends AbstractExporter $fields = $metadata->fieldMappings; - $id = array(); + $id = []; foreach ($fields as $name => $field) { if (isset($field['id']) && $field['id']) { $id[$name] = $field; @@ -136,10 +136,10 @@ class XmlExporter extends AbstractExporter foreach ($metadata->associationMappings as $name => $assoc) { if (isset($assoc['id']) && $assoc['id']) { - $id[$name] = array( + $id[$name] = [ 'fieldName' => $name, 'associationKey' => true - ); + ]; } } @@ -225,12 +225,12 @@ class XmlExporter extends AbstractExporter } } - $orderMap = array( + $orderMap = [ ClassMetadataInfo::ONE_TO_ONE, ClassMetadataInfo::ONE_TO_MANY, ClassMetadataInfo::MANY_TO_ONE, ClassMetadataInfo::MANY_TO_MANY, - ); + ]; uasort($metadata->associationMappings, function($m1, $m2) use (&$orderMap){ $a1 = array_search($m1['type'], $orderMap); @@ -273,7 +273,7 @@ class XmlExporter extends AbstractExporter $associationMappingXml->addAttribute('fetch', $this->_getFetchModeString($associationMapping['fetch'])); } - $cascade = array(); + $cascade = []; if ($associationMapping['isCascadeRemove']) { $cascade[] = 'cascade-remove'; } @@ -295,7 +295,7 @@ class XmlExporter extends AbstractExporter } if (count($cascade) === 5) { - $cascade = array('cascade-all'); + $cascade = ['cascade-all']; } if ($cascade) { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 7677ad950..b9a38f904 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -41,7 +41,7 @@ class YamlExporter extends AbstractExporter */ public function exportClassMetadata(ClassMetadataInfo $metadata) { - $array = array(); + $array = []; if ($metadata->isMappedSuperclass) { $array['type'] = 'mappedSuperclass'; @@ -91,7 +91,7 @@ class YamlExporter extends AbstractExporter $fieldMappings = $metadata->fieldMappings; - $ids = array(); + $ids = []; foreach ($fieldMappings as $name => $fieldMapping) { $fieldMapping['column'] = $fieldMapping['columnName']; @@ -118,13 +118,13 @@ class YamlExporter extends AbstractExporter if ($fieldMappings) { if ( ! isset($array['fields'])) { - $array['fields'] = array(); + $array['fields'] = []; } $array['fields'] = array_merge($array['fields'], $fieldMappings); } foreach ($metadata->associationMappings as $name => $associationMapping) { - $cascade = array(); + $cascade = []; if ($associationMapping['isCascadeRemove']) { $cascade[] = 'remove'; @@ -146,13 +146,13 @@ class YamlExporter extends AbstractExporter $cascade[] = 'detach'; } if (count($cascade) === 5) { - $cascade = array('all'); + $cascade = ['all']; } - $associationMappingArray = array( + $associationMappingArray = [ 'targetEntity' => $associationMapping['targetEntity'], 'cascade' => $cascade, - ); + ]; if (isset($associationMapping['fetch'])) { $associationMappingArray['fetch'] = $this->_getFetchModeString($associationMapping['fetch']); @@ -164,7 +164,7 @@ class YamlExporter extends AbstractExporter if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) { $joinColumns = $associationMapping['isOwningSide'] ? $associationMapping['joinColumns'] : []; - $newJoinColumns = array(); + $newJoinColumns = []; foreach ($joinColumns as $joinColumn) { $newJoinColumns[$joinColumn['name']]['referencedColumnName'] = $joinColumn['referencedColumnName']; @@ -174,12 +174,12 @@ class YamlExporter extends AbstractExporter } } - $oneToOneMappingArray = array( + $oneToOneMappingArray = [ 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'joinColumns' => $newJoinColumns, 'orphanRemoval' => $associationMapping['orphanRemoval'], - ); + ]; $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); @@ -189,22 +189,22 @@ class YamlExporter extends AbstractExporter $array['manyToOne'][$name] = $associationMappingArray; } } elseif ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) { - $oneToManyMappingArray = array( + $oneToManyMappingArray = [ 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'orphanRemoval' => $associationMapping['orphanRemoval'], 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null - ); + ]; $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); $array['oneToMany'][$name] = $associationMappingArray; } elseif ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_MANY) { - $manyToManyMappingArray = array( + $manyToManyMappingArray = [ 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'joinTable' => isset($associationMapping['joinTable']) ? $associationMapping['joinTable'] : null, 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null - ); + ]; $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); $array['manyToMany'][$name] = $associationMappingArray; @@ -214,7 +214,7 @@ class YamlExporter extends AbstractExporter $array['lifecycleCallbacks'] = $metadata->lifecycleCallbacks; } - return $this->yamlDump(array($metadata->name => $array), 10); + return $this->yamlDump([$metadata->name => $array], 10); } /** diff --git a/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php index 2cfd029df..8d3163043 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php @@ -108,7 +108,7 @@ class CountOutputWalker extends SqlWalker $rootIdentifier = $rootClass->identifier; // For every identifier, find out the SQL alias by combing through the ResultSetMapping - $sqlIdentifier = array(); + $sqlIdentifier = []; foreach ($rootIdentifier as $property) { if (isset($rootClass->fieldMappings[$property])) { foreach (array_keys($this->rsm->fieldMappings, $property) as $alias) { diff --git a/lib/Doctrine/ORM/Tools/Pagination/CountWalker.php b/lib/Doctrine/ORM/Tools/Pagination/CountWalker.php index 628bd4cd1..a8f26001a 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/CountWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/CountWalker.php @@ -59,11 +59,11 @@ class CountWalker extends TreeWalkerAdapter $queryComponents = $this->_getQueryComponents(); // Get the root entity and alias from the AST fromClause $from = $AST->fromClause->identificationVariableDeclarations; - + if (count($from) > 1) { throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); } - + $fromRoot = reset($from); $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable; $rootClass = $queryComponents[$rootAlias]['metadata']; @@ -81,11 +81,11 @@ class CountWalker extends TreeWalkerAdapter $pathExpression->type = $pathType; $distinct = $this->_getQuery()->getHint(self::HINT_DISTINCT); - $AST->selectClause->selectExpressions = array( + $AST->selectClause->selectExpressions = [ new SelectExpression( new AggregateExpression('count', $pathExpression, $distinct), null ) - ); + ]; // ORDER BY is not needed, only increases query execution through unnecessary sorting. $AST->orderByClause = null; diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php index b2a292ad9..1874eb88d 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php @@ -69,7 +69,7 @@ class LimitSubqueryWalker extends TreeWalkerAdapter $fromRoot = reset($from); $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable; $rootClass = $queryComponents[$rootAlias]['metadata']; - $selectExpressions = array(); + $selectExpressions = []; $this->validate($AST); @@ -80,9 +80,9 @@ class LimitSubqueryWalker extends TreeWalkerAdapter continue; } } - + $identifier = $rootClass->getSingleIdentifierFieldName(); - + if (isset($rootClass->associationMappings[$identifier])) { throw new \RuntimeException("Paginating an entity with foreign key as identifier only works when using the Output Walkers. Call Paginator#setUseOutputWalkers(true) before iterating the paginator."); } @@ -109,7 +109,7 @@ class LimitSubqueryWalker extends TreeWalkerAdapter if ( ! $item->expression instanceof PathExpression) { continue; } - + $AST->selectClause->selectExpressions[] = new SelectExpression( $this->createSelectExpressionItem($item->expression), '_dctrn_ord' . $this->_aliasCounter++ @@ -154,24 +154,24 @@ class LimitSubqueryWalker extends TreeWalkerAdapter } } } - + /** * Retrieve either an IdentityFunction (IDENTITY(u.assoc)) or a state field (u.name). - * + * * @param \Doctrine\ORM\Query\AST\PathExpression $pathExpression - * + * * @return \Doctrine\ORM\Query\AST\Functions\IdentityFunction */ private function createSelectExpressionItem(PathExpression $pathExpression) { if ($pathExpression->type === PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION) { $identity = new IdentityFunction('identity'); - + $identity->pathExpression = clone $pathExpression; - + return $identity; } - + return clone $pathExpression; } } diff --git a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php index 449aae1ca..aa2a22365 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php +++ b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php @@ -225,7 +225,7 @@ class Paginator implements \Countable, \IteratorAggregate $hints = $query->getHint(Query::HINT_CUSTOM_TREE_WALKERS); if ($hints === false) { - $hints = array(); + $hints = []; } $hints[] = $walkerClass; diff --git a/lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php b/lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php index 1f54da100..5fa4e2d94 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php @@ -76,11 +76,11 @@ class WhereInWalker extends TreeWalkerAdapter $queryComponents = $this->_getQueryComponents(); // Get the root entity and alias from the AST fromClause $from = $AST->fromClause->identificationVariableDeclarations; - + if (count($from) > 1) { throw new \RuntimeException("Cannot count query which selects two FROM components, cannot make distinction"); } - + $fromRoot = reset($from); $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable; $rootClass = $queryComponents[$rootAlias]['metadata']; @@ -99,7 +99,7 @@ class WhereInWalker extends TreeWalkerAdapter if ($count > 0) { $arithmeticExpression = new ArithmeticExpression(); $arithmeticExpression->simpleArithmeticExpression = new SimpleArithmeticExpression( - array($pathExpression) + [$pathExpression] ); $expression = new InExpression($arithmeticExpression); $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS); @@ -115,29 +115,35 @@ class WhereInWalker extends TreeWalkerAdapter if ($AST->whereClause->conditionalExpression instanceof ConditionalTerm) { $AST->whereClause->conditionalExpression->conditionalFactors[] = $conditionalPrimary; } elseif ($AST->whereClause->conditionalExpression instanceof ConditionalPrimary) { - $AST->whereClause->conditionalExpression = new ConditionalExpression(array( - new ConditionalTerm(array( - $AST->whereClause->conditionalExpression, - $conditionalPrimary - )) - )); + $AST->whereClause->conditionalExpression = new ConditionalExpression( + [ + new ConditionalTerm( + [ + $AST->whereClause->conditionalExpression, + $conditionalPrimary + ] + ) + ] + ); } elseif ($AST->whereClause->conditionalExpression instanceof ConditionalExpression || $AST->whereClause->conditionalExpression instanceof ConditionalFactor ) { $tmpPrimary = new ConditionalPrimary; $tmpPrimary->conditionalExpression = $AST->whereClause->conditionalExpression; - $AST->whereClause->conditionalExpression = new ConditionalTerm(array( - $tmpPrimary, - $conditionalPrimary - )); + $AST->whereClause->conditionalExpression = new ConditionalTerm( + [ + $tmpPrimary, + $conditionalPrimary + ] + ); } } else { $AST->whereClause = new WhereClause( - new ConditionalExpression(array( - new ConditionalTerm(array( - $conditionalPrimary - )) - )) + new ConditionalExpression( + [ + new ConditionalTerm([$conditionalPrimary]) + ] + ) ); } } diff --git a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php index 574c9c28e..46488bf97 100644 --- a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php +++ b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php @@ -39,17 +39,17 @@ class ResolveTargetEntityListener implements EventSubscriber /** * @var array[] indexed by original entity name */ - private $resolveTargetEntities = array(); + private $resolveTargetEntities = []; /** * {@inheritDoc} */ public function getSubscribedEvents() { - return array( + return [ Events::loadClassMetadata, Events::onClassMetadataNotFound - ); + ]; } /** diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index da1a291d3..627f7b573 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -143,16 +143,16 @@ class SchemaTool public function getSchemaFromMetadata(array $classes) { // Reminder for processed classes, used for hierarchies - $processedClasses = array(); + $processedClasses = []; $eventManager = $this->em->getEventManager(); $schemaManager = $this->em->getConnection()->getSchemaManager(); $metadataSchemaConfig = $schemaManager->createSchemaConfig(); $metadataSchemaConfig->setExplicitForeignKeyIndexes(false); - $schema = new Schema(array(), array(), $metadataSchemaConfig); + $schema = new Schema([], [], $metadataSchemaConfig); - $addedFks = array(); - $blacklistedFks = array(); + $addedFks = []; + $blacklistedFks = []; foreach ($classes as $class) { /** @var \Doctrine\ORM\Mapping\ClassMetadata $class */ @@ -183,7 +183,7 @@ class SchemaTool } } elseif ($class->isInheritanceTypeJoined()) { // Add all non-inherited fields as columns - $pkColumns = array(); + $pkColumns = []; foreach ($class->fieldMappings as $fieldName => $mapping) { if ( ! isset($mapping['inherited'])) { $columnName = $this->quoteStrategy->getColumnName( @@ -206,7 +206,7 @@ class SchemaTool $this->addDiscriminatorColumnDefinition($class, $table); } else { // Add an ID FK column to child tables - $inheritedKeyColumns = array(); + $inheritedKeyColumns = []; foreach ($class->identifier as $identifierField) { $idMapping = $class->fieldMappings[$identifierField]; if (isset($idMapping['inherited'])) { @@ -232,7 +232,7 @@ class SchemaTool ), $inheritedKeyColumns, $inheritedKeyColumns, - array('onDelete' => 'CASCADE') + ['onDelete' => 'CASCADE'] ); } @@ -247,7 +247,7 @@ class SchemaTool $this->gatherRelationsSql($class, $table, $schema, $addedFks, $blacklistedFks); } - $pkColumns = array(); + $pkColumns = []; foreach ($class->identifier as $identifierField) { if (isset($class->fieldMappings[$identifierField])) { @@ -280,10 +280,10 @@ class SchemaTool if (isset($class->table['indexes'])) { foreach ($class->table['indexes'] as $indexName => $indexData) { if ( ! isset($indexData['flags'])) { - $indexData['flags'] = array(); + $indexData['flags'] = []; } - $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], isset($indexData['options']) ? $indexData['options'] : array()); + $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], isset($indexData['options']) ? $indexData['options'] : []); } } @@ -298,7 +298,7 @@ class SchemaTool } } - $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, isset($indexData['options']) ? $indexData['options'] : array()); + $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, isset($indexData['options']) ? $indexData['options'] : []); } } @@ -365,10 +365,10 @@ class SchemaTool $discrColumn['length'] = 255; } - $options = array( + $options = [ 'length' => isset($discrColumn['length']) ? $discrColumn['length'] : null, 'notnull' => true - ); + ]; if (isset($discrColumn['columnDefinition'])) { $options['columnDefinition'] = $discrColumn['columnDefinition']; @@ -388,7 +388,7 @@ class SchemaTool */ private function gatherColumns($class, Table $table) { - $pkColumns = array(); + $pkColumns = []; foreach ($class->fieldMappings as $mapping) { if ($class->isInheritanceTypeSingleTable() && isset($mapping['inherited'])) { @@ -423,14 +423,14 @@ class SchemaTool $columnName = $this->quoteStrategy->getColumnName($mapping['fieldName'], $class, $this->platform); $columnType = $mapping['type']; - $options = array(); + $options = []; $options['length'] = isset($mapping['length']) ? $mapping['length'] : null; $options['notnull'] = isset($mapping['nullable']) ? ! $mapping['nullable'] : true; if ($class->isInheritanceTypeSingleTable() && $class->parentClasses) { $options['notnull'] = false; } - $options['platformOptions'] = array(); + $options['platformOptions'] = []; $options['platformOptions']['version'] = $class->isVersioned && $class->versionField === $mapping['fieldName']; if (strtolower($columnType) === 'string' && null === $options['length']) { @@ -454,7 +454,7 @@ class SchemaTool } if (isset($mapping['options'])) { - $knownOptions = array('comment', 'unsigned', 'fixed', 'default'); + $knownOptions = ['comment', 'unsigned', 'fixed', 'default']; foreach ($knownOptions as $knownOption) { if (array_key_exists($knownOption, $mapping['options'])) { @@ -467,7 +467,7 @@ class SchemaTool $options['customSchemaOptions'] = $mapping['options']; } - if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() == array($mapping['fieldName'])) { + if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() == [$mapping['fieldName']]) { $options['autoincrement'] = true; } if ($class->isInheritanceTypeJoined() && $class->name !== $class->rootEntityName) { @@ -483,7 +483,7 @@ class SchemaTool $isUnique = isset($mapping['unique']) ? $mapping['unique'] : false; if ($isUnique) { - $table->addUniqueIndex(array($columnName)); + $table->addUniqueIndex([$columnName]); } } @@ -511,7 +511,7 @@ class SchemaTool $foreignClass = $this->em->getClassMetadata($mapping['targetEntity']); if ($mapping['type'] & ClassMetadata::TO_ONE && $mapping['isOwningSide']) { - $primaryKeyColumns = array(); // PK is unnecessary for this relation-type + $primaryKeyColumns = []; // PK is unnecessary for this relation-type $this->gatherRelationJoinColumns( $mapping['joinColumns'], @@ -533,7 +533,7 @@ class SchemaTool $this->quoteStrategy->getJoinTableName($mapping, $foreignClass, $this->platform) ); - $primaryKeyColumns = array(); + $primaryKeyColumns = []; // Build first FK constraint (relation table => source table) $this->gatherRelationJoinColumns( @@ -581,7 +581,7 @@ class SchemaTool $referencedFieldName = $class->getFieldName($referencedColumnName); if ($class->hasField($referencedFieldName)) { - return array($class, $referencedFieldName); + return [$class, $referencedFieldName]; } if (in_array($referencedColumnName, $class->getIdentifierColumnNames())) { @@ -625,11 +625,11 @@ class SchemaTool &$blacklistedFks ) { - $localColumns = array(); - $foreignColumns = array(); - $fkOptions = array(); + $localColumns = []; + $foreignColumns = []; + $fkOptions = []; $foreignTableName = $this->quoteStrategy->getTableName($class, $this->platform); - $uniqueConstraints = array(); + $uniqueConstraints = []; foreach ($joinColumns as $joinColumn) { @@ -670,7 +670,7 @@ class SchemaTool $columnDef = $fieldMapping['columnDefinition']; } - $columnOptions = array('notnull' => false, 'columnDefinition' => $columnDef); + $columnOptions = ['notnull' => false, 'columnDefinition' => $columnDef]; if (isset($joinColumn['nullable'])) { $columnOptions['notnull'] = !$joinColumn['nullable']; @@ -691,7 +691,7 @@ class SchemaTool } if (isset($joinColumn['unique']) && $joinColumn['unique'] == true) { - $uniqueConstraints[] = array('columns' => array($quotedColumnName)); + $uniqueConstraints[] = ['columns' => [$quotedColumnName]]; } if (isset($joinColumn['onDelete'])) { @@ -721,7 +721,7 @@ class SchemaTool } $blacklistedFks[$compositeName] = true; } elseif (!isset($blacklistedFks[$compositeName])) { - $addedFks[$compositeName] = array('foreignTableName' => $foreignTableName, 'foreignColumns' => $foreignColumns); + $addedFks[$compositeName] = ['foreignTableName' => $foreignTableName, 'foreignColumns' => $foreignColumns]; $theJoinTable->addUnnamedForeignKeyConstraint( $foreignTableName, $localColumns, diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php index 3f5799a4d..4119b9d60 100644 --- a/lib/Doctrine/ORM/Tools/SchemaValidator.php +++ b/lib/Doctrine/ORM/Tools/SchemaValidator.php @@ -63,7 +63,7 @@ class SchemaValidator */ public function validateMapping() { - $errors = array(); + $errors = []; $cmf = $this->em->getMetadataFactory(); $classes = $cmf->getAllMetadata(); @@ -85,7 +85,7 @@ class SchemaValidator */ public function validateClass(ClassMetadataInfo $class) { - $ce = array(); + $ce = []; $cmf = $this->em->getMetadataFactory(); foreach ($class->fieldMappings as $fieldName => $mapping) { @@ -212,7 +212,7 @@ class SchemaValidator } if (count($identifierColumns) != count($assoc['joinColumns'])) { - $ids = array(); + $ids = []; foreach ($assoc['joinColumns'] as $joinColumn) { $ids[] = $joinColumn['name']; diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 368fdfd63..00a41e6df 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -102,7 +102,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $identityMap = array(); + private $identityMap = []; /** * Map of all identifiers of managed entities. @@ -110,7 +110,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $entityIdentifiers = array(); + private $entityIdentifiers = []; /** * Map of the original entity data of managed entities. @@ -123,7 +123,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $originalEntityData = array(); + private $originalEntityData = []; /** * Map of entity changes. Keys are object ids (spl_object_hash). @@ -131,7 +131,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $entityChangeSets = array(); + private $entityChangeSets = []; /** * The (cached) states of any known entities. @@ -139,7 +139,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $entityStates = array(); + private $entityStates = []; /** * Map of entities that are scheduled for dirty checking at commit time. @@ -148,49 +148,49 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $scheduledForSynchronization = array(); + private $scheduledForSynchronization = []; /** * A list of all pending entity insertions. * * @var array */ - private $entityInsertions = array(); + private $entityInsertions = []; /** * A list of all pending entity updates. * * @var array */ - private $entityUpdates = array(); + private $entityUpdates = []; /** * Any pending extra updates that have been scheduled by persisters. * * @var array */ - private $extraUpdates = array(); + private $extraUpdates = []; /** * A list of all pending entity deletions. * * @var array */ - private $entityDeletions = array(); + private $entityDeletions = []; /** * All pending collection deletions. * * @var array */ - private $collectionDeletions = array(); + private $collectionDeletions = []; /** * All pending collection updates. * * @var array */ - private $collectionUpdates = array(); + private $collectionUpdates = []; /** * List of collections visited during changeset calculation on a commit-phase of a UnitOfWork. @@ -199,7 +199,7 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $visitedCollections = array(); + private $visitedCollections = []; /** * The EntityManager that "owns" this UnitOfWork instance. @@ -213,14 +213,14 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $persisters = array(); + private $persisters = []; /** * The collection persister instances used to persist collections. * * @var array */ - private $collectionPersisters = array(); + private $collectionPersisters = []; /** * The EventManager used for dispatching events. @@ -248,21 +248,21 @@ class UnitOfWork implements PropertyChangedListener * * @var array */ - private $orphanRemovals = array(); + private $orphanRemovals = []; /** * Read-Only objects are never evaluated * * @var array */ - private $readOnlyObjects = array(); + private $readOnlyObjects = []; /** * Map of Entity Class-Names and corresponding IDs that should eager loaded when requested. * * @var array */ - private $eagerLoadingEntities = array(); + private $eagerLoadingEntities = []; /** * @var boolean @@ -424,7 +424,7 @@ class UnitOfWork implements PropertyChangedListener $this->collectionDeletions = $this->visitedCollections = $this->scheduledForSynchronization = - $this->orphanRemovals = array(); + $this->orphanRemovals = []; } /** @@ -501,7 +501,7 @@ class UnitOfWork implements PropertyChangedListener $this->getEntityPersister(get_class($entity))->update($entity); } - $this->extraUpdates = array(); + $this->extraUpdates = []; } /** @@ -514,7 +514,7 @@ class UnitOfWork implements PropertyChangedListener public function & getEntityChangeSet($entity) { $oid = spl_object_hash($entity); - $data = array(); + $data = []; if (!isset($this->entityChangeSets[$oid])) { return $data; @@ -575,7 +575,7 @@ class UnitOfWork implements PropertyChangedListener $this->listenersInvoker->invoke($class, Events::preFlush, $entity, new PreFlushEventArgs($this->em), $invoke); } - $actualData = array(); + $actualData = []; foreach ($class->reflFields as $name => $refProp) { $value = $refProp->getValue($entity); @@ -619,11 +619,11 @@ class UnitOfWork implements PropertyChangedListener // Entity is either NEW or MANAGED but not yet fully persisted (only has an id). // These result in an INSERT. $this->originalEntityData[$oid] = $actualData; - $changeSet = array(); + $changeSet = []; foreach ($actualData as $propName => $actualValue) { if ( ! isset($class->associationMappings[$propName])) { - $changeSet[$propName] = array(null, $actualValue); + $changeSet[$propName] = [null, $actualValue]; continue; } @@ -631,7 +631,7 @@ class UnitOfWork implements PropertyChangedListener $assoc = $class->associationMappings[$propName]; if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) { - $changeSet[$propName] = array(null, $actualValue); + $changeSet[$propName] = [null, $actualValue]; } } @@ -643,7 +643,7 @@ class UnitOfWork implements PropertyChangedListener $isChangeTrackingNotify = $class->isChangeTrackingNotify(); $changeSet = ($isChangeTrackingNotify && isset($this->entityChangeSets[$oid])) ? $this->entityChangeSets[$oid] - : array(); + : []; foreach ($actualData as $propName => $actualValue) { // skip field, its a partially omitted one! @@ -664,7 +664,7 @@ class UnitOfWork implements PropertyChangedListener continue; } - $changeSet[$propName] = array($orgValue, $actualValue); + $changeSet[$propName] = [$orgValue, $actualValue]; continue; } @@ -704,7 +704,7 @@ class UnitOfWork implements PropertyChangedListener if ($assoc['type'] & ClassMetadata::TO_ONE) { if ($assoc['isOwningSide']) { - $changeSet[$propName] = array($orgValue, $actualValue); + $changeSet[$propName] = [$orgValue, $actualValue]; } if ($orgValue !== null && $assoc['orphanRemoval']) { @@ -734,7 +734,7 @@ class UnitOfWork implements PropertyChangedListener $val instanceof PersistentCollection && $val->isDirty()) { - $this->entityChangeSets[$oid] = array(); + $this->entityChangeSets[$oid] = []; $this->originalEntityData[$oid] = $actualData; $this->entityUpdates[$oid] = $entity; } @@ -774,7 +774,7 @@ class UnitOfWork implements PropertyChangedListener break; default: - $entitiesToProcess = array(); + $entitiesToProcess = []; } @@ -821,7 +821,7 @@ class UnitOfWork implements PropertyChangedListener // Look through the entities, and in any of their associations, // for transient (new) entities, recursively. ("Persistence by reachability") // Unwrap. Uninitialized collections will simply be empty. - $unwrappedValue = ($assoc['type'] & ClassMetadata::TO_ONE) ? array($value) : $value->unwrap(); + $unwrappedValue = ($assoc['type'] & ClassMetadata::TO_ONE) ? [$value] : $value->unwrap(); $targetClass = $this->em->getClassMetadata($assoc['targetEntity']); foreach ($unwrappedValue as $key => $entry) { @@ -935,7 +935,7 @@ class UnitOfWork implements PropertyChangedListener $class = $this->em->getClassMetadata(get_class($entity)); } - $actualData = array(); + $actualData = []; foreach ($class->reflFields as $name => $refProp) { if (( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) @@ -950,13 +950,13 @@ class UnitOfWork implements PropertyChangedListener } $originalData = $this->originalEntityData[$oid]; - $changeSet = array(); + $changeSet = []; foreach ($actualData as $propName => $actualValue) { $orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null; if ($orgValue !== $actualValue) { - $changeSet[$propName] = array($orgValue, $actualValue); + $changeSet[$propName] = [$orgValue, $actualValue]; } } @@ -980,7 +980,7 @@ class UnitOfWork implements PropertyChangedListener */ private function executeInserts($class) { - $entities = array(); + $entities = []; $className = $class->name; $persister = $this->getEntityPersister($className); $invoke = $this->listenersInvoker->getSubscribedSystems($class, Events::postPersist); @@ -1013,7 +1013,7 @@ class UnitOfWork implements PropertyChangedListener $class->reflFields[$idField]->setValue($entity, $idValue); - $this->entityIdentifiers[$oid] = array($idField => $idValue); + $this->entityIdentifiers[$oid] = [$idField => $idValue]; $this->entityStates[$oid] = self::STATE_MANAGED; $this->originalEntityData[$oid][$idField] = $idValue; @@ -1123,7 +1123,7 @@ class UnitOfWork implements PropertyChangedListener // We have to inspect changeSet to be able to correctly build dependencies. // It is not possible to use IdentityMap here because post inserted ids // are not yet available. - $newNodes = array(); + $newNodes = []; foreach ($entityChangeSet as $entity) { $class = $this->em->getClassMetadata(get_class($entity)); @@ -1274,12 +1274,12 @@ class UnitOfWork implements PropertyChangedListener public function scheduleExtraUpdate($entity, array $changeset) { $oid = spl_object_hash($entity); - $extraUpdate = array($entity, $changeset); + $extraUpdate = [$entity, $changeset]; if (isset($this->extraUpdates[$oid])) { list(, $changeset2) = $this->extraUpdates[$oid]; - $extraUpdate = array($entity, $changeset + $changeset2); + $extraUpdate = [$entity, $changeset + $changeset2]; } $this->extraUpdates[$oid] = $extraUpdate; @@ -1615,7 +1615,7 @@ class UnitOfWork implements PropertyChangedListener */ public function persist($entity) { - $visited = array(); + $visited = []; $this->doPersist($entity, $visited); } @@ -1692,7 +1692,7 @@ class UnitOfWork implements PropertyChangedListener */ public function remove($entity) { - $visited = array(); + $visited = []; $this->doRemove($entity, $visited); } @@ -1766,7 +1766,7 @@ class UnitOfWork implements PropertyChangedListener */ public function merge($entity) { - $visited = array(); + $visited = []; return $this->doMerge($entity, $visited); } @@ -1942,7 +1942,7 @@ class UnitOfWork implements PropertyChangedListener */ public function detach($entity) { - $visited = array(); + $visited = []; $this->doDetach($entity, $visited); } @@ -2003,7 +2003,7 @@ class UnitOfWork implements PropertyChangedListener */ public function refresh($entity) { - $visited = array(); + $visited = []; $this->doRefresh($entity, $visited); } @@ -2245,7 +2245,7 @@ class UnitOfWork implements PropertyChangedListener function ($assoc) { return $assoc['isCascadeRemove']; } ); - $entitiesToCascade = array(); + $entitiesToCascade = []; foreach ($associationMappings as $assoc) { if ($entity instanceof Proxy && !$entity->__isInitialized__) { @@ -2380,7 +2380,7 @@ class UnitOfWork implements PropertyChangedListener $this->extraUpdates = $this->readOnlyObjects = $this->visitedCollections = - $this->orphanRemovals = array(); + $this->orphanRemovals = []; } else { $this->clearIdentityMapForEntityName($entityName); $this->clearEntityInsertionsForEntityName($entityName); @@ -2484,7 +2484,7 @@ class UnitOfWork implements PropertyChangedListener * * @todo Rename: getOrCreateEntity */ - public function createEntity($className, array $data, &$hints = array()) + public function createEntity($className, array $data, &$hints = []) { $class = $this->em->getClassMetadata($className); //$isReadOnly = isset($hints[Query::HINT_READ_ONLY]); @@ -2615,7 +2615,7 @@ class UnitOfWork implements PropertyChangedListener continue; } - $associatedId = array(); + $associatedId = []; // TODO: Is this even computed right in all cases of composite keys? foreach ($assoc['targetToSourceKeyColumns'] as $targetColumn => $srcColumn) { @@ -2631,7 +2631,7 @@ class UnitOfWork implements PropertyChangedListener && in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true) ) { // the missing key is part of target's entity primary key - $associatedId = array(); + $associatedId = []; break; } } @@ -2780,7 +2780,7 @@ class UnitOfWork implements PropertyChangedListener // avoid infinite recursion $eagerLoadingEntities = $this->eagerLoadingEntities; - $this->eagerLoadingEntities = array(); + $this->eagerLoadingEntities = []; foreach ($eagerLoadingEntities as $entityName => $ids) { if ( ! $ids) { @@ -2790,7 +2790,7 @@ class UnitOfWork implements PropertyChangedListener $class = $this->em->getClassMetadata($entityName); $this->getEntityPersister($entityName)->loadAll( - array_combine($class->identifier, array(array_values($ids))) + array_combine($class->identifier, [array_values($ids)]) ); } } @@ -3088,7 +3088,7 @@ class UnitOfWork implements PropertyChangedListener */ public function clearEntityChangeSet($oid) { - $this->entityChangeSets[$oid] = array(); + $this->entityChangeSets[$oid] = []; } /* PropertyChangedListener implementation */ @@ -3115,7 +3115,7 @@ class UnitOfWork implements PropertyChangedListener } // Update changeset and mark entity for synchronization - $this->entityChangeSets[$oid][$propertyName] = array($oldValue, $newValue); + $this->entityChangeSets[$oid][$propertyName] = [$oldValue, $newValue]; if ( ! isset($this->scheduledForSynchronization[$class->rootEntityName][$oid])) { $this->scheduleForDirtyCheck($entity); @@ -3374,7 +3374,7 @@ class UnitOfWork implements PropertyChangedListener $assoc2['targetEntity'], $relatedId ); - $this->registerManaged($other, $relatedId, array()); + $this->registerManaged($other, $relatedId, []); } } diff --git a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php index 4a60385bd..a283a6834 100644 --- a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php +++ b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php @@ -68,7 +68,7 @@ final class IdentifierFlattener */ public function flattenIdentifier(ClassMetadata $class, array $id) { - $flatId = array(); + $flatId = []; foreach ($class->identifier as $field) { if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) { @@ -85,7 +85,7 @@ final class IdentifierFlattener $flatId[$field] = implode(' ', $associatedId); } elseif (isset($class->associationMappings[$field])) { - $associatedId = array(); + $associatedId = []; foreach ($class->associationMappings[$field]['joinColumns'] as $joinColumn) { $associatedId[] = $id[$joinColumn['name']]; diff --git a/lib/Doctrine/ORM/Utility/PersisterHelper.php b/lib/Doctrine/ORM/Utility/PersisterHelper.php index ad99a7ea8..d72dc3e19 100644 --- a/lib/Doctrine/ORM/Utility/PersisterHelper.php +++ b/lib/Doctrine/ORM/Utility/PersisterHelper.php @@ -46,11 +46,11 @@ class PersisterHelper public static function getTypeOfField($fieldName, ClassMetadata $class, EntityManagerInterface $em) { if (isset($class->fieldMappings[$fieldName])) { - return array($class->fieldMappings[$fieldName]['type']); + return [$class->fieldMappings[$fieldName]['type']]; } if ( ! isset($class->associationMappings[$fieldName])) { - return array(); + return []; } $assoc = $class->associationMappings[$fieldName]; @@ -65,7 +65,7 @@ class PersisterHelper $joinData = $assoc; } - $types = array(); + $types = []; $targetClass = $em->getClassMetadata($assoc['targetEntity']); foreach ($joinData['joinColumns'] as $joinColumn) { From 512aa8a3c7cd1100d05fc8912cdef485ebfec416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 8 Dec 2016 17:09:35 +0100 Subject: [PATCH 5/8] Use "::class" syntax on "lib" directory --- lib/Doctrine/ORM/Configuration.php | 10 +- .../ORM/Mapping/Driver/AnnotationDriver.php | 137 +++++++++--------- .../ORM/Mapping/Driver/DatabaseDriver.php | 2 +- lib/Doctrine/ORM/Proxy/ProxyFactory.php | 2 +- lib/Doctrine/ORM/Query/Expr/Andx.php | 8 +- lib/Doctrine/ORM/Query/Expr/Orx.php | 8 +- lib/Doctrine/ORM/Query/Expr/Select.php | 2 +- lib/Doctrine/ORM/Query/Parser.php | 45 +++--- lib/Doctrine/ORM/Tools/EntityGenerator.php | 5 +- .../ORM/Tools/EntityRepositoryGenerator.php | 6 +- .../Tools/Export/ClassMetadataExporter.php | 10 +- .../ORM/Tools/Pagination/Paginator.php | 12 +- 12 files changed, 126 insertions(+), 121 deletions(-) diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index fa1d1dde7..104a4f4b2 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -25,9 +25,11 @@ use Doctrine\Common\Annotations\CachedReader; use Doctrine\Common\Annotations\SimpleAnnotationReader; use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Cache\Cache as CacheDriver; +use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; +use Doctrine\Common\Persistence\ObjectRepository; use Doctrine\Common\Proxy\AbstractProxyFactory; use Doctrine\ORM\Cache\CacheConfiguration; -use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; +use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\DefaultEntityListenerResolver; use Doctrine\ORM\Mapping\DefaultNamingStrategy; use Doctrine\ORM\Mapping\DefaultQuoteStrategy; @@ -642,7 +644,7 @@ class Configuration extends \Doctrine\DBAL\Configuration public function getClassMetadataFactoryName() { if ( ! isset($this->_attributes['classMetadataFactoryName'])) { - $this->_attributes['classMetadataFactoryName'] = 'Doctrine\ORM\Mapping\ClassMetadataFactory'; + $this->_attributes['classMetadataFactoryName'] = ClassMetadataFactory::class; } return $this->_attributes['classMetadataFactoryName']; @@ -689,7 +691,7 @@ class Configuration extends \Doctrine\DBAL\Configuration { $reflectionClass = new \ReflectionClass($className); - if ( ! $reflectionClass->implementsInterface('Doctrine\Common\Persistence\ObjectRepository')) { + if ( ! $reflectionClass->implementsInterface(ObjectRepository::class)) { throw ORMException::invalidEntityRepository($className); } @@ -707,7 +709,7 @@ class Configuration extends \Doctrine\DBAL\Configuration { return isset($this->_attributes['defaultRepositoryClassName']) ? $this->_attributes['defaultRepositoryClassName'] - : 'Doctrine\ORM\EntityRepository'; + : EntityRepository::class; } /** diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 0ed36d895..b5a5b714c 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -20,13 +20,12 @@ namespace Doctrine\ORM\Mapping\Driver; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\ORM\Mapping\MappingException; -use Doctrine\ORM\Mapping\JoinColumn; -use Doctrine\ORM\Mapping\Column; -use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder; use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver as AbstractAnnotationDriver; use Doctrine\ORM\Events; +use Doctrine\ORM\Mapping; +use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder; +use Doctrine\ORM\Mapping\MappingException; /** * The AnnotationDriver reads the mapping metadata from docblock annotations. @@ -43,8 +42,8 @@ class AnnotationDriver extends AbstractAnnotationDriver * {@inheritDoc} */ protected $entityAnnotationClasses = [ - 'Doctrine\ORM\Mapping\Entity' => 1, - 'Doctrine\ORM\Mapping\MappedSuperclass' => 2, + Mapping\Entity::class => 1, + Mapping\MappedSuperclass::class => 2, ]; /** @@ -74,8 +73,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate Entity annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\Entity'])) { - $entityAnnot = $classAnnotations['Doctrine\ORM\Mapping\Entity']; + if (isset($classAnnotations[Mapping\Entity::class])) { + $entityAnnot = $classAnnotations[Mapping\Entity::class]; if ($entityAnnot->repositoryClass !== null) { $metadata->setCustomRepositoryClass($entityAnnot->repositoryClass); } @@ -83,20 +82,20 @@ class AnnotationDriver extends AbstractAnnotationDriver if ($entityAnnot->readOnly) { $metadata->markReadOnly(); } - } else if (isset($classAnnotations['Doctrine\ORM\Mapping\MappedSuperclass'])) { - $mappedSuperclassAnnot = $classAnnotations['Doctrine\ORM\Mapping\MappedSuperclass']; + } else if (isset($classAnnotations[Mapping\MappedSuperclass::class])) { + $mappedSuperclassAnnot = $classAnnotations[Mapping\MappedSuperclass::class]; $metadata->setCustomRepositoryClass($mappedSuperclassAnnot->repositoryClass); $metadata->isMappedSuperclass = true; - } else if (isset($classAnnotations['Doctrine\ORM\Mapping\Embeddable'])) { + } else if (isset($classAnnotations[Mapping\Embeddable::class])) { $metadata->isEmbeddedClass = true; } else { throw MappingException::classIsNotAValidEntityOrMappedSuperClass($className); } // Evaluate Table annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\Table'])) { - $tableAnnot = $classAnnotations['Doctrine\ORM\Mapping\Table']; + if (isset($classAnnotations[Mapping\Table::class])) { + $tableAnnot = $classAnnotations[Mapping\Table::class]; $primaryTable = [ 'name' => $tableAnnot->name, 'schema' => $tableAnnot->schema @@ -146,8 +145,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate @Cache annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\Cache'])) { - $cacheAnnot = $classAnnotations['Doctrine\ORM\Mapping\Cache']; + if (isset($classAnnotations[Mapping\Cache::class])) { + $cacheAnnot = $classAnnotations[Mapping\Cache::class]; $cacheMap = [ 'region' => $cacheAnnot->region, 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), @@ -157,8 +156,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate NamedNativeQueries annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\NamedNativeQueries'])) { - $namedNativeQueriesAnnot = $classAnnotations['Doctrine\ORM\Mapping\NamedNativeQueries']; + if (isset($classAnnotations[Mapping\NamedNativeQueries::class])) { + $namedNativeQueriesAnnot = $classAnnotations[Mapping\NamedNativeQueries::class]; foreach ($namedNativeQueriesAnnot->value as $namedNativeQuery) { $metadata->addNamedNativeQuery( @@ -173,8 +172,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate SqlResultSetMappings annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\SqlResultSetMappings'])) { - $sqlResultSetMappingsAnnot = $classAnnotations['Doctrine\ORM\Mapping\SqlResultSetMappings']; + if (isset($classAnnotations[Mapping\SqlResultSetMappings::class])) { + $sqlResultSetMappingsAnnot = $classAnnotations[Mapping\SqlResultSetMappings::class]; foreach ($sqlResultSetMappingsAnnot->value as $resultSetMapping) { $entities = []; @@ -213,15 +212,15 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate NamedQueries annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\NamedQueries'])) { - $namedQueriesAnnot = $classAnnotations['Doctrine\ORM\Mapping\NamedQueries']; + if (isset($classAnnotations[Mapping\NamedQueries::class])) { + $namedQueriesAnnot = $classAnnotations[Mapping\NamedQueries::class]; if ( ! is_array($namedQueriesAnnot->value)) { throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations."); } foreach ($namedQueriesAnnot->value as $namedQuery) { - if ( ! ($namedQuery instanceof \Doctrine\ORM\Mapping\NamedQuery)) { + if ( ! ($namedQuery instanceof Mapping\NamedQuery)) { throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations."); } $metadata->addNamedQuery( @@ -234,17 +233,17 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate InheritanceType annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\InheritanceType'])) { - $inheritanceTypeAnnot = $classAnnotations['Doctrine\ORM\Mapping\InheritanceType']; + if (isset($classAnnotations[Mapping\InheritanceType::class])) { + $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class]; $metadata->setInheritanceType( constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value) ); - if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) { + if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) { // Evaluate DiscriminatorColumn annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\DiscriminatorColumn'])) { - $discrColumnAnnot = $classAnnotations['Doctrine\ORM\Mapping\DiscriminatorColumn']; + if (isset($classAnnotations[Mapping\DiscriminatorColumn::class])) { + $discrColumnAnnot = $classAnnotations[Mapping\DiscriminatorColumn::class]; $metadata->setDiscriminatorColumn( [ @@ -259,8 +258,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate DiscriminatorMap annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\DiscriminatorMap'])) { - $discrMapAnnot = $classAnnotations['Doctrine\ORM\Mapping\DiscriminatorMap']; + if (isset($classAnnotations[Mapping\DiscriminatorMap::class])) { + $discrMapAnnot = $classAnnotations[Mapping\DiscriminatorMap::class]; $metadata->setDiscriminatorMap($discrMapAnnot->value); } } @@ -268,8 +267,8 @@ class AnnotationDriver extends AbstractAnnotationDriver // Evaluate DoctrineChangeTrackingPolicy annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'])) { - $changeTrackingAnnot = $classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy']; + if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) { + $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class]; $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value)); } @@ -290,7 +289,7 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['fieldName'] = $property->getName(); // Evaluate @Cache annotation - if (($cacheAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Cache')) !== null) { + if (($cacheAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Cache::class)) !== null) { $mapping['cache'] = $metadata->getAssociationCacheDefaults( $mapping['fieldName'], [ @@ -302,9 +301,9 @@ class AnnotationDriver extends AbstractAnnotationDriver // Check for JoinColumn/JoinColumns annotations $joinColumns = []; - if ($joinColumnAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinColumn')) { + if ($joinColumnAnnot = $this->reader->getPropertyAnnotation($property, Mapping\JoinColumn::class)) { $joinColumns[] = $this->joinColumnToArray($joinColumnAnnot); - } else if ($joinColumnsAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinColumns')) { + } else if ($joinColumnsAnnot = $this->reader->getPropertyAnnotation($property, Mapping\JoinColumns::class)) { foreach ($joinColumnsAnnot->value as $joinColumn) { $joinColumns[] = $this->joinColumnToArray($joinColumn); } @@ -312,29 +311,29 @@ class AnnotationDriver extends AbstractAnnotationDriver // Field can only be annotated with one of: // @Column, @OneToOne, @OneToMany, @ManyToOne, @ManyToMany - if ($columnAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Column')) { + if ($columnAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Column::class)) { if ($columnAnnot->type == null) { throw MappingException::propertyTypeIsRequired($className, $property->getName()); } $mapping = $this->columnToArray($property->getName(), $columnAnnot); - if ($idAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Id')) { + if ($idAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Id::class)) { $mapping['id'] = true; } - if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\GeneratedValue')) { + if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) { $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy)); } - if ($this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Version')) { + if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) { $metadata->setVersionMapping($mapping); } $metadata->mapField($mapping); // Check for SequenceGenerator/TableGenerator definition - if ($seqGeneratorAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\SequenceGenerator')) { + if ($seqGeneratorAnnot = $this->reader->getPropertyAnnotation($property, Mapping\SequenceGenerator::class)) { $metadata->setSequenceGeneratorDefinition( [ 'sequenceName' => $seqGeneratorAnnot->sequenceName, @@ -344,15 +343,15 @@ class AnnotationDriver extends AbstractAnnotationDriver ); } else if ($this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\TableGenerator')) { throw MappingException::tableIdGeneratorNotImplemented($className); - } else if ($customGeneratorAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\CustomIdGenerator')) { + } else if ($customGeneratorAnnot = $this->reader->getPropertyAnnotation($property, Mapping\CustomIdGenerator::class)) { $metadata->setCustomGeneratorDefinition( [ 'class' => $customGeneratorAnnot->class ] ); } - } else if ($oneToOneAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OneToOne')) { - if ($idAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Id')) { + } else if ($oneToOneAnnot = $this->reader->getPropertyAnnotation($property, Mapping\OneToOne::class)) { + if ($idAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Id::class)) { $mapping['id'] = true; } @@ -364,7 +363,7 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['orphanRemoval'] = $oneToOneAnnot->orphanRemoval; $mapping['fetch'] = $this->getFetchMode($className, $oneToOneAnnot->fetch); $metadata->mapOneToOne($mapping); - } else if ($oneToManyAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OneToMany')) { + } else if ($oneToManyAnnot = $this->reader->getPropertyAnnotation($property, Mapping\OneToMany::class)) { $mapping['mappedBy'] = $oneToManyAnnot->mappedBy; $mapping['targetEntity'] = $oneToManyAnnot->targetEntity; $mapping['cascade'] = $oneToManyAnnot->cascade; @@ -372,13 +371,13 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['orphanRemoval'] = $oneToManyAnnot->orphanRemoval; $mapping['fetch'] = $this->getFetchMode($className, $oneToManyAnnot->fetch); - if ($orderByAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OrderBy')) { + if ($orderByAnnot = $this->reader->getPropertyAnnotation($property, Mapping\OrderBy::class)) { $mapping['orderBy'] = $orderByAnnot->value; } $metadata->mapOneToMany($mapping); - } else if ($manyToOneAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\ManyToOne')) { - if ($idAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Id')) { + } else if ($manyToOneAnnot = $this->reader->getPropertyAnnotation($property, Mapping\ManyToOne::class)) { + if ($idAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Id::class)) { $mapping['id'] = true; } @@ -388,10 +387,10 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['targetEntity'] = $manyToOneAnnot->targetEntity; $mapping['fetch'] = $this->getFetchMode($className, $manyToOneAnnot->fetch); $metadata->mapManyToOne($mapping); - } else if ($manyToManyAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\ManyToMany')) { + } else if ($manyToManyAnnot = $this->reader->getPropertyAnnotation($property, Mapping\ManyToMany::class)) { $joinTable = []; - if ($joinTableAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinTable')) { + if ($joinTableAnnot = $this->reader->getPropertyAnnotation($property, Mapping\JoinTable::class)) { $joinTable = [ 'name' => $joinTableAnnot->name, 'schema' => $joinTableAnnot->schema @@ -415,12 +414,12 @@ class AnnotationDriver extends AbstractAnnotationDriver $mapping['orphanRemoval'] = $manyToManyAnnot->orphanRemoval; $mapping['fetch'] = $this->getFetchMode($className, $manyToManyAnnot->fetch); - if ($orderByAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\OrderBy')) { + if ($orderByAnnot = $this->reader->getPropertyAnnotation($property, Mapping\OrderBy::class)) { $mapping['orderBy'] = $orderByAnnot->value; } $metadata->mapManyToMany($mapping); - } else if ($embeddedAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Embedded')) { + } else if ($embeddedAnnot = $this->reader->getPropertyAnnotation($property, Mapping\Embedded::class)) { $mapping['class'] = $embeddedAnnot->class; $mapping['columnPrefix'] = $embeddedAnnot->columnPrefix; @@ -429,8 +428,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate AssociationOverrides annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\AssociationOverrides'])) { - $associationOverridesAnnot = $classAnnotations['Doctrine\ORM\Mapping\AssociationOverrides']; + if (isset($classAnnotations[Mapping\AssociationOverrides::class])) { + $associationOverridesAnnot = $classAnnotations[Mapping\AssociationOverrides::class]; foreach ($associationOverridesAnnot->value as $associationOverride) { $override = []; @@ -476,8 +475,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate AttributeOverrides annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\AttributeOverrides'])) { - $attributeOverridesAnnot = $classAnnotations['Doctrine\ORM\Mapping\AttributeOverrides']; + if (isset($classAnnotations[Mapping\AttributeOverrides::class])) { + $attributeOverridesAnnot = $classAnnotations[Mapping\AttributeOverrides::class]; foreach ($attributeOverridesAnnot->value as $attributeOverrideAnnot) { $attributeOverride = $this->columnToArray($attributeOverrideAnnot->name, $attributeOverrideAnnot->column); @@ -487,8 +486,8 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate EntityListeners annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\EntityListeners'])) { - $entityListenersAnnot = $classAnnotations['Doctrine\ORM\Mapping\EntityListeners']; + if (isset($classAnnotations[Mapping\EntityListeners::class])) { + $entityListenersAnnot = $classAnnotations[Mapping\EntityListeners::class]; foreach ($entityListenersAnnot->value as $item) { $listenerClassName = $metadata->fullyQualifiedClassName($item); @@ -519,7 +518,7 @@ class AnnotationDriver extends AbstractAnnotationDriver } // Evaluate @HasLifecycleCallbacks annotation - if (isset($classAnnotations['Doctrine\ORM\Mapping\HasLifecycleCallbacks'])) { + if (isset($classAnnotations[Mapping\HasLifecycleCallbacks::class])) { /* @var $method \ReflectionMethod */ foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { foreach ($this->getMethodCallbacks($method) as $value) { @@ -561,35 +560,35 @@ class AnnotationDriver extends AbstractAnnotationDriver $annotations = $this->reader->getMethodAnnotations($method); foreach ($annotations as $annot) { - if ($annot instanceof \Doctrine\ORM\Mapping\PrePersist) { + if ($annot instanceof Mapping\PrePersist) { $callbacks[] = [$method->name, Events::prePersist]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PostPersist) { + if ($annot instanceof Mapping\PostPersist) { $callbacks[] = [$method->name, Events::postPersist]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PreUpdate) { + if ($annot instanceof Mapping\PreUpdate) { $callbacks[] = [$method->name, Events::preUpdate]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PostUpdate) { + if ($annot instanceof Mapping\PostUpdate) { $callbacks[] = [$method->name, Events::postUpdate]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PreRemove) { + if ($annot instanceof Mapping\PreRemove) { $callbacks[] = [$method->name, Events::preRemove]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PostRemove) { + if ($annot instanceof Mapping\PostRemove) { $callbacks[] = [$method->name, Events::postRemove]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PostLoad) { + if ($annot instanceof Mapping\PostLoad) { $callbacks[] = [$method->name, Events::postLoad]; } - if ($annot instanceof \Doctrine\ORM\Mapping\PreFlush) { + if ($annot instanceof Mapping\PreFlush) { $callbacks[] = [$method->name, Events::preFlush]; } } @@ -600,10 +599,10 @@ class AnnotationDriver extends AbstractAnnotationDriver /** * Parse the given JoinColumn as array * - * @param JoinColumn $joinColumn + * @param Mapping\JoinColumn $joinColumn * @return array */ - private function joinColumnToArray(JoinColumn $joinColumn) + private function joinColumnToArray(Mapping\JoinColumn $joinColumn) { return [ 'name' => $joinColumn->name, @@ -619,11 +618,11 @@ class AnnotationDriver extends AbstractAnnotationDriver * Parse the given Column as array * * @param string $fieldName - * @param Column $column + * @param Mapping\Column $column * * @return array */ - private function columnToArray($fieldName, Column $column) + private function columnToArray($fieldName, Mapping\Column $column) { $mapping = [ 'fieldName' => $fieldName, diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index 9389feb81..41c740ec4 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -496,7 +496,7 @@ class DatabaseDriver implements MappingDriver } /** - * Retreive schema table definition primary keys. + * Retrieve schema table definition primary keys. * * @param \Doctrine\DBAL\Schema\Table $table * diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 58dfc0932..6bc7dc527 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -76,7 +76,7 @@ class ProxyFactory extends AbstractProxyFactory { $proxyGenerator = new ProxyGenerator($proxyDir, $proxyNs); - $proxyGenerator->setPlaceholder('baseProxyInterface', 'Doctrine\ORM\Proxy\Proxy'); + $proxyGenerator->setPlaceholder('baseProxyInterface', Proxy::class); parent::__construct($proxyGenerator, $em->getMetadataFactory(), $autoGenerate); $this->em = $em; diff --git a/lib/Doctrine/ORM/Query/Expr/Andx.php b/lib/Doctrine/ORM/Query/Expr/Andx.php index cc64ab1a8..dd91916a6 100644 --- a/lib/Doctrine/ORM/Query/Expr/Andx.php +++ b/lib/Doctrine/ORM/Query/Expr/Andx.php @@ -39,10 +39,10 @@ class Andx extends Composite * @var array */ protected $allowedClasses = [ - 'Doctrine\ORM\Query\Expr\Comparison', - 'Doctrine\ORM\Query\Expr\Func', - 'Doctrine\ORM\Query\Expr\Orx', - 'Doctrine\ORM\Query\Expr\Andx', + Comparison::class, + Func::class, + Orx::class, + Andx::class, ]; /** diff --git a/lib/Doctrine/ORM/Query/Expr/Orx.php b/lib/Doctrine/ORM/Query/Expr/Orx.php index 35f88e831..d36abfa92 100644 --- a/lib/Doctrine/ORM/Query/Expr/Orx.php +++ b/lib/Doctrine/ORM/Query/Expr/Orx.php @@ -39,10 +39,10 @@ class Orx extends Composite * @var array */ protected $allowedClasses = [ - 'Doctrine\ORM\Query\Expr\Comparison', - 'Doctrine\ORM\Query\Expr\Func', - 'Doctrine\ORM\Query\Expr\Andx', - 'Doctrine\ORM\Query\Expr\Orx', + Comparison::class, + Func::class, + Andx::class, + Orx::class, ]; /** diff --git a/lib/Doctrine/ORM/Query/Expr/Select.php b/lib/Doctrine/ORM/Query/Expr/Select.php index 00bdc94f3..8ab5153f1 100644 --- a/lib/Doctrine/ORM/Query/Expr/Select.php +++ b/lib/Doctrine/ORM/Query/Expr/Select.php @@ -43,7 +43,7 @@ class Select extends Base /** * @var array */ - protected $allowedClasses = ['Doctrine\ORM\Query\Expr\Func']; + protected $allowedClasses = [Func::class]; /** * @return array diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index ae8fcd3eb..65b8374bd 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -19,8 +19,9 @@ namespace Doctrine\ORM\Query; -use Doctrine\ORM\Query; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Query; +use Doctrine\ORM\Query\AST\Functions; /** * An LL(*) recursive-descent parser for the context-free grammar of the Doctrine Query Language. @@ -41,12 +42,12 @@ class Parser * @var array */ private static $_STRING_FUNCTIONS = [ - 'concat' => 'Doctrine\ORM\Query\AST\Functions\ConcatFunction', - 'substring' => 'Doctrine\ORM\Query\AST\Functions\SubstringFunction', - 'trim' => 'Doctrine\ORM\Query\AST\Functions\TrimFunction', - 'lower' => 'Doctrine\ORM\Query\AST\Functions\LowerFunction', - 'upper' => 'Doctrine\ORM\Query\AST\Functions\UpperFunction', - 'identity' => 'Doctrine\ORM\Query\AST\Functions\IdentityFunction', + 'concat' => Functions\ConcatFunction::class, + 'substring' => Functions\SubstringFunction::class, + 'trim' => Functions\TrimFunction::class, + 'lower' => Functions\LowerFunction::class, + 'upper' => Functions\UpperFunction::class, + 'identity' => Functions\IdentityFunction::class, ]; /** @@ -55,15 +56,15 @@ class Parser * @var array */ private static $_NUMERIC_FUNCTIONS = [ - 'length' => 'Doctrine\ORM\Query\AST\Functions\LengthFunction', - 'locate' => 'Doctrine\ORM\Query\AST\Functions\LocateFunction', - 'abs' => 'Doctrine\ORM\Query\AST\Functions\AbsFunction', - 'sqrt' => 'Doctrine\ORM\Query\AST\Functions\SqrtFunction', - 'mod' => 'Doctrine\ORM\Query\AST\Functions\ModFunction', - 'size' => 'Doctrine\ORM\Query\AST\Functions\SizeFunction', - 'date_diff' => 'Doctrine\ORM\Query\AST\Functions\DateDiffFunction', - 'bit_and' => 'Doctrine\ORM\Query\AST\Functions\BitAndFunction', - 'bit_or' => 'Doctrine\ORM\Query\AST\Functions\BitOrFunction', + 'length' => Functions\LengthFunction::class, + 'locate' => Functions\LocateFunction::class, + 'abs' => Functions\AbsFunction::class, + 'sqrt' => Functions\SqrtFunction::class, + 'mod' => Functions\ModFunction::class, + 'size' => Functions\SizeFunction::class, + 'date_diff' => Functions\DateDiffFunction::class, + 'bit_and' => Functions\BitAndFunction::class, + 'bit_or' => Functions\BitOrFunction::class, ]; /** @@ -72,11 +73,11 @@ class Parser * @var array */ private static $_DATETIME_FUNCTIONS = [ - 'current_date' => 'Doctrine\ORM\Query\AST\Functions\CurrentDateFunction', - 'current_time' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimeFunction', - 'current_timestamp' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimestampFunction', - 'date_add' => 'Doctrine\ORM\Query\AST\Functions\DateAddFunction', - 'date_sub' => 'Doctrine\ORM\Query\AST\Functions\DateSubFunction', + 'current_date' => Functions\CurrentDateFunction::class, + 'current_time' => Functions\CurrentTimeFunction::class, + 'current_timestamp' => Functions\CurrentTimestampFunction::class, + 'date_add' => Functions\DateAddFunction::class, + 'date_sub' => Functions\DateSubFunction::class, ]; /* @@ -396,7 +397,7 @@ class Parser $this->queryComponents = $treeWalkerChain->getQueryComponents(); } - $outputWalkerClass = $this->customOutputWalker ?: __NAMESPACE__ . '\SqlWalker'; + $outputWalkerClass = $this->customOutputWalker ?: SqlWalker::class; $outputWalker = new $outputWalkerClass($this->query, $this->parserResult, $this->queryComponents); // Assign an SQL executor to the parser result diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 03e964817..611436343 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -19,9 +19,10 @@ namespace Doctrine\ORM\Tools; -use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Util\Inflector; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Mapping\ClassMetadataInfo; /** * Generic class used to generate PHP5 entity classes from ClassMetadataInfo instances. @@ -1216,7 +1217,7 @@ public function __construct() if ($code = $this->generateEntityStubMethod($metadata, 'remove', $associationMapping['fieldName'], $associationMapping['targetEntity'])) { $methods[] = $code; } - if ($code = $this->generateEntityStubMethod($metadata, 'get', $associationMapping['fieldName'], 'Doctrine\Common\Collections\Collection')) { + if ($code = $this->generateEntityStubMethod($metadata, 'get', $associationMapping['fieldName'], Collection::class)) { $methods[] = $code; } } diff --git a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php index 927738cba..dbfcbc6d4 100644 --- a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php @@ -19,6 +19,8 @@ namespace Doctrine\ORM\Tools; +use Doctrine\ORM\EntityRepository; + /** * Class to generate entity repository classes * @@ -116,14 +118,14 @@ class extends /** * @param string $fullClassName - * + * * @return string $repositoryName */ private function generateEntityRepositoryName($fullClassName) { $namespace = $this->getClassNamespace($fullClassName); - $repositoryName = $this->repositoryName ?: 'Doctrine\ORM\EntityRepository'; + $repositoryName = $this->repositoryName ?: EntityRepository::class; if ($namespace && $repositoryName[0] !== '\\') { $repositoryName = '\\' . $repositoryName; diff --git a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php index 94c781bef..ab44263cd 100644 --- a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php @@ -33,11 +33,11 @@ class ClassMetadataExporter * @var array */ private static $_exporterDrivers = [ - 'xml' => 'Doctrine\ORM\Tools\Export\Driver\XmlExporter', - 'yaml' => 'Doctrine\ORM\Tools\Export\Driver\YamlExporter', - 'yml' => 'Doctrine\ORM\Tools\Export\Driver\YamlExporter', - 'php' => 'Doctrine\ORM\Tools\Export\Driver\PhpExporter', - 'annotation' => 'Doctrine\ORM\Tools\Export\Driver\AnnotationExporter' + 'xml' => Driver\XmlExporter::class, + 'yaml' => Driver\YamlExporter::class, + 'yml' => Driver\YamlExporter::class, + 'php' => Driver\PhpExporter::class, + 'annotation' => Driver\AnnotationExporter::class ]; /** diff --git a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php index aa2a22365..250df071f 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php +++ b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php @@ -142,9 +142,9 @@ class Paginator implements \Countable, \IteratorAggregate $subQuery = $this->cloneQuery($this->query); if ($this->useOutputWalker($subQuery)) { - $subQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $subQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); } else { - $this->appendTreeWalker($subQuery, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker'); + $this->appendTreeWalker($subQuery, LimitSubqueryWalker::class); } $subQuery->setFirstResult($offset)->setMaxResults($length); @@ -154,10 +154,10 @@ class Paginator implements \Countable, \IteratorAggregate $whereInQuery = $this->cloneQuery($this->query); // don't do this for an empty id array if (count($ids) === 0) { - return new \ArrayIterator(array()); + return new \ArrayIterator([]); } - $this->appendTreeWalker($whereInQuery, 'Doctrine\ORM\Tools\Pagination\WhereInWalker'); + $this->appendTreeWalker($whereInQuery, WhereInWalker::class); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, count($ids)); $whereInQuery->setFirstResult(null)->setMaxResults(null); $whereInQuery->setParameter(WhereInWalker::PAGINATOR_ID_ALIAS, $ids); @@ -252,10 +252,10 @@ class Paginator implements \Countable, \IteratorAggregate $rsm = new ResultSetMapping(); $rsm->addScalarResult($platform->getSQLResultCasing('dctrn_count'), 'count'); - $countQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $countQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $countQuery->setResultSetMapping($rsm); } else { - $this->appendTreeWalker($countQuery, 'Doctrine\ORM\Tools\Pagination\CountWalker'); + $this->appendTreeWalker($countQuery, CountWalker::class); } $countQuery->setFirstResult(null)->setMaxResults(null); From fda6fdd9fba9034298fedf4afdf11113478b0ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 8 Dec 2016 18:01:04 +0100 Subject: [PATCH 6/8] Use "::class" syntax on "tests" directory --- .../Doctrine/Tests/Models/CMS/CmsAddress.php | 6 +- tests/Doctrine/Tests/Models/CMS/CmsUser.php | 14 +- .../Tests/Models/Cache/Attraction.php | 2 +- .../Models/Cache/AttractionContactInfo.php | 2 +- .../Tests/Models/Cache/AttractionInfo.php | 2 +- .../Models/Cache/AttractionLocationInfo.php | 2 +- tests/Doctrine/Tests/Models/Cache/City.php | 2 +- tests/Doctrine/Tests/Models/Cache/Country.php | 2 +- tests/Doctrine/Tests/Models/Cache/Flight.php | 2 +- tests/Doctrine/Tests/Models/Cache/State.php | 2 +- tests/Doctrine/Tests/Models/Cache/Travel.php | 2 +- .../Tests/Models/Cache/TravelerProfile.php | 2 +- .../Models/Cache/TravelerProfileInfo.php | 2 +- .../Tests/Models/Company/CompanyPerson.php | 4 +- .../Tests/Models/DDC3597/DDC3597Image.php | 2 +- .../Tests/Models/DDC3597/DDC3597Media.php | 2 +- .../Tests/Models/DDC3597/DDC3597Root.php | 2 +- .../Tests/Models/DDC3699/DDC3699Child.php | 2 +- .../Tests/Models/DDC869/DDC869Payment.php | 2 +- .../Tests/Models/Generic/DateTimeModel.php | 2 +- .../CompositeToOneKeyState.php | 2 +- .../Tests/ORM/Cache/CacheConfigTest.php | 3 +- .../Tests/ORM/Cache/CacheLoggerChainTest.php | 4 +- .../ORM/Cache/DefaultCacheFactoryTest.php | 94 ++--- .../Tests/ORM/Cache/DefaultCacheTest.php | 84 ++--- .../Cache/DefaultCollectionHydratorTest.php | 36 +- .../ORM/Cache/DefaultEntityHydratorTest.php | 54 +-- .../Tests/ORM/Cache/DefaultQueryCacheTest.php | 187 +++++----- .../Tests/ORM/Cache/FileLockRegionTest.php | 20 +- .../AbstractCollectionPersisterTest.php | 12 +- ...ReadWriteCachedCollectionPersisterTest.php | 32 +- .../Entity/AbstractEntityPersisterTest.php | 32 +- ...rictReadWriteCachedEntityPersisterTest.php | 10 +- .../ReadWriteCachedEntityPersisterTest.php | 24 +- .../ORM/Cache/StatisticsCacheLoggerTest.php | 8 +- .../Tests/ORM/CommitOrderCalculatorTest.php | 14 +- .../Doctrine/Tests/ORM/ConfigurationTest.php | 43 +-- .../Decorator/EntityManagerDecoratorTest.php | 6 +- .../Doctrine/Tests/ORM/EntityManagerTest.php | 35 +- .../Tests/ORM/EntityNotFoundExceptionTest.php | 7 +- .../Functional/AdvancedAssociationTest.php | 32 +- .../ORM/Functional/BasicFunctionalTest.php | 44 +-- .../ORM/Functional/CascadeRemoveOrderTest.php | 12 +- .../Functional/ClassTableInheritanceTest.php | 62 ++-- .../Functional/ClassTableInheritanceTest2.php | 19 +- .../Functional/CompositePrimaryKeyTest.php | 20 +- ...ompositePrimaryKeyWithAssociationsTest.php | 4 +- .../ORM/Functional/CustomIdObjectTypeTest.php | 10 +- .../ORM/Functional/DefaultValuesTest.php | 11 +- .../ORM/Functional/DetachedEntityTest.php | 17 +- .../ORM/Functional/EntityListenersTest.php | 110 ++---- .../EntityRepositoryCriteriaTest.php | 15 +- .../ORM/Functional/EntityRepositoryTest.php | 189 ++++++----- .../Functional/ExtraLazyCollectionTest.php | 188 +++++----- .../ORM/Functional/IndexByAssociationTest.php | 6 +- .../JoinedTableCompositeKeyTest.php | 3 +- .../ORM/Functional/LifecycleCallbackTest.php | 61 +--- .../Functional/Locking/GearmanLockTest.php | 34 +- .../ORM/Functional/Locking/OptimisticTest.php | 14 +- .../ManyToManyBasicAssociationTest.php | 21 +- ...ManyToManyBidirectionalAssociationTest.php | 20 +- ...nyToManySelfReferentialAssociationTest.php | 10 +- ...anyToManyUnidirectionalAssociationTest.php | 10 +- .../ORM/Functional/MappedSuperclassTest.php | 8 +- .../Functional/MergeCompositeToOneKeyTest.php | 8 +- .../Tests/ORM/Functional/MergeProxiesTest.php | 25 +- .../Functional/MergeSharedEntitiesTest.php | 4 +- .../Tests/ORM/Functional/NativeQueryTest.php | 157 ++++----- .../Tests/ORM/Functional/NewOperatorTest.php | 170 +++++----- .../Tests/ORM/Functional/NotifyPolicyTest.php | 14 +- .../OneToManyBidirectionalAssociationTest.php | 40 +-- .../Functional/OneToManyOrphanRemovalTest.php | 14 +- ...neToManySelfReferentialAssociationTest.php | 12 +- .../OneToOneBidirectionalAssociationTest.php | 21 +- .../Functional/OneToOneEagerLoadingTest.php | 21 +- .../Functional/OneToOneOrphanRemovalTest.php | 10 +- ...OneToOneSelfReferentialAssociationTest.php | 17 +- .../OneToOneSingleTableInheritanceTest.php | 12 +- .../OneToOneUnidirectionalAssociationTest.php | 10 +- .../ORM/Functional/OrderedCollectionTest.php | 8 +- ...edJoinedTableInheritanceCollectionTest.php | 6 +- .../Tests/ORM/Functional/PaginationTest.php | 11 +- .../PersistentCollectionCriteriaTest.php | 8 +- .../Functional/PersistentCollectionTest.php | 12 +- .../ORM/Functional/PersistentObjectTest.php | 8 +- .../ORM/Functional/PostLoadEventTest.php | 24 +- .../Functional/ProxiesLikeEntitiesTest.php | 58 ++-- .../Tests/ORM/Functional/QueryCacheTest.php | 5 +- .../Tests/ORM/Functional/QueryTest.php | 39 +-- .../Tests/ORM/Functional/ReadOnlyTest.php | 5 +- .../ORM/Functional/ReferenceProxyTest.php | 54 +-- .../Tests/ORM/Functional/ResultCacheTest.php | 2 +- .../Tests/ORM/Functional/SQLFilterTest.php | 153 ++++----- .../SchemaTool/CompanySchemaTest.php | 3 +- .../ORM/Functional/SchemaTool/DBAL483Test.php | 2 +- .../ORM/Functional/SchemaTool/DDC214Test.php | 29 +- .../SchemaTool/MySqlSchemaToolTest.php | 19 +- .../SchemaTool/PostgreSqlSchemaToolTest.php | 23 +- ...econdLevelCacheCompositePrimaryKeyTest.php | 80 ++--- ...ompositePrimaryKeyWithAssociationsTest.php | 6 +- .../SecondLevelCacheConcurrentTest.php | 46 +-- .../SecondLevelCacheCriteriaTest.php | 31 +- ...econdLevelCacheExtraLazyCollectionTest.php | 26 +- ...condLevelCacheJoinTableInheritanceTest.php | 83 ++--- .../SecondLevelCacheManyToManyTest.php | 132 +++---- .../SecondLevelCacheManyToOneTest.php | 131 +++---- .../SecondLevelCacheOneToManyTest.php | 195 +++++------ .../SecondLevelCacheOneToOneTest.php | 163 ++++----- .../SecondLevelCacheQueryCacheTest.php | 321 +++++++++--------- .../SecondLevelCacheRepositoryTest.php | 105 +++--- ...ndLevelCacheSingleTableInheritanceTest.php | 101 +++--- .../ORM/Functional/SecondLevelCacheTest.php | 148 ++++---- .../SequenceEmulatedIdentityStrategyTest.php | 2 +- .../ORM/Functional/SequenceGeneratorTest.php | 2 +- .../SingleTableCompositeKeyTest.php | 8 +- .../Functional/SingleTableInheritanceTest.php | 74 ++-- .../StandardEntityPersisterTest.php | 19 +- .../ORM/Functional/Ticket/DDC1041Test.php | 10 +- .../ORM/Functional/Ticket/DDC1043Test.php | 2 +- .../ORM/Functional/Ticket/DDC1050Test.php | 2 +- .../ORM/Functional/Ticket/DDC1080Test.php | 8 +- .../ORM/Functional/Ticket/DDC1113Test.php | 8 +- .../ORM/Functional/Ticket/DDC1129Test.php | 6 +- .../ORM/Functional/Ticket/DDC1151Test.php | 4 +- .../ORM/Functional/Ticket/DDC1163Test.php | 26 +- .../ORM/Functional/Ticket/DDC117Test.php | 108 +++--- .../ORM/Functional/Ticket/DDC1181Test.php | 6 +- .../ORM/Functional/Ticket/DDC1193Test.php | 6 +- .../ORM/Functional/Ticket/DDC1209Test.php | 6 +- .../ORM/Functional/Ticket/DDC1225Test.php | 6 +- .../ORM/Functional/Ticket/DDC1228Test.php | 12 +- .../ORM/Functional/Ticket/DDC1238Test.php | 8 +- .../ORM/Functional/Ticket/DDC1250Test.php | 4 +- .../ORM/Functional/Ticket/DDC1276Test.php | 4 +- .../ORM/Functional/Ticket/DDC1300Test.php | 4 +- .../ORM/Functional/Ticket/DDC1301Test.php | 31 +- .../ORM/Functional/Ticket/DDC1335Test.php | 10 +- .../ORM/Functional/Ticket/DDC1360Test.php | 2 +- .../ORM/Functional/Ticket/DDC1383Test.php | 4 +- .../ORM/Functional/Ticket/DDC1392Test.php | 6 +- .../ORM/Functional/Ticket/DDC1400Test.php | 8 +- .../ORM/Functional/Ticket/DDC1404Test.php | 6 +- .../ORM/Functional/Ticket/DDC142Test.php | 25 +- .../ORM/Functional/Ticket/DDC1430Test.php | 10 +- .../ORM/Functional/Ticket/DDC1436Test.php | 12 +- .../ORM/Functional/Ticket/DDC144Test.php | 4 +- .../ORM/Functional/Ticket/DDC1452Test.php | 17 +- .../ORM/Functional/Ticket/DDC1454Test.php | 4 +- .../ORM/Functional/Ticket/DDC1458Test.php | 6 +- .../ORM/Functional/Ticket/DDC1461Test.php | 4 +- .../ORM/Functional/Ticket/DDC1509Test.php | 6 +- .../ORM/Functional/Ticket/DDC1514Test.php | 6 +- .../ORM/Functional/Ticket/DDC1515Test.php | 8 +- .../ORM/Functional/Ticket/DDC1526Test.php | 2 +- .../ORM/Functional/Ticket/DDC1545Test.php | 14 +- .../ORM/Functional/Ticket/DDC1548Test.php | 8 +- .../ORM/Functional/Ticket/DDC1595Test.php | 8 +- .../ORM/Functional/Ticket/DDC1654Test.php | 14 +- .../ORM/Functional/Ticket/DDC1655Test.php | 10 +- .../ORM/Functional/Ticket/DDC1685Test.php | 4 +- .../ORM/Functional/Ticket/DDC168Test.php | 10 +- .../ORM/Functional/Ticket/DDC1690Test.php | 23 +- .../ORM/Functional/Ticket/DDC1707Test.php | 6 +- .../ORM/Functional/Ticket/DDC1719Test.php | 24 +- .../ORM/Functional/Ticket/DDC1734Test.php | 7 +- .../ORM/Functional/Ticket/DDC1757Test.php | 4 +- .../ORM/Functional/Ticket/DDC1778Test.php | 10 +- .../ORM/Functional/Ticket/DDC1787Test.php | 4 +- .../ORM/Functional/Ticket/DDC1843Test.php | 51 +-- .../ORM/Functional/Ticket/DDC1884Test.php | 16 +- .../ORM/Functional/Ticket/DDC1885Test.php | 57 ++-- .../ORM/Functional/Ticket/DDC1925Test.php | 4 +- .../ORM/Functional/Ticket/DDC192Test.php | 4 +- .../ORM/Functional/Ticket/DDC1995Test.php | 18 +- .../ORM/Functional/Ticket/DDC1998Test.php | 10 +- .../ORM/Functional/Ticket/DDC199Test.php | 12 +- .../ORM/Functional/Ticket/DDC2012Test.php | 10 +- .../ORM/Functional/Ticket/DDC2074Test.php | 6 +- .../ORM/Functional/Ticket/DDC2090Test.php | 17 +- .../ORM/Functional/Ticket/DDC2106Test.php | 4 +- .../ORM/Functional/Ticket/DDC211Test.php | 4 +- .../ORM/Functional/Ticket/DDC2138Test.php | 10 +- .../ORM/Functional/Ticket/DDC2175Test.php | 2 +- .../ORM/Functional/Ticket/DDC2182Test.php | 4 +- .../ORM/Functional/Ticket/DDC2214Test.php | 6 +- .../ORM/Functional/Ticket/DDC2224Test.php | 2 +- .../ORM/Functional/Ticket/DDC2230Test.php | 15 +- .../ORM/Functional/Ticket/DDC2231Test.php | 5 +- .../ORM/Functional/Ticket/DDC2252Test.php | 25 +- .../ORM/Functional/Ticket/DDC2256Test.php | 6 +- .../ORM/Functional/Ticket/DDC2306Test.php | 17 +- .../ORM/Functional/Ticket/DDC2346Test.php | 8 +- .../ORM/Functional/Ticket/DDC2350Test.php | 6 +- .../ORM/Functional/Ticket/DDC2359Test.php | 2 +- .../ORM/Functional/Ticket/DDC237Test.php | 14 +- .../ORM/Functional/Ticket/DDC2409Test.php | 6 +- .../ORM/Functional/Ticket/DDC2415Test.php | 16 +- .../ORM/Functional/Ticket/DDC2494Test.php | 12 +- .../ORM/Functional/Ticket/DDC2519Test.php | 21 +- .../ORM/Functional/Ticket/DDC2575Test.php | 8 +- .../ORM/Functional/Ticket/DDC2579Test.php | 12 +- .../ORM/Functional/Ticket/DDC258Test.php | 14 +- .../ORM/Functional/Ticket/DDC2660Test.php | 14 +- .../ORM/Functional/Ticket/DDC2692Test.php | 2 +- .../ORM/Functional/Ticket/DDC2759Test.php | 10 +- .../ORM/Functional/Ticket/DDC2775Test.php | 10 +- .../ORM/Functional/Ticket/DDC279Test.php | 8 +- .../ORM/Functional/Ticket/DDC2825Test.php | 6 +- .../ORM/Functional/Ticket/DDC2862Test.php | 54 +-- .../ORM/Functional/Ticket/DDC2895Test.php | 4 +- .../ORM/Functional/Ticket/DDC2931Test.php | 4 +- .../ORM/Functional/Ticket/DDC2943Test.php | 4 +- .../ORM/Functional/Ticket/DDC2984Test.php | 4 +- .../ORM/Functional/Ticket/DDC2996Test.php | 6 +- .../ORM/Functional/Ticket/DDC3033Test.php | 4 +- .../ORM/Functional/Ticket/DDC3042Test.php | 4 +- .../ORM/Functional/Ticket/DDC3068Test.php | 8 +- .../ORM/Functional/Ticket/DDC309Test.php | 4 +- .../ORM/Functional/Ticket/DDC3103Test.php | 5 +- .../ORM/Functional/Ticket/DDC3170Test.php | 12 +- .../ORM/Functional/Ticket/DDC3192Test.php | 10 +- .../ORM/Functional/Ticket/DDC3223Test.php | 10 +- .../ORM/Functional/Ticket/DDC3300Test.php | 14 +- .../ORM/Functional/Ticket/DDC3330Test.php | 4 +- .../ORM/Functional/Ticket/DDC3346Test.php | 6 +- .../ORM/Functional/Ticket/DDC345Test.php | 6 +- .../ORM/Functional/Ticket/DDC353Test.php | 10 +- .../ORM/Functional/Ticket/DDC3582Test.php | 10 +- .../ORM/Functional/Ticket/DDC3597Test.php | 12 +- .../ORM/Functional/Ticket/DDC3634Test.php | 8 +- .../ORM/Functional/Ticket/DDC3644Test.php | 20 +- .../ORM/Functional/Ticket/DDC3699Test.php | 10 +- .../ORM/Functional/Ticket/DDC3711Test.php | 5 +- .../ORM/Functional/Ticket/DDC371Test.php | 7 +- .../ORM/Functional/Ticket/DDC3785Test.php | 8 +- .../ORM/Functional/Ticket/DDC381Test.php | 4 +- .../ORM/Functional/Ticket/DDC3967Test.php | 6 +- .../ORM/Functional/Ticket/DDC4003Test.php | 2 +- .../ORM/Functional/Ticket/DDC422Test.php | 10 +- .../ORM/Functional/Ticket/DDC425Test.php | 2 +- .../ORM/Functional/Ticket/DDC440Test.php | 10 +- .../ORM/Functional/Ticket/DDC444Test.php | 4 +- .../ORM/Functional/Ticket/DDC448Test.php | 6 +- .../ORM/Functional/Ticket/DDC493Test.php | 6 +- .../ORM/Functional/Ticket/DDC501Test.php | 2 +- .../ORM/Functional/Ticket/DDC512Test.php | 14 +- .../ORM/Functional/Ticket/DDC513Test.php | 6 +- .../ORM/Functional/Ticket/DDC522Test.php | 16 +- .../ORM/Functional/Ticket/DDC531Test.php | 14 +- .../ORM/Functional/Ticket/DDC5684Test.php | 18 +- .../ORM/Functional/Ticket/DDC588Test.php | 2 +- .../ORM/Functional/Ticket/DDC599Test.php | 10 +- .../ORM/Functional/Ticket/DDC618Test.php | 16 +- .../ORM/Functional/Ticket/DDC633Test.php | 12 +- .../ORM/Functional/Ticket/DDC656Test.php | 2 +- .../ORM/Functional/Ticket/DDC657Test.php | 14 +- .../ORM/Functional/Ticket/DDC698Test.php | 4 +- .../ORM/Functional/Ticket/DDC719Test.php | 2 +- .../ORM/Functional/Ticket/DDC729Test.php | 19 +- .../ORM/Functional/Ticket/DDC735Test.php | 6 +- .../ORM/Functional/Ticket/DDC736Test.php | 14 +- .../ORM/Functional/Ticket/DDC742Test.php | 8 +- .../ORM/Functional/Ticket/DDC748Test.php | 9 +- .../ORM/Functional/Ticket/DDC758Test.php | 16 +- .../ORM/Functional/Ticket/DDC809Test.php | 6 +- .../ORM/Functional/Ticket/DDC832Test.php | 6 +- .../ORM/Functional/Ticket/DDC837Test.php | 24 +- .../ORM/Functional/Ticket/DDC849Test.php | 2 +- .../ORM/Functional/Ticket/DDC881Test.php | 19 +- .../ORM/Functional/Ticket/DDC949Test.php | 12 +- .../ORM/Functional/Ticket/DDC960Test.php | 4 +- .../ORM/Functional/Ticket/DDC992Test.php | 6 +- .../ORM/Functional/Ticket/Ticket2481Test.php | 2 +- .../Tests/ORM/Functional/Ticket/Ticket69.php | 12 +- .../Tests/ORM/Functional/TypeTest.php | 15 +- .../Tests/ORM/Functional/TypeValueSqlTest.php | 8 +- .../ORM/Functional/UUIDGeneratorTest.php | 2 +- .../ManyToManyCompositeIdForeignKeyTest.php | 31 +- .../ManyToManyCompositeIdTest.php | 19 +- .../ManyToManyExtraLazyTest.php | 21 +- .../ValueConversionType/ManyToManyTest.php | 19 +- .../OneToManyCompositeIdForeignKeyTest.php | 29 +- .../OneToManyCompositeIdTest.php | 17 +- .../OneToManyExtraLazyTest.php | 11 +- .../ValueConversionType/OneToManyTest.php | 17 +- .../OneToOneCompositeIdForeignKeyTest.php | 31 +- .../OneToOneCompositeIdTest.php | 19 +- .../ValueConversionType/OneToOneTest.php | 19 +- .../Tests/ORM/Functional/ValueObjectsTest.php | 46 +-- .../ORM/Functional/VersionedOneToOneTest.php | 8 +- .../Tests/ORM/Hydration/ArrayHydratorTest.php | 70 ++-- .../ORM/Hydration/CustomHydratorTest.php | 7 +- .../ORM/Hydration/ObjectHydratorTest.php | 300 ++++++++-------- .../ORM/Hydration/ResultSetMappingTest.php | 61 ++-- .../ORM/Hydration/ScalarHydratorTest.php | 5 +- .../Hydration/SimpleObjectHydratorTest.php | 21 +- .../Hydration/SingleScalarHydratorTest.php | 3 +- .../Tests/ORM/LazyCriteriaCollectionTest.php | 3 +- .../ORM/Mapping/AbstractMappingDriverTest.php | 157 +++++---- .../ORM/Mapping/AnnotationDriverTest.php | 52 +-- .../ORM/Mapping/AnsiQuoteStrategyTest.php | 22 +- .../Mapping/BasicInheritanceMappingTest.php | 45 +-- .../ORM/Mapping/ClassMetadataBuilderTest.php | 106 +++--- .../ORM/Mapping/ClassMetadataFactoryTest.php | 64 ++-- .../Mapping/ClassMetadataLoadEventTest.php | 2 +- .../Tests/ORM/Mapping/ClassMetadataTest.php | 245 ++++++------- .../ORM/Mapping/DefaultQuoteStrategyTest.php | 7 +- .../Tests/ORM/Mapping/FieldBuilderTest.php | 3 +- .../ORM/Mapping/PHPMappingDriverTest.php | 13 +- .../Tests/ORM/Mapping/QuoteStrategyTest.php | 45 +-- .../ReflectionPropertiesGetterTest.php | 30 +- .../ReflectionEmbeddedPropertyTest.php | 76 ++--- .../Mapping/StaticPHPMappingDriverTest.php | 3 +- .../ORM/Mapping/XmlMappingDriverTest.php | 41 +-- .../ORM/Mapping/YamlMappingDriverTest.php | 26 +- .../Doctrine.Tests.Models.CMS.CmsAddress.php | 25 +- .../php/Doctrine.Tests.Models.CMS.CmsUser.php | 17 +- .../php/Doctrine.Tests.Models.Cache.City.php | 9 +- ...ine.Tests.Models.Company.CompanyPerson.php | 6 +- ...rine.Tests.Models.DDC869.DDC869Payment.php | 3 +- ...e.Tests.Models.DDC889.DDC889SuperClass.php | 3 +- .../php/Doctrine.Tests.ORM.Mapping.Animal.php | 6 +- .../php/Doctrine.Tests.ORM.Mapping.User.php | 9 +- .../Tests/ORM/Performance/DDC2602Test.php | 16 +- .../Performance/HydrationPerformanceTest.php | 43 +-- .../InheritancePersisterPerformanceTest.php | 5 +- .../Performance/PersisterPerformanceTest.php | 16 +- .../ORM/Performance/ProxyPerformanceTest.php | 12 +- .../ORM/Performance/SecondLevelCacheTest.php | 6 +- .../Tests/ORM/PersistentCollectionTest.php | 4 +- ...tyPersisterCompositeTypeParametersTest.php | 17 +- ...sicEntityPersisterCompositeTypeSqlTest.php | 4 +- .../BasicEntityPersisterTypeValueSqlTest.php | 11 +- .../JoinedSubclassPersisterTest.php | 7 +- .../Tests/ORM/Proxy/ProxyFactoryTest.php | 19 +- .../ORM/Query/CustomTreeWalkersJoinTest.php | 10 +- .../Tests/ORM/Query/CustomTreeWalkersTest.php | 20 +- tests/Doctrine/Tests/ORM/Query/ExprTest.php | 4 +- .../Tests/ORM/Query/FilterCollectionTest.php | 13 +- .../ORM/Query/LanguageRecognitionTest.php | 5 +- .../Tests/ORM/Query/ParserResultTest.php | 6 +- tests/Doctrine/Tests/ORM/Query/ParserTest.php | 17 +- .../ORM/Query/QueryExpressionVisitorTest.php | 11 +- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 5 +- .../ORM/Query/SelectSqlGenerationTest.php | 30 +- .../ORM/Query/UpdateSqlGenerationTest.php | 5 +- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 187 +++++----- .../DefaultRepositoryFactoryTest.php | 33 +- .../AttachEntityListenersListenerTest.php | 36 +- .../ClearCacheCollectionRegionCommandTest.php | 13 +- .../ClearCacheEntityRegionCommandTest.php | 13 +- .../GenerateRepositoriesCommandTest.php | 12 +- .../Tools/Console/Command/InfoCommandTest.php | 20 +- .../Command/MappingDescribeCommandTest.php | 3 +- .../Console/Command/RunDqlCommandTest.php | 6 +- .../Tests/ORM/Tools/EntityGeneratorTest.php | 6 +- .../Tools/EntityRepositoryGeneratorTest.php | 32 +- .../AbstractClassMetadataExporterTest.php | 47 +-- .../Doctrine.Tests.ORM.Tools.Export.User.php | 11 +- .../Pagination/CountOutputWalkerTest.php | 9 +- .../ORM/Tools/Pagination/CountWalkerTest.php | 14 +- .../LimitSubqueryOutputWalkerTest.php | 51 +-- .../Pagination/LimitSubqueryWalkerTest.php | 13 +- .../Tools/Pagination/WhereInWalkerTest.php | 20 +- .../Tools/ResolveTargetEntityListenerTest.php | 56 +-- .../Tests/ORM/Tools/SchemaToolTest.php | 60 ++-- .../Tests/ORM/Tools/SchemaValidatorTest.php | 22 +- tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 20 +- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 42 ++- .../ORM/Utility/IdentifierFlattenerTest.php | 14 +- .../Doctrine/Tests/OrmFunctionalTestCase.php | 298 ++++++++-------- tests/Doctrine/Tests/OrmTestCase.php | 8 +- 372 files changed, 4583 insertions(+), 4529 deletions(-) diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php index c89686643..f5c0b9af7 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php @@ -172,7 +172,7 @@ class CmsAddress [ 'name' => 'find-by-id', 'query' => 'SELECT * FROM cms_addresses WHERE id = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', + 'resultClass' => CmsAddress::class, ] ); @@ -204,7 +204,7 @@ class CmsAddress 'column' => 'country', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', + 'entityClass' => CmsAddress::class, ], ], ] @@ -216,7 +216,7 @@ class CmsAddress 'columns' => [], 'entities' => [ [ - 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', + 'entityClass' => CmsAddress::class, 'fields' => [] ] ] diff --git a/tests/Doctrine/Tests/Models/CMS/CmsUser.php b/tests/Doctrine/Tests/Models/CMS/CmsUser.php index de23216f7..153033605 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsUser.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsUser.php @@ -281,7 +281,7 @@ class CmsUser [ 'name' => 'fetchIdAndUsernameWithResultClass', 'query' => 'SELECT id, username FROM cms_users WHERE username = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'resultClass' => CmsUser::class, ] ); @@ -289,7 +289,7 @@ class CmsUser [ 'name' => 'fetchAllColumns', 'query' => 'SELECT * FROM cms_users WHERE username = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'resultClass' => CmsUser::class, ] ); @@ -361,7 +361,7 @@ class CmsUser 'column' => 'a_id', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ], ], @@ -392,7 +392,7 @@ class CmsUser 'column' => 'number', ], ], - 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ], ], @@ -419,7 +419,7 @@ class CmsUser 'column' => 'status', ] ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ] ], @@ -450,7 +450,7 @@ class CmsUser 'column' => 'u_status', ] ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null, ], [ @@ -468,7 +468,7 @@ class CmsUser 'column' => 'a_country', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', + 'entityClass' => CmsAddress::class, 'discriminatorColumn' => null, ], ], diff --git a/tests/Doctrine/Tests/Models/Cache/Attraction.php b/tests/Doctrine/Tests/Models/Cache/Attraction.php index cbd62f841..31f3d3069 100644 --- a/tests/Doctrine/Tests/Models/Cache/Attraction.php +++ b/tests/Doctrine/Tests/Models/Cache/Attraction.php @@ -92,4 +92,4 @@ abstract class Attraction $this->infos->add($info); } } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php index 76ef305a4..4b4b37f3b 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php @@ -30,4 +30,4 @@ class AttractionContactInfo extends AttractionInfo { $this->fone = $fone; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php index 418ef49b0..d257a53f3 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php @@ -51,4 +51,4 @@ abstract class AttractionInfo $attraction->addInfo($this); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php index ebdb592ae..66f2633f5 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php @@ -30,4 +30,4 @@ class AttractionLocationInfo extends AttractionInfo { $this->address = $address; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/City.php b/tests/Doctrine/Tests/Models/Cache/City.php index f755e07ae..40369728d 100644 --- a/tests/Doctrine/Tests/Models/Cache/City.php +++ b/tests/Doctrine/Tests/Models/Cache/City.php @@ -106,4 +106,4 @@ class City { include __DIR__ . '/../../ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php'; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/Country.php b/tests/Doctrine/Tests/Models/Cache/Country.php index 33a9cf40c..11d094038 100644 --- a/tests/Doctrine/Tests/Models/Cache/Country.php +++ b/tests/Doctrine/Tests/Models/Cache/Country.php @@ -47,4 +47,4 @@ class Country { $this->name = $name; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/Flight.php b/tests/Doctrine/Tests/Models/Cache/Flight.php index a95caab24..ce2f3476f 100644 --- a/tests/Doctrine/Tests/Models/Cache/Flight.php +++ b/tests/Doctrine/Tests/Models/Cache/Flight.php @@ -62,4 +62,4 @@ class Flight { $this->departure = $departure; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/State.php b/tests/Doctrine/Tests/Models/Cache/State.php index 0d37e4d8f..e59ecb2b1 100644 --- a/tests/Doctrine/Tests/Models/Cache/State.php +++ b/tests/Doctrine/Tests/Models/Cache/State.php @@ -89,4 +89,4 @@ class State { $this->cities[] = $city; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/Travel.php b/tests/Doctrine/Tests/Models/Cache/Travel.php index 75e3275a4..b25744dd6 100644 --- a/tests/Doctrine/Tests/Models/Cache/Travel.php +++ b/tests/Doctrine/Tests/Models/Cache/Travel.php @@ -109,4 +109,4 @@ class Travel { return $this->createdAt; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php b/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php index d4bea2457..fbffa8b70 100644 --- a/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php +++ b/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php @@ -63,4 +63,4 @@ class TravelerProfile { $this->info = $info; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php b/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php index b7a23bea0..e78162849 100644 --- a/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php @@ -65,4 +65,4 @@ class TravelerProfileInfo { $this->profile = $profile; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php index 529c0e109..ca80c953d 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php @@ -130,7 +130,7 @@ class CompanyPerson [ 'name' => 'fetchAllWithResultClass', 'query' => 'SELECT id, name, discr FROM company_persons ORDER BY name', - 'resultClass' => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson', + 'resultClass' => CompanyPerson::class, ] ); @@ -158,7 +158,7 @@ class CompanyPerson 'column' => 'name', ], ], - 'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson', + 'entityClass' => CompanyPerson::class, 'discriminatorColumn' => 'discriminator', ], ], diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php index 2254b4243..cc0b92cfb 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php @@ -34,4 +34,4 @@ class DDC3597Image extends DDC3597Media { public function getDimension() { return $this->dimension; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php index 751f7dac1..da6f60cd0 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php @@ -73,4 +73,4 @@ abstract class DDC3597Media extends DDC3597Root { -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php index d7f86dfba..2f24c933a 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php @@ -77,4 +77,4 @@ abstract class DDC3597Root { public function getUpdatedAt() { return $this->updatedAt; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php index 320f73138..dc2222ef1 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php @@ -18,4 +18,4 @@ class DDC3699Child extends DDC3699Parent /** @OneToMany(targetEntity="DDC3699RelationMany", mappedBy="child") */ public $relations; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php index f689a82ea..992c53ae2 100644 --- a/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php +++ b/tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php @@ -36,7 +36,7 @@ class DDC869Payment ] ); $metadata->isMappedSuperclass = true; - $metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); + $metadata->setCustomRepositoryClass(DDC869PaymentRepository::class); $metadata->setIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadataInfo::GENERATOR_TYPE_AUTO); } diff --git a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php index 92ebe5e5d..c7035ff68 100644 --- a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php +++ b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php @@ -27,4 +27,4 @@ class DateTimeModel * @Column(name="col_time", type="time", nullable=true) */ public $time; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php index b4b02e158..1ff583058 100644 --- a/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php +++ b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php @@ -20,4 +20,4 @@ class CompositeToOneKeyState * @JoinColumn(referencedColumnName="country") */ public $country; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php index 0de086387..4c016df1f 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php @@ -6,6 +6,7 @@ use Doctrine\ORM\Cache\CacheConfiguration; use Doctrine\ORM\Cache\CacheFactory; use Doctrine\ORM\Cache\QueryCacheValidator; use Doctrine\ORM\Cache\Logging\CacheLogger; +use Doctrine\ORM\Cache\TimestampQueryCacheValidator; use Doctrine\ORM\Cache\TimestampRegion; use Doctrine\Tests\DoctrineTestCase; @@ -75,7 +76,7 @@ class CacheConfigTest extends DoctrineTestCase $validator = $this->createMock(QueryCacheValidator::class); - $this->assertInstanceOf('Doctrine\ORM\Cache\TimestampQueryCacheValidator', $this->config->getQueryValidator()); + $this->assertInstanceOf(TimestampQueryCacheValidator::class, $this->config->getQueryValidator()); $this->config->setQueryValidator($validator); diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php index 625b05867..a070237a2 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php @@ -48,7 +48,7 @@ class CacheLoggerChainTest extends DoctrineTestCase public function testEntityCacheChain() { $name = 'my_entity_region'; - $key = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); + $key = new EntityCacheKey(State::class, ['id' => 1]); $this->logger->setLogger('mock', $this->mock); @@ -72,7 +72,7 @@ class CacheLoggerChainTest extends DoctrineTestCase public function testCollectionCacheChain() { $name = 'my_collection_region'; - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id' => 1]); $this->logger->setLogger('mock', $this->mock); diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php index a948676d7..2047e05b3 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php @@ -4,14 +4,28 @@ namespace Doctrine\Tests\ORM\Cache; use Doctrine\Common\Cache\Cache; use Doctrine\Common\Cache\CacheProvider; -use \Doctrine\Tests\OrmTestCase; -use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Cache\CacheFactory; use Doctrine\ORM\Cache\DefaultCacheFactory; +use Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister; +use Doctrine\ORM\Cache\Persister\Collection\NonStrictReadWriteCachedCollectionPersister; +use Doctrine\ORM\Cache\Persister\Collection\ReadOnlyCachedCollectionPersister; +use Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister; +use Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister; +use Doctrine\ORM\Cache\Persister\Entity\NonStrictReadWriteCachedEntityPersister; +use Doctrine\ORM\Cache\Persister\Entity\ReadOnlyCachedEntityPersister; +use Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister; +use Doctrine\ORM\Cache\Region\DefaultMultiGetRegion; use Doctrine\ORM\Cache\Region\DefaultRegion; -use Doctrine\Tests\Mocks\ConcurrentRegionMock; -use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; -use Doctrine\ORM\Persisters\Collection\OneToManyPersister; use Doctrine\ORM\Cache\RegionsConfiguration; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Persisters\Collection\OneToManyPersister; +use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; +use Doctrine\Tests\Mocks\ConcurrentRegionMock; +use Doctrine\Tests\Models\Cache\AttractionContactInfo; +use Doctrine\Tests\Models\Cache\AttractionLocationInfo; +use Doctrine\Tests\Models\Cache\City; +use Doctrine\Tests\Models\Cache\State; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-2183 @@ -49,14 +63,13 @@ class DefaultCacheFactoryTest extends OrmTestCase public function testImplementsCacheFactory() { - $this->assertInstanceOf('Doctrine\ORM\Cache\CacheFactory', $this->factory); + $this->assertInstanceOf(CacheFactory::class, $this->factory); } public function testBuildCachedEntityPersisterReadOnly() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = clone $em->getClassMetadata($entityName); + $metadata = clone $em->getClassMetadata(State::class); $persister = new BasicEntityPersister($em, $metadata); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -69,15 +82,14 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedEntityPersister($em, $persister, $metadata); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\ReadOnlyCachedEntityPersister', $cachedPersister); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister); + $this->assertInstanceOf(ReadOnlyCachedEntityPersister::class, $cachedPersister); } public function testBuildCachedEntityPersisterReadWrite() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = clone $em->getClassMetadata($entityName); + $metadata = clone $em->getClassMetadata(State::class); $persister = new BasicEntityPersister($em, $metadata); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -90,15 +102,14 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedEntityPersister($em, $persister, $metadata); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', $cachedPersister); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister); + $this->assertInstanceOf(ReadWriteCachedEntityPersister::class, $cachedPersister); } public function testBuildCachedEntityPersisterNonStrictReadWrite() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = clone $em->getClassMetadata($entityName); + $metadata = clone $em->getClassMetadata(State::class); $persister = new BasicEntityPersister($em, $metadata); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -111,15 +122,14 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedEntityPersister($em, $persister, $metadata); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\NonStrictReadWriteCachedEntityPersister', $cachedPersister); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister); + $this->assertInstanceOf(NonStrictReadWriteCachedEntityPersister::class, $cachedPersister); } public function testBuildCachedCollectionPersisterReadOnly() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = $em->getClassMetadata($entityName); + $metadata = $em->getClassMetadata(State::class); $mapping = $metadata->associationMappings['cities']; $persister = new OneToManyPersister($em); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -134,15 +144,14 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedCollectionPersister($em, $persister, $mapping); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\ReadOnlyCachedCollectionPersister', $cachedPersister); + $this->assertInstanceOf(CachedCollectionPersister::class, $cachedPersister); + $this->assertInstanceOf(ReadOnlyCachedCollectionPersister::class, $cachedPersister); } public function testBuildCachedCollectionPersisterReadWrite() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = $em->getClassMetadata($entityName); + $metadata = $em->getClassMetadata(State::class); $mapping = $metadata->associationMappings['cities']; $persister = new OneToManyPersister($em); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -156,15 +165,14 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedCollectionPersister($em, $persister, $mapping); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', $cachedPersister); + $this->assertInstanceOf(CachedCollectionPersister::class, $cachedPersister); + $this->assertInstanceOf(ReadWriteCachedCollectionPersister::class, $cachedPersister); } public function testBuildCachedCollectionPersisterNonStrictReadWrite() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = $em->getClassMetadata($entityName); + $metadata = $em->getClassMetadata(State::class); $mapping = $metadata->associationMappings['cities']; $persister = new OneToManyPersister($em); $region = new ConcurrentRegionMock(new DefaultRegion('regionName', $this->getSharedSecondLevelCacheDriverImpl())); @@ -178,15 +186,15 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister = $this->factory->buildCachedCollectionPersister($em, $persister, $mapping); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister', $cachedPersister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\NonStrictReadWriteCachedCollectionPersister', $cachedPersister); + $this->assertInstanceOf(CachedCollectionPersister::class, $cachedPersister); + $this->assertInstanceOf(NonStrictReadWriteCachedCollectionPersister::class, $cachedPersister); } public function testInheritedEntityCacheRegion() { $em = $this->em; - $metadata1 = clone $em->getClassMetadata('Doctrine\Tests\Models\Cache\AttractionContactInfo'); - $metadata2 = clone $em->getClassMetadata('Doctrine\Tests\Models\Cache\AttractionLocationInfo'); + $metadata1 = clone $em->getClassMetadata(AttractionContactInfo::class); + $metadata2 = clone $em->getClassMetadata(AttractionLocationInfo::class); $persister1 = new BasicEntityPersister($em, $metadata1); $persister2 = new BasicEntityPersister($em, $metadata2); $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()); @@ -194,8 +202,8 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister1 = $factory->buildCachedEntityPersister($em, $persister1, $metadata1); $cachedPersister2 = $factory->buildCachedEntityPersister($em, $persister2, $metadata2); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister1); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister2); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister1); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister2); $this->assertNotSame($cachedPersister1, $cachedPersister2); $this->assertSame($cachedPersister1->getCacheRegion(), $cachedPersister2->getCacheRegion()); @@ -204,8 +212,8 @@ class DefaultCacheFactoryTest extends OrmTestCase public function testCreateNewCacheDriver() { $em = $this->em; - $metadata1 = clone $em->getClassMetadata('Doctrine\Tests\Models\Cache\State'); - $metadata2 = clone $em->getClassMetadata('Doctrine\Tests\Models\Cache\City'); + $metadata1 = clone $em->getClassMetadata(State::class); + $metadata2 = clone $em->getClassMetadata(City::class); $persister1 = new BasicEntityPersister($em, $metadata1); $persister2 = new BasicEntityPersister($em, $metadata2); $factory = new DefaultCacheFactory($this->regionsConfig, $this->getSharedSecondLevelCacheDriverImpl()); @@ -213,8 +221,8 @@ class DefaultCacheFactoryTest extends OrmTestCase $cachedPersister1 = $factory->buildCachedEntityPersister($em, $persister1, $metadata1); $cachedPersister2 = $factory->buildCachedEntityPersister($em, $persister2, $metadata2); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister1); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $cachedPersister2); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister1); + $this->assertInstanceOf(CachedEntityPersister::class, $cachedPersister2); $this->assertNotSame($cachedPersister1, $cachedPersister2); $this->assertNotSame($cachedPersister1->getCacheRegion(), $cachedPersister2->getCacheRegion()); @@ -227,8 +235,7 @@ class DefaultCacheFactoryTest extends OrmTestCase public function testBuildCachedEntityPersisterNonStrictException() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = clone $em->getClassMetadata($entityName); + $metadata = clone $em->getClassMetadata(State::class); $persister = new BasicEntityPersister($em, $metadata); $metadata->cache['usage'] = -1; @@ -243,8 +250,7 @@ class DefaultCacheFactoryTest extends OrmTestCase public function testBuildCachedCollectionPersisterException() { $em = $this->em; - $entityName = 'Doctrine\Tests\Models\Cache\State'; - $metadata = $em->getClassMetadata($entityName); + $metadata = $em->getClassMetadata(State::class); $mapping = $metadata->associationMappings['cities']; $persister = new OneToManyPersister($em); @@ -298,7 +304,7 @@ class DefaultCacheFactoryTest extends OrmTestCase $factory = new DefaultCacheFactory($this->regionsConfig, $cache); $this->assertInstanceOf( - 'Doctrine\ORM\Cache\Region\DefaultRegion', + DefaultRegion::class, $factory->getRegion( [ 'region' => 'bar', @@ -316,7 +322,7 @@ class DefaultCacheFactoryTest extends OrmTestCase $factory = new DefaultCacheFactory($this->regionsConfig, $cache); $this->assertInstanceOf( - 'Doctrine\ORM\Cache\Region\DefaultMultiGetRegion', + DefaultMultiGetRegion::class, $factory->getRegion( [ 'region' => 'bar', diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php index 866153fbb..cbc9d8e8b 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Cache; +use Doctrine\ORM\Cache; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; use Doctrine\ORM\Cache\DefaultCache; use Doctrine\Tests\Models\Cache\State; @@ -26,8 +28,6 @@ class DefaultCacheTest extends OrmTestCase */ private $em; - const NON_CACHEABLE_ENTITY = 'Doctrine\Tests\Models\CMS\CmsUser'; - protected function setUp() { parent::enableSecondLevelCache(); @@ -70,104 +70,104 @@ class DefaultCacheTest extends OrmTestCase public function testImplementsCache() { - $this->assertInstanceOf('Doctrine\ORM\Cache', $this->cache); + $this->assertInstanceOf(Cache::class, $this->cache); } public function testGetEntityCacheRegionAccess() { - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(State::CLASSNAME)); - $this->assertNull($this->cache->getEntityCacheRegion(self::NON_CACHEABLE_ENTITY)); + $this->assertInstanceOf(Cache\Region::class, $this->cache->getEntityCacheRegion(State::class)); + $this->assertNull($this->cache->getEntityCacheRegion(CmsUser::class)); } public function testGetCollectionCacheRegionAccess() { - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getCollectionCacheRegion(State::CLASSNAME, 'cities')); - $this->assertNull($this->cache->getCollectionCacheRegion(self::NON_CACHEABLE_ENTITY, 'phonenumbers')); + $this->assertInstanceOf(Cache\Region::class, $this->cache->getCollectionCacheRegion(State::class, 'cities')); + $this->assertNull($this->cache->getCollectionCacheRegion(CmsUser::class, 'phonenumbers')); } public function testContainsEntity() { $identifier = ['id'=>1]; - $className = Country::CLASSNAME; + $className = Country::class; $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertFalse($this->cache->containsEntity(Country::class, 1)); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, 1)); - $this->assertFalse($this->cache->containsEntity(self::NON_CACHEABLE_ENTITY, 1)); + $this->assertTrue($this->cache->containsEntity(Country::class, 1)); + $this->assertFalse($this->cache->containsEntity(CmsUser::class, 1)); } public function testEvictEntity() { $identifier = ['id'=>1]; - $className = Country::CLASSNAME; + $className = Country::class; $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertTrue($this->cache->containsEntity(Country::class, 1)); - $this->cache->evictEntity(Country::CLASSNAME, 1); - $this->cache->evictEntity(self::NON_CACHEABLE_ENTITY, 1); + $this->cache->evictEntity(Country::class, 1); + $this->cache->evictEntity(CmsUser::class, 1); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertFalse($this->cache->containsEntity(Country::class, 1)); } public function testEvictEntityRegion() { $identifier = ['id'=>1]; - $className = Country::CLASSNAME; + $className = Country::class; $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertTrue($this->cache->containsEntity(Country::class, 1)); - $this->cache->evictEntityRegion(Country::CLASSNAME); - $this->cache->evictEntityRegion(self::NON_CACHEABLE_ENTITY); + $this->cache->evictEntityRegion(Country::class); + $this->cache->evictEntityRegion(CmsUser::class); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertFalse($this->cache->containsEntity(Country::class, 1)); } public function testEvictEntityRegions() { $identifier = ['id'=>1]; - $className = Country::CLASSNAME; + $className = Country::class; $cacheEntry = array_merge($identifier, ['name' => 'Brazil']); $this->putEntityCacheEntry($className, $identifier, $cacheEntry); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertTrue($this->cache->containsEntity(Country::class, 1)); $this->cache->evictEntityRegions(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, 1)); + $this->assertFalse($this->cache->containsEntity(Country::class, 1)); } public function testContainsCollection() { $ownerId = ['id'=>1]; - $className = State::CLASSNAME; + $className = State::class; $association = 'cities'; $cacheEntry = [ ['id' => 11], ['id' => 12], ]; - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertFalse($this->cache->containsCollection(State::class, $association, 1)); $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, $association, 1)); - $this->assertFalse($this->cache->containsCollection(self::NON_CACHEABLE_ENTITY, 'phonenumbers', 1)); + $this->assertTrue($this->cache->containsCollection(State::class, $association, 1)); + $this->assertFalse($this->cache->containsCollection(CmsUser::class, 'phonenumbers', 1)); } public function testEvictCollection() { $ownerId = ['id'=>1]; - $className = State::CLASSNAME; + $className = State::class; $association = 'cities'; $cacheEntry = [ ['id' => 11], @@ -176,18 +176,18 @@ class DefaultCacheTest extends OrmTestCase $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertTrue($this->cache->containsCollection(State::class, $association, 1)); $this->cache->evictCollection($className, $association, $ownerId); - $this->cache->evictCollection(self::NON_CACHEABLE_ENTITY, 'phonenumbers', 1); + $this->cache->evictCollection(CmsUser::class, 'phonenumbers', 1); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertFalse($this->cache->containsCollection(State::class, $association, 1)); } public function testEvictCollectionRegion() { $ownerId = ['id'=>1]; - $className = State::CLASSNAME; + $className = State::class; $association = 'cities'; $cacheEntry = [ ['id' => 11], @@ -196,18 +196,18 @@ class DefaultCacheTest extends OrmTestCase $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertTrue($this->cache->containsCollection(State::class, $association, 1)); $this->cache->evictCollectionRegion($className, $association); - $this->cache->evictCollectionRegion(self::NON_CACHEABLE_ENTITY, 'phonenumbers'); + $this->cache->evictCollectionRegion(CmsUser::class, 'phonenumbers'); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertFalse($this->cache->containsCollection(State::class, $association, 1)); } public function testEvictCollectionRegions() { $ownerId = ['id'=>1]; - $className = State::CLASSNAME; + $className = State::class; $association = 'cities'; $cacheEntry = [ ['id' => 11], @@ -216,11 +216,11 @@ class DefaultCacheTest extends OrmTestCase $this->putCollectionCacheEntry($className, $association, $ownerId, $cacheEntry); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertTrue($this->cache->containsCollection(State::class, $association, 1)); $this->cache->evictCollectionRegions(); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, $association, 1)); + $this->assertFalse($this->cache->containsCollection(State::class, $association, 1)); } public function testQueryCache() @@ -230,8 +230,8 @@ class DefaultCacheTest extends OrmTestCase $defaultQueryCache = $this->cache->getQueryCache(); $fooQueryCache = $this->cache->getQueryCache('foo'); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCache', $defaultQueryCache); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCache', $fooQueryCache); + $this->assertInstanceOf(Cache\QueryCache::class, $defaultQueryCache); + $this->assertInstanceOf(Cache\QueryCache::class, $fooQueryCache); $this->assertSame($defaultQueryCache, $this->cache->getQueryCache()); $this->assertSame($fooQueryCache, $this->cache->getQueryCache('foo')); @@ -249,7 +249,7 @@ class DefaultCacheTest extends OrmTestCase { $identifier = 123; $entity = new Country('Foo'); - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); $method = new \ReflectionMethod($this->cache, 'toIdentifierArray'); $property = new \ReflectionProperty($entity, 'id'); diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php index e3c4d785b..f2a35b16a 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCollectionHydratorTest.php @@ -2,17 +2,17 @@ namespace Doctrine\Tests\ORM\Cache; -use Doctrine\ORM\UnitOfWork; -use Doctrine\ORM\PersistentCollection; -use Doctrine\Tests\Models\Cache\State; -use Doctrine\Tests\Models\Cache\City; -use Doctrine\Tests\OrmFunctionalTestCase; -use Doctrine\ORM\Cache\EntityCacheKey; -use Doctrine\ORM\Cache\EntityCacheEntry; -use Doctrine\ORM\Cache\CollectionCacheKey; -use Doctrine\ORM\Cache\CollectionCacheEntry; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Cache\CollectionCacheEntry; +use Doctrine\ORM\Cache\CollectionCacheKey; use Doctrine\ORM\Cache\DefaultCollectionHydrator; +use Doctrine\ORM\Cache\EntityCacheEntry; +use Doctrine\ORM\Cache\EntityCacheKey; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\UnitOfWork; +use Doctrine\Tests\Models\Cache\City; +use Doctrine\Tests\Models\Cache\State; +use Doctrine\Tests\OrmFunctionalTestCase; /** * @group DDC-2183 @@ -29,32 +29,32 @@ class DefaultCollectionHydratorTest extends OrmFunctionalTestCase $this->enableSecondLevelCache(); parent::setUp(); - $targetPersister = $this->_em->getUnitOfWork()->getEntityPersister(City::CLASSNAME); + $targetPersister = $this->_em->getUnitOfWork()->getEntityPersister(City::class); $this->structure = new DefaultCollectionHydrator($this->_em, $targetPersister); } public function testImplementsCollectionEntryStructure() { - $this->assertInstanceOf('Doctrine\ORM\Cache\DefaultCollectionHydrator', $this->structure); + $this->assertInstanceOf(DefaultCollectionHydrator::class, $this->structure); } public function testLoadCacheCollection() { - $targetRegion = $this->_em->getCache()->getEntityCacheRegion(City::CLASSNAME); + $targetRegion = $this->_em->getCache()->getEntityCacheRegion(City::class); $entry = new CollectionCacheEntry( [ - new EntityCacheKey(City::CLASSNAME, ['id'=>31]), - new EntityCacheKey(City::CLASSNAME, ['id'=>32]), + new EntityCacheKey(City::class, ['id'=>31]), + new EntityCacheKey(City::class, ['id'=>32]), ] ); - $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>31]), new EntityCacheEntry(City::CLASSNAME, ['id'=>31, 'name'=>'Foo'] + $targetRegion->put(new EntityCacheKey(City::class, ['id'=>31]), new EntityCacheEntry(City::class, ['id'=>31, 'name'=>'Foo'] )); - $targetRegion->put(new EntityCacheKey(City::CLASSNAME, ['id'=>32]), new EntityCacheEntry(City::CLASSNAME, ['id'=>32, 'name'=>'Bar'] + $targetRegion->put(new EntityCacheKey(City::class, ['id'=>32]), new EntityCacheEntry(City::class, ['id'=>32, 'name'=>'Bar'] )); - $sourceClass = $this->_em->getClassMetadata(State::CLASSNAME); - $targetClass = $this->_em->getClassMetadata(City::CLASSNAME); + $sourceClass = $this->_em->getClassMetadata(State::class); + $targetClass = $this->_em->getClassMetadata(City::class); $key = new CollectionCacheKey($sourceClass->name, 'cities', ['id'=>21]); $collection = new PersistentCollection($this->_em, $targetClass, new ArrayCollection()); $list = $this->structure->loadCacheEntry($sourceClass, $key, $entry, $collection); diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php index e7fdb617b..d58ab8a05 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php @@ -2,15 +2,15 @@ namespace Doctrine\Tests\ORM\Cache; -use Doctrine\Tests\OrmTestCase; -use Doctrine\Tests\Models\Cache\State; -use Doctrine\Tests\Models\Cache\Country; - -use Doctrine\ORM\UnitOfWork; -use Doctrine\ORM\Cache\EntityCacheKey; -use Doctrine\ORM\Cache\EntityCacheEntry; -use Doctrine\ORM\Cache\DefaultEntityHydrator; use Doctrine\ORM\Cache\AssociationCacheEntry; +use Doctrine\ORM\Cache\CacheEntry; +use Doctrine\ORM\Cache\DefaultEntityHydrator; +use Doctrine\ORM\Cache\EntityCacheEntry; +use Doctrine\ORM\Cache\EntityCacheKey; +use Doctrine\ORM\UnitOfWork; +use Doctrine\Tests\Models\Cache\Country; +use Doctrine\Tests\Models\Cache\State; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-2183 @@ -42,7 +42,7 @@ class DefaultEntityHydratorTest extends OrmTestCase public function testCreateEntity() { - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); $key = new EntityCacheKey($metadata->name, ['id'=>1]); $entry = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']); $entity = $this->structure->loadCacheEntry($metadata, $key, $entry); @@ -56,7 +56,7 @@ class DefaultEntityHydratorTest extends OrmTestCase public function testLoadProxy() { - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); $key = new EntityCacheKey($metadata->name, ['id'=>1]); $entry = new EntityCacheEntry($metadata->name, ['id'=>1, 'name'=>'Foo']); $proxy = $this->em->getReference($metadata->name, $key->identifier); @@ -75,7 +75,7 @@ class DefaultEntityHydratorTest extends OrmTestCase $entity = new Country('Foo'); $uow = $this->em->getUnitOfWork(); $data = ['id'=>1, 'name'=>'Foo']; - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); $key = new EntityCacheKey($metadata->name, ['id'=>1]); $entity->setId(1); @@ -83,8 +83,8 @@ class DefaultEntityHydratorTest extends OrmTestCase $cache = $this->structure->buildCacheEntry($metadata, $key, $entity); - $this->assertInstanceOf('Doctrine\ORM\Cache\CacheEntry', $cache); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $cache); + $this->assertInstanceOf(CacheEntry::class, $cache); + $this->assertInstanceOf(EntityCacheEntry::class, $cache); $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); @@ -102,7 +102,7 @@ class DefaultEntityHydratorTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $countryData = ['id'=>11, 'name'=>'Foo']; $stateData = ['id'=>12, 'name'=>'Bar', 'country' => $country]; - $metadata = $this->em->getClassMetadata(State::CLASSNAME); + $metadata = $this->em->getClassMetadata(State::class); $key = new EntityCacheKey($metadata->name, ['id'=>11]); $country->setId(11); @@ -113,8 +113,8 @@ class DefaultEntityHydratorTest extends OrmTestCase $cache = $this->structure->buildCacheEntry($metadata, $key, $state); - $this->assertInstanceOf('Doctrine\ORM\Cache\CacheEntry', $cache); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $cache); + $this->assertInstanceOf(CacheEntry::class, $cache); + $this->assertInstanceOf(EntityCacheEntry::class, $cache); $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); @@ -123,17 +123,17 @@ class DefaultEntityHydratorTest extends OrmTestCase [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + 'country' => new AssociationCacheEntry(Country::class, ['id' => 11]), ], $cache->data); } public function testBuildCacheEntryNonInitializedAssocProxy() { - $proxy = $this->em->getReference(Country::CLASSNAME, 11); + $proxy = $this->em->getReference(Country::class, 11); $entity = new State('Bat', $proxy); $uow = $this->em->getUnitOfWork(); $entityData = ['id'=>12, 'name'=>'Bar', 'country' => $proxy]; - $metadata = $this->em->getClassMetadata(State::CLASSNAME); + $metadata = $this->em->getClassMetadata(State::class); $key = new EntityCacheKey($metadata->name, ['id'=>11]); $entity->setId(12); @@ -142,8 +142,8 @@ class DefaultEntityHydratorTest extends OrmTestCase $cache = $this->structure->buildCacheEntry($metadata, $key, $entity); - $this->assertInstanceOf('Doctrine\ORM\Cache\CacheEntry', $cache); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $cache); + $this->assertInstanceOf(CacheEntry::class, $cache); + $this->assertInstanceOf(EntityCacheEntry::class, $cache); $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); @@ -152,17 +152,17 @@ class DefaultEntityHydratorTest extends OrmTestCase [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + 'country' => new AssociationCacheEntry(Country::class, ['id' => 11]), ], $cache->data); } public function testCacheEntryWithWrongIdentifierType() { - $proxy = $this->em->getReference(Country::CLASSNAME, 11); + $proxy = $this->em->getReference(Country::class, 11); $entity = new State('Bat', $proxy); $uow = $this->em->getUnitOfWork(); $entityData = ['id'=> 12, 'name'=>'Bar', 'country' => $proxy]; - $metadata = $this->em->getClassMetadata(State::CLASSNAME); + $metadata = $this->em->getClassMetadata(State::class); $key = new EntityCacheKey($metadata->name, ['id'=>'12']); $entity->setId(12); @@ -171,8 +171,8 @@ class DefaultEntityHydratorTest extends OrmTestCase $cache = $this->structure->buildCacheEntry($metadata, $key, $entity); - $this->assertInstanceOf('Doctrine\ORM\Cache\CacheEntry', $cache); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $cache); + $this->assertInstanceOf(CacheEntry::class, $cache); + $this->assertInstanceOf(EntityCacheEntry::class, $cache); $this->assertArrayHasKey('id', $cache->data); $this->assertArrayHasKey('name', $cache->data); @@ -182,7 +182,7 @@ class DefaultEntityHydratorTest extends OrmTestCase [ 'id' => 12, 'name' => 'Bar', - 'country' => new AssociationCacheEntry(Country::CLASSNAME, ['id' => 11]), + 'country' => new AssociationCacheEntry(Country::class, ['id' => 11]), ], $cache->data); } diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php index f9b11bee8..cfd914209 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php @@ -2,6 +2,9 @@ namespace Doctrine\Tests\ORM\Cache; +use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Cache\EntityCacheKey; +use Doctrine\ORM\Cache\QueryCache; use Doctrine\Tests\Mocks\TimestampRegionMock; use Doctrine\Tests\OrmTestCase; use Doctrine\Tests\Mocks\CacheRegionMock; @@ -61,7 +64,7 @@ class DefaultQueryCacheTest extends OrmTestCase public function testImplementQueryCache() { - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCache', $this->queryCache); + $this->assertInstanceOf(QueryCache::class, $this->queryCache); } public function testGetRegion() @@ -82,9 +85,9 @@ class DefaultQueryCacheTest extends OrmTestCase $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); for ($i = 0; $i < 4; $i++) { $name = "Country $i"; @@ -99,17 +102,17 @@ class DefaultQueryCacheTest extends OrmTestCase $this->assertArrayHasKey('put', $this->region->calls); $this->assertCount(5, $this->region->calls['put']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][0]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][1]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][2]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][3]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheKey', $this->region->calls['put'][4]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][0]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][1]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][2]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][3]['key']); + $this->assertInstanceOf(QueryCacheKey::class, $this->region->calls['put'][4]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $this->region->calls['put'][0]['entry']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $this->region->calls['put'][1]['entry']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $this->region->calls['put'][2]['entry']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $this->region->calls['put'][3]['entry']); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheEntry', $this->region->calls['put'][4]['entry']); + $this->assertInstanceOf(EntityCacheEntry::class, $this->region->calls['put'][0]['entry']); + $this->assertInstanceOf(EntityCacheEntry::class, $this->region->calls['put'][1]['entry']); + $this->assertInstanceOf(EntityCacheEntry::class, $this->region->calls['put'][2]['entry']); + $this->assertInstanceOf(EntityCacheEntry::class, $this->region->calls['put'][3]['entry']); + $this->assertInstanceOf(QueryCacheEntry::class, $this->region->calls['put'][4]['entry']); } public function testPutToOneAssociationQueryResult() @@ -118,11 +121,11 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); - $stateClass = $this->em->getClassMetadata(State::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); + $stateClass = $this->em->getClassMetadata(State::class); - $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + $rsm->addRootEntityFromClassMetadata(City::class, 'c'); + $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] ); for ($i = 0; $i < 4; $i++) { @@ -141,15 +144,15 @@ class DefaultQueryCacheTest extends OrmTestCase $this->assertArrayHasKey('put', $this->region->calls); $this->assertCount(9, $this->region->calls['put']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][0]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][1]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][2]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][3]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][4]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][5]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][6]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][7]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheKey', $this->region->calls['put'][8]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][0]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][1]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][2]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][3]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][4]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][5]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][6]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][7]['key']); + $this->assertInstanceOf(QueryCacheKey::class, $this->region->calls['put'][8]['key']); } public function testPutToOneAssociation2LevelsQueryResult() @@ -158,14 +161,14 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); - $stateClass = $this->em->getClassMetadata(State::CLASSNAME); - $countryClass = $this->em->getClassMetadata(Country::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); + $stateClass = $this->em->getClassMetadata(State::class); + $countryClass = $this->em->getClassMetadata(Country::class); - $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + $rsm->addRootEntityFromClassMetadata(City::class, 'c'); + $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] ); - $rsm->addJoinedEntityFromClassMetadata(Country::CLASSNAME, 'co', 's', 'country', ['id'=>'country_id', 'name'=>'country_name'] + $rsm->addJoinedEntityFromClassMetadata(Country::class, 'co', 's', 'country', ['id'=>'country_id', 'name'=>'country_name'] ); for ($i = 0; $i < 4; $i++) { @@ -189,19 +192,19 @@ class DefaultQueryCacheTest extends OrmTestCase $this->assertArrayHasKey('put', $this->region->calls); $this->assertCount(13, $this->region->calls['put']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][0]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][1]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][2]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][3]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][4]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][5]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][6]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][7]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][8]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][9]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][10]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][11]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheKey', $this->region->calls['put'][12]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][0]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][1]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][2]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][3]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][4]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][5]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][6]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][7]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][8]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][9]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][10]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][11]['key']); + $this->assertInstanceOf(QueryCacheKey::class, $this->region->calls['put'][12]['key']); } public function testPutToOneAssociationNullQueryResult() @@ -210,10 +213,10 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); - $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + $rsm->addRootEntityFromClassMetadata(City::class, 'c'); + $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] ); for ($i = 0; $i < 4; $i++) { @@ -229,11 +232,11 @@ class DefaultQueryCacheTest extends OrmTestCase $this->assertArrayHasKey('put', $this->region->calls); $this->assertCount(5, $this->region->calls['put']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][0]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][1]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][2]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheKey', $this->region->calls['put'][3]['key']); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheKey', $this->region->calls['put'][4]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][0]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][1]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][2]['key']); + $this->assertInstanceOf(EntityCacheKey::class, $this->region->calls['put'][3]['key']); + $this->assertInstanceOf(QueryCacheKey::class, $this->region->calls['put'][4]['key']); } public function testPutToManyAssociationQueryResult() @@ -242,11 +245,11 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); - $stateClass = $this->em->getClassMetadata(State::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); + $stateClass = $this->em->getClassMetadata(State::class); - $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); + $rsm->addRootEntityFromClassMetadata(State::class, 's'); + $rsm->addJoinedEntityFromClassMetadata(City::class, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); for ($i = 0; $i < 4; $i++) { $state = new State("State $i"); @@ -291,16 +294,16 @@ class DefaultQueryCacheTest extends OrmTestCase ]; $this->region->addReturn('get', $entry); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0])); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $data[0])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $data[1])); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); $result = $this->queryCache->get($key, $rsm); $this->assertCount(2, $result); - $this->assertInstanceOf(Country::CLASSNAME, $result[0]); - $this->assertInstanceOf(Country::CLASSNAME, $result[1]); + $this->assertInstanceOf(Country::class, $result[0]); + $this->assertInstanceOf(Country::class, $result[1]); $this->assertEquals(1, $result[0]->getId()); $this->assertEquals(2, $result[1]->getId()); $this->assertEquals('Foo', $result[0]->getName()); @@ -312,9 +315,9 @@ class DefaultQueryCacheTest extends OrmTestCase $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); for ($i = 0; $i < 4; $i++) { $name = "Country $i"; @@ -338,11 +341,11 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); - $stateClass = $this->em->getClassMetadata(State::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); + $stateClass = $this->em->getClassMetadata(State::class); - $rsm->addRootEntityFromClassMetadata(City::CLASSNAME, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::CLASSNAME, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] + $rsm->addRootEntityFromClassMetadata(City::class, 'c'); + $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] ); $state = new State("State 1"); @@ -367,11 +370,11 @@ class DefaultQueryCacheTest extends OrmTestCase $uow = $this->em->getUnitOfWork(); $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $cityClass = $this->em->getClassMetadata(City::CLASSNAME); - $stateClass = $this->em->getClassMetadata(State::CLASSNAME); + $cityClass = $this->em->getClassMetadata(City::class); + $stateClass = $this->em->getClassMetadata(State::class); - $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); + $rsm->addRootEntityFromClassMetadata(State::class, 's'); + $rsm->addJoinedEntityFromClassMetadata(City::class, 'c', 's', 'cities', ['id'=>'c_id', 'name'=>'c_name']); $state = new State("State"); $city1 = new City("City 1", $state); @@ -409,7 +412,7 @@ class DefaultQueryCacheTest extends OrmTestCase ] ); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); $this->region->addReturn('get', $entry); @@ -420,10 +423,10 @@ class DefaultQueryCacheTest extends OrmTestCase { $result = []; $rsm = new ResultSetMappingBuilder($this->em); - $metadata = $this->em->getClassMetadata(Country::CLASSNAME); + $metadata = $this->em->getClassMetadata(Country::class); $key = new QueryCacheKey('query.key1', 0, Cache::MODE_GET); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); for ($i = 0; $i < 4; $i++) { $name = "Country $i"; @@ -455,10 +458,10 @@ class DefaultQueryCacheTest extends OrmTestCase $entry->time = microtime(true) - 100; $this->region->addReturn('get', $entry); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $entities[0])); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $entities[1])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $entities[0])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $entities[1])); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); $this->assertNull($this->queryCache->get($key, $rsm)); } @@ -480,10 +483,10 @@ class DefaultQueryCacheTest extends OrmTestCase ]; $this->region->addReturn('get', $entry); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[0])); - $this->region->addReturn('get', new EntityCacheEntry(Country::CLASSNAME, $data[1])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $data[0])); + $this->region->addReturn('get', new EntityCacheEntry(Country::class, $data[1])); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); $this->assertNull($this->queryCache->get($key, $rsm)); } @@ -502,7 +505,7 @@ class DefaultQueryCacheTest extends OrmTestCase $this->region->addReturn('get', $entry); $this->region->addReturn('get', null); - $rsm->addRootEntityFromClassMetadata(Country::CLASSNAME, 'c'); + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); $this->assertNull($this->queryCache->get($key, $rsm)); } @@ -527,13 +530,13 @@ class DefaultQueryCacheTest extends OrmTestCase $munich->addAttraction(new Restaurant('Schneider Weisse', $munich)); $wurzburg->addAttraction(new Restaurant('Fischers Fritz', $wurzburg)); - $rsm->addRootEntityFromClassMetadata(State::CLASSNAME, 's'); - $rsm->addJoinedEntityFromClassMetadata(City::CLASSNAME, 'c', 's', 'cities', [ + $rsm->addRootEntityFromClassMetadata(State::class, 's'); + $rsm->addJoinedEntityFromClassMetadata(City::class, 'c', 's', 'cities', [ 'id' => 'c_id', 'name' => 'c_name' ] ); - $rsm->addJoinedEntityFromClassMetadata(Restaurant::CLASSNAME, 'a', 'c', 'attractions', [ + $rsm->addJoinedEntityFromClassMetadata(Restaurant::class, 'a', 'c', 'attractions', [ 'id' => 'a_id', 'name' => 'a_name' ] @@ -545,9 +548,9 @@ class DefaultQueryCacheTest extends OrmTestCase $this->assertCount(2, $cities); $this->assertCount(2, $attractions); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $cities); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $attractions[0]); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $attractions[1]); + $this->assertInstanceOf(Collection::class, $cities); + $this->assertInstanceOf(Collection::class, $attractions[0]); + $this->assertInstanceOf(Collection::class, $attractions[1]); $this->assertCount(2, $attractions[0]); $this->assertCount(1, $attractions[1]); @@ -578,8 +581,8 @@ class DefaultQueryCacheTest extends OrmTestCase $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $rsm->addEntityResult('Doctrine\Tests\Models\Cache\City', 'e1'); - $rsm->addEntityResult('Doctrine\Tests\Models\Cache\State', 'e2'); + $rsm->addEntityResult(City::class, 'e1'); + $rsm->addEntityResult(State::class, 'e2'); $this->queryCache->put($key, $rsm, $result); } @@ -593,9 +596,7 @@ class DefaultQueryCacheTest extends OrmTestCase $result = []; $key = new QueryCacheKey('query.key1', 0); $rsm = new ResultSetMappingBuilder($this->em); - $className = 'Doctrine\Tests\Models\Generic\BooleanModel'; - - $rsm->addRootEntityFromClassMetadata($className, 'c'); + $rsm->addRootEntityFromClassMetadata(BooleanModel::class, 'c'); for ($i = 0; $i < 4; $i++) { $entity = new BooleanModel(); diff --git a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php index 5bb771ce7..1162f3c6a 100644 --- a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php @@ -2,15 +2,15 @@ namespace Doctrine\Tests\ORM\Cache; +use Doctrine\ORM\Cache\CacheKey; +use Doctrine\ORM\Cache\ConcurrentRegion; +use Doctrine\ORM\Cache\Lock; use Doctrine\ORM\Cache\Region\DefaultRegion; use Doctrine\ORM\Cache\Region\FileLockRegion; -use Doctrine\ORM\Cache\ConcurrentRegion; use Doctrine\Tests\Mocks\CacheEntryMock; use Doctrine\Tests\Mocks\CacheKeyMock; -use Doctrine\ORM\Cache\CacheKey; - -use RecursiveIteratorIterator; use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; /** * @group DDC-2183 @@ -77,7 +77,7 @@ class FileLockRegionTest extends AbstractRegionTest $lock = $this->region->lock($key); $this->assertFileExists($file); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock); + $this->assertInstanceOf(Lock::class, $lock); $this->assertEquals($lock->value, file_get_contents($file)); // should be not available after lock @@ -121,7 +121,7 @@ class FileLockRegionTest extends AbstractRegionTest $this->assertTrue($this->region->put($key, $entry)); $this->assertTrue($this->region->contains($key)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock = $this->region->lock($key)); + $this->assertInstanceOf(Lock::class, $lock = $this->region->lock($key)); $this->assertEquals($lock->value, file_get_contents($file)); $this->assertFileExists($file); @@ -173,7 +173,7 @@ class FileLockRegionTest extends AbstractRegionTest $this->assertTrue($this->region->put($key, $entry)); $this->assertTrue($this->region->contains($key)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock = $this->region->lock($key)); + $this->assertInstanceOf(Lock::class, $lock = $this->region->lock($key)); $this->assertEquals($lock->value, file_get_contents($file)); $this->assertFileExists($file); @@ -201,8 +201,8 @@ class FileLockRegionTest extends AbstractRegionTest $this->assertTrue($this->region->put($key2, $entry2)); $this->assertTrue($this->region->contains($key2)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock1 = $this->region->lock($key1)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock2 = $this->region->lock($key2)); + $this->assertInstanceOf(Lock::class, $lock1 = $this->region->lock($key1)); + $this->assertInstanceOf(Lock::class, $lock2 = $this->region->lock($key2)); $this->assertEquals($lock2->value, file_get_contents($file2)); $this->assertEquals($lock1->value, file_get_contents($file1)); @@ -233,7 +233,7 @@ class FileLockRegionTest extends AbstractRegionTest $this->assertTrue($this->region->put($key, $entry)); $this->assertTrue($this->region->contains($key)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Lock', $lock = $this->region->lock($key)); + $this->assertInstanceOf(Lock::class, $lock = $this->region->lock($key)); $this->assertEquals($lock->value, file_get_contents($file)); $this->assertFileExists($file); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php index 681b43f0b..c950cea70 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/AbstractCollectionPersisterTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Cache\Persister\Collection; +use Doctrine\ORM\Cache\Persister\CachedPersister; +use Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister; use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\OrmTestCase; @@ -101,7 +103,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase protected function createCollection($owner, $assoc = null, $class = null, $elements = null) { $em = $this->em; - $class = $class ?: $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\State'); + $class = $class ?: $this->em->getClassMetadata(State::class); $assoc = $assoc ?: $class->associationMappings['cities']; $coll = new PersistentCollection($em, $class, $elements ?: new ArrayCollection); @@ -113,7 +115,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase protected function createPersisterDefault() { - $assoc = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\State')->associationMappings['cities']; + $assoc = $this->em->getClassMetadata(State::class)->associationMappings['cities']; return $this->createPersister($this->em, $this->collectionPersister, $this->region, $assoc); } @@ -122,9 +124,9 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase { $persister = $this->createPersisterDefault(); - $this->assertInstanceOf('Doctrine\ORM\Persisters\Collection\CollectionPersister', $persister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\CachedPersister', $persister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Collection\CachedCollectionPersister', $persister); + $this->assertInstanceOf(CollectionPersister::class, $persister); + $this->assertInstanceOf(CachedPersister::class, $persister); + $this->assertInstanceOf(CachedCollectionPersister::class, $persister); } public function testInvokeDelete() diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php index 1c1e12b6d..6b7be1f75 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php @@ -52,7 +52,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -70,7 +70,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -88,7 +88,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -112,7 +112,7 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -135,8 +135,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -166,8 +166,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -197,8 +197,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -228,8 +228,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -258,8 +258,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $entity = new State("Foo"); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -283,8 +283,8 @@ class ReadWriteCachedCollectionPersisterTest extends AbstractCollectionPersister $entity = new State("Foo"); $persister = $this->createPersisterDefault(); $collection = $this->createCollection($entity); - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister', 'queuedCache'); + $key = new CollectionCacheKey(State::class, 'cities', ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache'); $property->setAccessible(true); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php index 7e4d83663..09c7221f5 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/AbstractEntityPersisterTest.php @@ -2,18 +2,18 @@ namespace Doctrine\Tests\ORM\Cache\Persister\Entity; -use Doctrine\Tests\OrmTestCase; - +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\Cache\Persister\CachedPersister; +use Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister; use Doctrine\ORM\Cache\Region; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\ORM\Persisters\Entity\EntityPersister; - -use Doctrine\Tests\Models\Cache\Country; -use Doctrine\Common\Collections\Criteria; -use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ORM\Query\ResultSetMappingBuilder; use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Persisters\Entity\EntityPersister; +use Doctrine\ORM\Query\ResultSetMappingBuilder; +use Doctrine\Tests\Models\Cache\Country; +use Doctrine\Tests\OrmTestCase; /** * @group DDC-2183 @@ -119,16 +119,16 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase */ protected function createPersisterDefault() { - return $this->createPersister($this->em, $this->entityPersister, $this->region, $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country')); + return $this->createPersister($this->em, $this->entityPersister, $this->region, $this->em->getClassMetadata(Country::class)); } public function testImplementsEntityPersister() { $persister = $this->createPersisterDefault(); - $this->assertInstanceOf('Doctrine\ORM\Persisters\Entity\EntityPersister', $persister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\CachedPersister', $persister); - $this->assertInstanceOf('Doctrine\ORM\Cache\Persister\Entity\CachedEntityPersister', $persister); + $this->assertInstanceOf(EntityPersister::class, $persister); + $this->assertInstanceOf(CachedPersister::class, $persister); + $this->assertInstanceOf(CachedEntityPersister::class, $persister); } public function testInvokeAddInsert() @@ -293,7 +293,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $persister = $this->createPersisterDefault(); $entity = new Country("Foo"); - $rsm->addEntityResult(Country::CLASSNAME, 'c'); + $rsm->addEntityResult(Country::class, 'c'); $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); @@ -356,7 +356,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $criteria = new Criteria(); $this->em->getUnitOfWork()->registerManaged($entity, ['id'=>1], ['id'=>1, 'name'=>'Foo']); - $rsm->addEntityResult(Country::CLASSNAME, 'c'); + $rsm->addEntityResult(Country::class, 'c'); $this->entityPersister->expects($this->once()) ->method('getResultSetMapping') @@ -398,7 +398,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase public function testInvokeLoadManyToManyCollection() { - $mapping = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country'); + $mapping = $this->em->getClassMetadata(Country::class); $assoc = ['type' => 1]; $coll = new PersistentCollection($this->em, $mapping, new ArrayCollection()); $persister = $this->createPersisterDefault(); @@ -414,7 +414,7 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase public function testInvokeLoadOneToManyCollection() { - $mapping = $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\Country'); + $mapping = $this->em->getClassMetadata(Country::class); $assoc = ['type' => 1]; $coll = new PersistentCollection($this->em, $mapping, new ArrayCollection()); $persister = $this->createPersisterDefault(); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php index ad05020e6..0f1e67b0f 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersisterTest.php @@ -48,8 +48,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $entry = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $entry = new EntityCacheEntry(Country::class, ['id'=>1, 'name'=>'Foo']); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); @@ -85,8 +85,8 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $entry = new EntityCacheEntry(Country::CLASSNAME, ['id'=>1, 'name'=>'Foo']); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $entry = new EntityCacheEntry(Country::class, ['id'=>1, 'name'=>'Foo']); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); @@ -114,7 +114,7 @@ class NonStrictReadWriteCachedEntityPersisterTest extends AbstractEntityPersiste { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $key = new EntityCacheKey(Country::class, ['id'=>1]); $property = new \ReflectionProperty($persister, 'queuedCache'); $property->setAccessible(true); diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php index d90fd678b..06748282c 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php @@ -52,7 +52,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $key = new EntityCacheKey(Country::class, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -69,7 +69,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $key = new EntityCacheKey(Country::class, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -86,7 +86,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $key = new EntityCacheKey(Country::class, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -109,7 +109,7 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); + $key = new EntityCacheKey(Country::class, ['id'=>1]); $this->region->expects($this->once()) ->method('lock') @@ -131,8 +131,8 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedEntityPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -162,8 +162,8 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest $entity = new Country("Foo"); $lock = Lock::createLockRead(); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedEntityPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -192,8 +192,8 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedEntityPersister::class, 'queuedCache'); $property->setAccessible(true); @@ -216,8 +216,8 @@ class ReadWriteCachedEntityPersisterTest extends AbstractEntityPersisterTest { $entity = new Country("Foo"); $persister = $this->createPersisterDefault(); - $key = new EntityCacheKey(Country::CLASSNAME, ['id'=>1]); - $property = new \ReflectionProperty('Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister', 'queuedCache'); + $key = new EntityCacheKey(Country::class, ['id'=>1]); + $property = new \ReflectionProperty(ReadWriteCachedEntityPersister::class, 'queuedCache'); $property->setAccessible(true); diff --git a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php index 0d5a72237..e9f04f350 100644 --- a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php @@ -29,7 +29,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase public function testEntityCache() { $name = 'my_entity_region'; - $key = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); + $key = new EntityCacheKey(State::class, ['id' => 1]); $this->logger->entityCacheHit($name, $key); $this->logger->entityCachePut($name, $key); @@ -46,7 +46,7 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase public function testCollectionCache() { $name = 'my_collection_region'; - $key = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); + $key = new CollectionCacheKey(State::class, 'cities', ['id' => 1]); $this->logger->collectionCacheHit($name, $key); $this->logger->collectionCachePut($name, $key); @@ -83,8 +83,8 @@ class StatisticsCacheLoggerTest extends DoctrineTestCase $entityRegion = 'my_entity_region'; $queryRegion = 'my_query_region'; - $coolKey = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id' => 1]); - $entityKey = new EntityCacheKey(State::CLASSNAME, ['id' => 1]); + $coolKey = new CollectionCacheKey(State::class, 'cities', ['id' => 1]); + $entityKey = new EntityCacheKey(State::class, ['id' => 1]); $queryKey = new QueryCacheKey('my_query_hash'); $this->logger->queryCacheHit($queryRegion, $queryKey); diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php index dba00d524..8c9ec26c4 100644 --- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php +++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php @@ -24,11 +24,11 @@ class CommitOrderCalculatorTest extends OrmTestCase public function testCommitOrdering1() { - $class1 = new ClassMetadata(__NAMESPACE__ . '\NodeClass1'); - $class2 = new ClassMetadata(__NAMESPACE__ . '\NodeClass2'); - $class3 = new ClassMetadata(__NAMESPACE__ . '\NodeClass3'); - $class4 = new ClassMetadata(__NAMESPACE__ . '\NodeClass4'); - $class5 = new ClassMetadata(__NAMESPACE__ . '\NodeClass5'); + $class1 = new ClassMetadata(NodeClass1::class); + $class2 = new ClassMetadata(NodeClass2::class); + $class3 = new ClassMetadata(NodeClass3::class); + $class4 = new ClassMetadata(NodeClass4::class); + $class5 = new ClassMetadata(NodeClass5::class); $this->_calc->addNode($class1->name, $class1); $this->_calc->addNode($class2->name, $class2); @@ -51,8 +51,8 @@ class CommitOrderCalculatorTest extends OrmTestCase public function testCommitOrdering2() { - $class1 = new ClassMetadata(__NAMESPACE__ . '\NodeClass1'); - $class2 = new ClassMetadata(__NAMESPACE__ . '\NodeClass2'); + $class1 = new ClassMetadata(NodeClass1::class); + $class2 = new ClassMetadata(NodeClass2::class); $this->_calc->addNode($class1->name, $class1); $this->_calc->addNode($class2->name, $class2); diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index 4988ac9b2..1b0042064 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -7,6 +7,7 @@ use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; use Doctrine\Common\Proxy\AbstractProxyFactory; use Doctrine\Common\Cache\ArrayCache; use Doctrine\ORM\Cache\CacheConfiguration; +use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Mapping as AnnotationNamespace; use Doctrine\ORM\Configuration; use Doctrine\ORM\Mapping\EntityListenerResolver; @@ -14,6 +15,7 @@ use Doctrine\ORM\Mapping\NamingStrategy; use Doctrine\ORM\Mapping\QuoteStrategy; use Doctrine\ORM\ORMException; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Models\DDC753\DDC753CustomRepository; use ReflectionClass; use PHPUnit_Framework_TestCase; @@ -76,23 +78,23 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase public function testNewDefaultAnnotationDriver() { $paths = [__DIR__]; - $reflectionClass = new ReflectionClass(__NAMESPACE__ . '\ConfigurationTestAnnotationReaderChecker'); + $reflectionClass = new ReflectionClass(ConfigurationTestAnnotationReaderChecker::class); $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths, false); $reader = $annotationDriver->getReader(); $annotation = $reader->getMethodAnnotation( $reflectionClass->getMethod('namespacedAnnotationMethod'), - 'Doctrine\ORM\Mapping\PrePersist' + AnnotationNamespace\PrePersist::class ); - $this->assertInstanceOf('Doctrine\ORM\Mapping\PrePersist', $annotation); + $this->assertInstanceOf(AnnotationNamespace\PrePersist::class, $annotation); $annotationDriver = $this->configuration->newDefaultAnnotationDriver($paths); $reader = $annotationDriver->getReader(); $annotation = $reader->getMethodAnnotation( $reflectionClass->getMethod('simpleAnnotationMethod'), - 'Doctrine\ORM\Mapping\PrePersist' + AnnotationNamespace\PrePersist::class ); - $this->assertInstanceOf('Doctrine\ORM\Mapping\PrePersist', $annotation); + $this->assertInstanceOf(AnnotationNamespace\PrePersist::class, $annotation); } public function testSetGetEntityNamespace() @@ -102,7 +104,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $namespaces = ['OtherNamespace' => __NAMESPACE__]; $this->configuration->setEntityNamespaces($namespaces); $this->assertSame($namespaces, $this->configuration->getEntityNamespaces()); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->configuration->getEntityNamespace('NonExistingNamespace'); } @@ -135,7 +137,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $dql = 'SELECT u FROM User u'; $this->configuration->addNamedQuery('QueryName', $dql); $this->assertSame($dql, $this->configuration->getNamedQuery('QueryName')); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->expectExceptionMessage('a named query'); $this->configuration->getNamedQuery('NonExistingQuery'); } @@ -148,7 +150,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $fetched = $this->configuration->getNamedNativeQuery('QueryName'); $this->assertSame($sql, $fetched[0]); $this->assertSame($rsm, $fetched[1]); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->expectExceptionMessage('a named native query'); $this->configuration->getNamedNativeQuery('NonExistingQuery'); } @@ -261,7 +263,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->assertSame(null, $this->configuration->getCustomStringFunction('NonExistingFunction')); $this->configuration->setCustomStringFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('OtherFunctionName')); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->configuration->addCustomStringFunction('concat', __CLASS__); } @@ -272,7 +274,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->assertSame(null, $this->configuration->getCustomNumericFunction('NonExistingFunction')); $this->configuration->setCustomNumericFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('OtherFunctionName')); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->configuration->addCustomNumericFunction('abs', __CLASS__); } @@ -283,7 +285,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase $this->assertSame(null, $this->configuration->getCustomDatetimeFunction('NonExistingFunction')); $this->configuration->setCustomDatetimeFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('OtherFunctionName')); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->expectException(ORMException::class); $this->configuration->addCustomDatetimeFunction('date_add', __CLASS__); } @@ -311,7 +313,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase public function testSetGetClassMetadataFactoryName() { - $this->assertSame('Doctrine\ORM\Mapping\ClassMetadataFactory', $this->configuration->getClassMetadataFactoryName()); + $this->assertSame(AnnotationNamespace\ClassMetadataFactory::class, $this->configuration->getClassMetadataFactoryName()); $this->configuration->setClassMetadataFactoryName(__CLASS__); $this->assertSame(__CLASS__, $this->configuration->getClassMetadataFactoryName()); } @@ -325,17 +327,16 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase public function setDefaultRepositoryClassName() { - $this->assertSame('Doctrine\ORM\EntityRepository', $this->configuration->getDefaultRepositoryClassName()); - $repositoryClass = 'Doctrine\Tests\Models\DDC753\DDC753CustomRepository'; - $this->configuration->setDefaultRepositoryClassName($repositoryClass); - $this->assertSame($repositoryClass, $this->configuration->getDefaultRepositoryClassName()); - $this->expectException(\Doctrine\ORM\ORMException::class); + $this->assertSame(EntityRepository::class, $this->configuration->getDefaultRepositoryClassName()); + $this->configuration->setDefaultRepositoryClassName(DDC753CustomRepository::class); + $this->assertSame(DDC753CustomRepository::class, $this->configuration->getDefaultRepositoryClassName()); + $this->expectException(ORMException::class); $this->configuration->setDefaultRepositoryClassName(__CLASS__); } public function testSetGetNamingStrategy() { - $this->assertInstanceOf('Doctrine\ORM\Mapping\NamingStrategy', $this->configuration->getNamingStrategy()); + $this->assertInstanceOf(NamingStrategy::class, $this->configuration->getNamingStrategy()); $namingStrategy = $this->createMock(NamingStrategy::class); $this->configuration->setNamingStrategy($namingStrategy); $this->assertSame($namingStrategy, $this->configuration->getNamingStrategy()); @@ -343,7 +344,7 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase public function testSetGetQuoteStrategy() { - $this->assertInstanceOf('Doctrine\ORM\Mapping\QuoteStrategy', $this->configuration->getQuoteStrategy()); + $this->assertInstanceOf(QuoteStrategy::class, $this->configuration->getQuoteStrategy()); $quoteStrategy = $this->createMock(QuoteStrategy::class); $this->configuration->setQuoteStrategy($quoteStrategy); $this->assertSame($quoteStrategy, $this->configuration->getQuoteStrategy()); @@ -354,8 +355,8 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase */ public function testSetGetEntityListenerResolver() { - $this->assertInstanceOf('Doctrine\ORM\Mapping\EntityListenerResolver', $this->configuration->getEntityListenerResolver()); - $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultEntityListenerResolver', $this->configuration->getEntityListenerResolver()); + $this->assertInstanceOf(EntityListenerResolver::class, $this->configuration->getEntityListenerResolver()); + $this->assertInstanceOf(AnnotationNamespace\DefaultEntityListenerResolver::class, $this->configuration->getEntityListenerResolver()); $resolver = $this->createMock(EntityListenerResolver::class); $this->configuration->setEntityListenerResolver($resolver); $this->assertSame($resolver, $this->configuration->getEntityListenerResolver()); diff --git a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php index 933580af0..70841b1e7 100644 --- a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php +++ b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Decorator; +use Doctrine\ORM\Decorator\EntityManagerDecorator; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\ResultSetMapping; @@ -13,7 +15,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase public function setUp() { $this->wrapped = $this->createMock(EntityManagerInterface::class); - $this->decorator = $this->getMockBuilder('Doctrine\ORM\Decorator\EntityManagerDecorator') + $this->decorator = $this->getMockBuilder(EntityManagerDecorator::class) ->setConstructorArgs([$this->wrapped]) ->setMethods(null) ->getMock(); @@ -21,7 +23,7 @@ class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase public function getMethodParameters() { - $class = new \ReflectionClass('Doctrine\ORM\EntityManager'); + $class = new \ReflectionClass(EntityManager::class); $methods = []; foreach ($class->getMethods() as $method) { diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index 43471b643..7f36bb285 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -2,13 +2,22 @@ namespace Doctrine\Tests\ORM; +use Doctrine\Common\EventManager; use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; use Doctrine\Common\Persistence\Mapping\MappingException; +use Doctrine\DBAL\Connection; use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\NativeQuery; use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMInvalidArgumentException; +use Doctrine\ORM\Proxy\ProxyFactory; +use Doctrine\ORM\Query; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\ORM\QueryBuilder; +use Doctrine\ORM\UnitOfWork; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\GeoNames\Country; use Doctrine\Tests\OrmTestCase; @@ -37,32 +46,32 @@ class EntityManagerTest extends OrmTestCase public function testGetConnection() { - $this->assertInstanceOf('Doctrine\DBAL\Connection', $this->_em->getConnection()); + $this->assertInstanceOf(Connection::class, $this->_em->getConnection()); } public function testGetMetadataFactory() { - $this->assertInstanceOf('Doctrine\ORM\Mapping\ClassMetadataFactory', $this->_em->getMetadataFactory()); + $this->assertInstanceOf(ClassMetadataFactory::class, $this->_em->getMetadataFactory()); } public function testGetConfiguration() { - $this->assertInstanceOf('Doctrine\ORM\Configuration', $this->_em->getConfiguration()); + $this->assertInstanceOf(Configuration::class, $this->_em->getConfiguration()); } public function testGetUnitOfWork() { - $this->assertInstanceOf('Doctrine\ORM\UnitOfWork', $this->_em->getUnitOfWork()); + $this->assertInstanceOf(UnitOfWork::class, $this->_em->getUnitOfWork()); } public function testGetProxyFactory() { - $this->assertInstanceOf('Doctrine\ORM\Proxy\ProxyFactory', $this->_em->getProxyFactory()); + $this->assertInstanceOf(ProxyFactory::class, $this->_em->getProxyFactory()); } public function testGetEventManager() { - $this->assertInstanceOf('Doctrine\Common\EventManager', $this->_em->getEventManager()); + $this->assertInstanceOf(EventManager::class, $this->_em->getEventManager()); } public function testCreateNativeQuery() @@ -83,18 +92,18 @@ class EntityManagerTest extends OrmTestCase $query = $this->_em->createNamedNativeQuery('foo'); - $this->assertInstanceOf('Doctrine\ORM\NativeQuery', $query); + $this->assertInstanceOf(NativeQuery::class, $query); } public function testCreateQueryBuilder() { - $this->assertInstanceOf('Doctrine\ORM\QueryBuilder', $this->_em->createQueryBuilder()); + $this->assertInstanceOf(QueryBuilder::class, $this->_em->createQueryBuilder()); } public function testCreateQueryBuilderAliasValid() { $q = $this->_em->createQueryBuilder() - ->select('u')->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->select('u')->from(CmsUser::class, 'u'); $q2 = clone $q; $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $q->getQuery()->getDql()); @@ -107,12 +116,12 @@ class EntityManagerTest extends OrmTestCase public function testCreateQuery_DqlIsOptional() { - $this->assertInstanceOf('Doctrine\ORM\Query', $this->_em->createQuery()); + $this->assertInstanceOf(Query::class, $this->_em->createQuery()); } public function testGetPartialReference() { - $user = $this->_em->getPartialReference('Doctrine\Tests\Models\CMS\CmsUser', 42); + $user = $this->_em->getPartialReference(CmsUser::class, 42); $this->assertTrue($this->_em->contains($user)); $this->assertEquals(42, $user->id); $this->assertNull($user->getName()); @@ -121,7 +130,7 @@ class EntityManagerTest extends OrmTestCase public function testCreateQuery() { $q = $this->_em->createQuery('SELECT 1'); - $this->assertInstanceOf('Doctrine\ORM\Query', $q); + $this->assertInstanceOf(Query::class, $q); $this->assertEquals('SELECT 1', $q->getDql()); } @@ -133,7 +142,7 @@ class EntityManagerTest extends OrmTestCase $this->_em->getConfiguration()->addNamedQuery('foo', 'SELECT 1'); $query = $this->_em->createNamedQuery('foo'); - $this->assertInstanceOf('Doctrine\ORM\Query', $query); + $this->assertInstanceOf(Query::class, $query); $this->assertEquals('SELECT 1', $query->getDql()); } diff --git a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php index 2da4d568f..bc4979000 100644 --- a/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php +++ b/tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php @@ -3,14 +3,13 @@ namespace Doctrine\Tests\ORM; use Doctrine\ORM\EntityNotFoundException; -use PHPUnit_Framework_TestCase; /** * Tests for {@see \Doctrine\ORM\EntityNotFoundException} * * @covers \Doctrine\ORM\EntityNotFoundException */ -class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase +class EntityNotFoundExceptionTest extends \PHPUnit_Framework_TestCase { public function testFromClassNameAndIdentifier() { @@ -19,7 +18,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase ['foo' => 'bar'] ); - $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception); + $this->assertInstanceOf(EntityNotFoundException::class, $exception); $this->assertSame('Entity of type \'foo\' for IDs foo(bar) was not found', $exception->getMessage()); $exception = EntityNotFoundException::fromClassNameAndIdentifier( @@ -27,7 +26,7 @@ class EntityNotFoundExceptionTest extends PHPUnit_Framework_TestCase [] ); - $this->assertInstanceOf('Doctrine\ORM\EntityNotFoundException', $exception); + $this->assertInstanceOf(EntityNotFoundException::class, $exception); $this->assertSame('Entity of type \'foo\' was not found', $exception->getMessage()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php index e54a23115..e6714500c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php @@ -3,7 +3,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ORM\Query; +use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -18,11 +18,11 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Phrase'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PhraseType'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Definition'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Lemma'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Type') + $this->_em->getClassMetadata(Phrase::class), + $this->_em->getClassMetadata(PhraseType::class), + $this->_em->getClassMetadata(Definition::class), + $this->_em->getClassMetadata(Lemma::class), + $this->_em->getClassMetadata(Type::class) ] ); } catch (\Exception $e) { @@ -57,7 +57,7 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase //end setup // test1 - lazy-loading many-to-one after find() - $phrase2 = $this->_em->find('Doctrine\Tests\ORM\Functional\Phrase', $phrase->getId()); + $phrase2 = $this->_em->find(Phrase::class, $phrase->getId()); $this->assertTrue(is_numeric($phrase2->getType()->getId())); $this->_em->clear(); @@ -66,8 +66,8 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("SELECT p,t FROM Doctrine\Tests\ORM\Functional\Phrase p JOIN p.type t"); $res = $query->getResult(); $this->assertEquals(1, count($res)); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\PhraseType', $res[0]->getType()); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $res[0]->getType()->getPhrases()); + $this->assertInstanceOf(PhraseType::class, $res[0]->getType()); + $this->assertInstanceOf(PersistentCollection::class, $res[0]->getType()->getPhrases()); $this->assertFalse($res[0]->getType()->getPhrases()->isInitialized()); $this->_em->clear(); @@ -76,17 +76,17 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("SELECT p,t,pp FROM Doctrine\Tests\ORM\Functional\Phrase p JOIN p.type t JOIN t.phrases pp"); $res = $query->getResult(); $this->assertEquals(1, count($res)); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\PhraseType', $res[0]->getType()); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $res[0]->getType()->getPhrases()); + $this->assertInstanceOf(PhraseType::class, $res[0]->getType()); + $this->assertInstanceOf(PersistentCollection::class, $res[0]->getType()->getPhrases()); $this->assertTrue($res[0]->getType()->getPhrases()->isInitialized()); $this->_em->clear(); // test3 - lazy-loading one-to-many after find() - $phrase3 = $this->_em->find('Doctrine\Tests\ORM\Functional\Phrase', $phrase->getId()); + $phrase3 = $this->_em->find(Phrase::class, $phrase->getId()); $definitions = $phrase3->getDefinitions(); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $definitions); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Definition', $definitions[0]); + $this->assertInstanceOf(PersistentCollection::class, $definitions); + $this->assertInstanceOf(Definition::class, $definitions[0]); $this->_em->clear(); @@ -97,7 +97,7 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase $this->assertEquals(1, count($res)); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Definition', $definitions[0]); + $this->assertInstanceOf(Definition::class, $definitions[0]); $this->assertEquals(2, $definitions->count()); } @@ -121,7 +121,7 @@ class AdvancedAssociationTest extends OrmFunctionalTestCase $res = $query->getResult(); $types = $res[0]->getTypes(); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Type', $types[0]); + $this->assertInstanceOf(Type::class, $types[0]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index af62cb6d5..a0ac9a3a7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -6,13 +6,15 @@ use Doctrine\DBAL\Logging\DebugStack; use Doctrine\ORM\EntityNotFoundException; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\ORMInvalidArgumentException; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Proxy\Proxy; 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\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; class BasicFunctionalTest extends OrmFunctionalTestCase @@ -38,7 +40,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->assertTrue($this->_em->contains($user)); // Read - $user2 = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->id); + $user2 = $this->_em->find(CmsUser::class, $user->id); $this->assertTrue($user === $user2); // Add a phonenumber @@ -138,8 +140,8 @@ class BasicFunctionalTest extends OrmFunctionalTestCase ->getSingleResult(); // Address has been eager-loaded because it cant be lazy - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $user2->address); + $this->assertInstanceOf(CmsAddress::class, $user2->address); + $this->assertNotInstanceOf(Proxy::class, $user2->address); } /** @@ -173,7 +175,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $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)); + $this->assertNull($this->_em->find(CmsUser::class, $id)); } public function testOneToManyOrphanRemoval() @@ -278,7 +280,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('gblanco', $users[0]->username); $this->assertEquals('developer', $users[0]->status); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->phonenumbers); + $this->assertInstanceOf(PersistentCollection::class, $users[0]->phonenumbers); $this->assertTrue($users[0]->phonenumbers->isInitialized()); $this->assertEquals(0, $users[0]->phonenumbers->count()); //$this->assertNull($users[0]->articles); @@ -395,7 +397,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->clear(); $userId = $user->id; - $user = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $user->id); + $user = $this->_em->getReference(CmsUser::class, $user->id); $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1"; $user = $this->_em->createQuery($dql) @@ -508,7 +510,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase // Assume we only got the identifier of the address and now want to attach // that address to the user without actually loading it, using getReference(). - $addressRef = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsAddress', $address->getId()); + $addressRef = $this->_em->getReference(CmsAddress::class, $address->getId()); //$addressRef->getId(); //\Doctrine\Common\Util\Debug::dump($addressRef); @@ -522,8 +524,8 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.address a where u.username='gblanco'"); $gblanco = $query->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $gblanco); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $gblanco->getAddress()); + $this->assertInstanceOf(CmsUser::class, $gblanco); + $this->assertInstanceOf(CmsAddress::class, $gblanco->getAddress()); $this->assertEquals('Berlin', $gblanco->getAddress()->getCity()); } @@ -594,7 +596,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $articleNew = $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $articleId); + $articleNew = $this->_em->find(CmsArticle::class, $articleId); $this->assertEquals("Lorem ipsum dolor sunt. And stuff!", $articleNew->text); $this->assertTrue($this->_em->contains($articleNew)); } @@ -631,7 +633,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $user2 = $query->getSingleResult(); $this->assertEquals(1, count($user2->articles)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address); + $this->assertInstanceOf(CmsAddress::class, $user2->address); $oldLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); $debugStack = new DebugStack(); @@ -656,7 +658,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $userRef = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $user->getId()); + $userRef = $this->_em->getReference(CmsUser::class, $user->getId()); $this->_em->remove($userRef); $this->_em->flush(); $this->_em->clear(); @@ -687,12 +689,12 @@ class BasicFunctionalTest extends OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $userRef = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $user->getId()); + $userRef = $this->_em->getReference(CmsUser::class, $user->getId()); $address2 = $this->_em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsAddress a where a.user = :user') ->setParameter('user', $userRef) ->getSingleResult(); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $address2->getUser()); + $this->assertInstanceOf(Proxy::class, $address2->getUser()); $this->assertTrue($userRef === $address2->getUser()); $this->assertFalse($userRef->__isInitialized__); $this->assertEquals('Germany', $address2->country); @@ -872,7 +874,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $userId = $user->id; $this->_em->clear(); - $user = $this->_em->getPartialReference('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $user = $this->_em->getPartialReference(CmsUser::class, $userId); $this->assertTrue($this->_em->contains($user)); $this->assertNull($user->getName()); $this->assertEquals($userId, $user->id); @@ -904,7 +906,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->clear(); $user2 = $this->_em->find(get_class($managedUser), $userId); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $user2); + $this->assertInstanceOf(CmsUser::class, $user2); } public function testMergeNonPersistedProperties() @@ -1001,9 +1003,9 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $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', ClassMetadata::FETCH_EAGER) + ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER) ->getSingleResult(); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $article->user, "It IS a proxy, ..."); + $this->assertInstanceOf(Proxy::class, $article->user, "It IS a proxy, ..."); $this->assertTrue($article->user->__isInitialized__, "...but its initialized!"); $this->assertEquals($qc+2, $this->getCurrentQueryCount()); } @@ -1045,7 +1047,7 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $unitOfWork = $this->_em->getUnitOfWork(); - $this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser'); + $this->_em->clear(CmsUser::class); $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user)); $this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1)); diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index c552139af..cb19c2bcf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -16,8 +16,8 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), ] ); } @@ -28,8 +28,8 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_schemaTool->dropSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityO'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\CascadeRemoveOrderEntityG'), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), ] ); } @@ -43,7 +43,7 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $eOloaded = $this->_em->find('Doctrine\Tests\ORM\Functional\CascadeRemoveOrderEntityO', $eO->getId()); + $eOloaded = $this->_em->find(CascadeRemoveOrderEntityO::class, $eO->getId()); $this->_em->remove($eOloaded); $this->_em->flush(); @@ -62,7 +62,7 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $eOloaded = $this->_em->find('Doctrine\Tests\ORM\Functional\CascadeRemoveOrderEntityO', $eO->getId()); + $eOloaded = $this->_em->find(CascadeRemoveOrderEntityO::class, $eO->getId()); $this->_em->remove($eOloaded); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 9d594e8c9..3553f9ad2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\Company\CompanyPerson, Doctrine\Tests\Models\Company\CompanyEmployee, Doctrine\Tests\Models\Company\CompanyManager, @@ -50,8 +52,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $entities = $query->getResult(); $this->assertEquals(2, count($entities)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $entities[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $entities[1]); + $this->assertInstanceOf(CompanyPerson::class, $entities[0]); + $this->assertInstanceOf(CompanyEmployee::class, $entities[1]); $this->assertTrue(is_numeric($entities[0]->getId())); $this->assertTrue(is_numeric($entities[1]->getId())); $this->assertEquals('Roman S. Borschel', $entities[0]->getName()); @@ -65,7 +67,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $entities = $query->getResult(); $this->assertEquals(1, count($entities)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $entities[0]); + $this->assertInstanceOf(CompanyEmployee::class, $entities[0]); $this->assertTrue(is_numeric($entities[0]->getId())); $this->assertEquals('Guilherme Blanco', $entities[0]->getName()); $this->assertEquals(100000, $entities[0]->getSalary()); @@ -73,7 +75,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(['name' => 'Guilherme Blanco']); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $guilherme); + $this->assertInstanceOf(CompanyEmployee::class, $guilherme); $this->assertEquals('Guilherme Blanco', $guilherme->getName()); $this->_em->clear(); @@ -108,9 +110,9 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $manager->getId()); + $manager = $this->_em->find(CompanyManager::class, $manager->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyManager', $manager); + $this->assertInstanceOf(CompanyManager::class, $manager); $this->assertEquals('Roman B.', $manager->getName()); $this->assertEquals(119000, $manager->getSalary()); $this->assertEquals('CEO', $manager->getTitle()); @@ -128,9 +130,9 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $person = $this->_em->find('Doctrine\Tests\Models\Company\CompanyPerson', $manager->getId()); + $person = $this->_em->find(CompanyPerson::class, $manager->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyManager', $person); + $this->assertInstanceOf(CompanyManager::class, $person); $this->assertEquals('Roman S. Borschel', $person->getName()); $this->assertEquals(100000, $person->getSalary()); $this->assertEquals('CTO', $person->getTitle()); @@ -167,9 +169,9 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $result[0]); + $this->assertInstanceOf(CompanyPerson::class, $result[0]); $this->assertEquals('Mary Smith', $result[0]->getName()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result[0]->getSpouse()); + $this->assertInstanceOf(CompanyEmployee::class, $result[0]->getSpouse()); $this->assertEquals('John Smith', $result[0]->getSpouse()->getName()); $this->assertSame($result[0], $result[0]->getSpouse()->getSpouse()); } @@ -229,20 +231,20 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyOrganization', $result[0]); + $this->assertInstanceOf(CompanyOrganization::class, $result[0]); $this->assertNull($result[0]->getMainEvent()); $events = $result[0]->getEvents(); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $events); + $this->assertInstanceOf(PersistentCollection::class, $events); $this->assertFalse($events->isInitialized()); $this->assertEquals(2, count($events)); if ($events[0] instanceof CompanyAuction) { - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyRaffle', $events[1]); + $this->assertInstanceOf(CompanyRaffle::class, $events[1]); } else { - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyRaffle', $events[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $events[1]); + $this->assertInstanceOf(CompanyRaffle::class, $events[0]); + $this->assertInstanceOf(CompanyAuction::class, $events[1]); } } @@ -263,7 +265,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $result[0], sprintf("Is of class %s",get_class($result[0]))); + $this->assertInstanceOf(CompanyAuction::class, $result[0], sprintf("Is of class %s",get_class($result[0]))); $this->_em->clear(); @@ -273,12 +275,12 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyOrganization', $result[0]); + $this->assertInstanceOf(CompanyOrganization::class, $result[0]); $mainEvent = $result[0]->getMainEvent(); // mainEvent should have been loaded because it can't be lazy - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $mainEvent); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $mainEvent); + $this->assertInstanceOf(CompanyAuction::class, $mainEvent); + $this->assertNotInstanceOf(Proxy::class, $mainEvent); } /** @@ -388,12 +390,12 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager'); + $repos = $this->_em->getRepository(CompanyManager::class); $pmanager = $repos->findOneBy(['spouse' => $person->getId()]); $this->assertEquals($manager->getId(), $pmanager->getId()); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson'); + $repos = $this->_em->getRepository(CompanyPerson::class); $pmanager = $repos->findOneBy(['spouse' => $person->getId()]); $this->assertEquals($manager->getId(), $pmanager->getId()); @@ -414,14 +416,14 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $ref = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyPerson', $manager->getId()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $ref, "Cannot Request a proxy from a class that has subclasses."); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $ref); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $ref, "Direct fetch of the reference has to load the child class Employee directly."); + $ref = $this->_em->getReference(CompanyPerson::class, $manager->getId()); + $this->assertNotInstanceOf(Proxy::class, $ref, "Cannot Request a proxy from a class that has subclasses."); + $this->assertInstanceOf(CompanyPerson::class, $ref); + $this->assertInstanceOf(CompanyEmployee::class, $ref, "Direct fetch of the reference has to load the child class Employee directly."); $this->_em->clear(); - $ref = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyManager', $manager->getId()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $ref, "A proxy can be generated only if no subclasses exists for the requested reference."); + $ref = $this->_em->getReference(CompanyManager::class, $manager->getId()); + $this->assertInstanceOf(Proxy::class, $ref, "A proxy can be generated only if no subclasses exists for the requested reference."); } /** @@ -445,7 +447,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $manager->getId()); + $manager = $this->_em->find(CompanyManager::class, $manager->getId()); $this->assertEquals(1, count($manager->getFriends())); } @@ -482,13 +484,13 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->persist($manager); $this->_em->flush(); - $repository = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyEmployee"); + $repository = $this->_em->getRepository(CompanyEmployee::class); $users = $repository->matching(new Criteria( Criteria::expr()->eq('department', 'IT') )); $this->assertEquals(1, count($users)); - $repository = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyManager"); + $repository = $this->_em->getRepository(CompanyManager::class); $users = $repository->matching(new Criteria( Criteria::expr()->eq('department', 'IT') )); diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php index b7988054d..84949a6e3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -17,10 +18,10 @@ class ClassTableInheritanceTest2 extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIParent'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIChild'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\CTIRelated2') + $this->_em->getClassMetadata(CTIParent::class), + $this->_em->getClassMetadata(CTIChild::class), + $this->_em->getClassMetadata(CTIRelated::class), + $this->_em->getClassMetadata(CTIRelated2::class) ] ); } catch (\Exception $ignored) { @@ -44,11 +45,11 @@ class ClassTableInheritanceTest2 extends OrmFunctionalTestCase $relatedId = $related->getId(); - $related2 = $this->_em->find('Doctrine\Tests\ORM\Functional\CTIRelated', $relatedId); + $related2 = $this->_em->find(CTIRelated::class, $relatedId); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIRelated', $related2); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIChild', $related2->getCTIParent()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $related2->getCTIParent()); + $this->assertInstanceOf(CTIRelated::class, $related2); + $this->assertInstanceOf(CTIChild::class, $related2->getCTIParent()); + $this->assertNotInstanceOf(Proxy::class, $related2->getCTIParent()); $this->assertEquals('hello', $related2->getCTIParent()->getData()); $this->assertSame($related2, $related2->getCTIParent()->getRelated()); @@ -72,7 +73,7 @@ class ClassTableInheritanceTest2 extends OrmFunctionalTestCase $this->assertFalse($mmrel2->getCTIChildren()->isInitialized()); $this->assertEquals(1, count($mmrel2->getCTIChildren())); $this->assertTrue($mmrel2->getCTIChildren()->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIChild', $mmrel2->getCTIChildren()->get(0)); + $this->assertInstanceOf(CTIChild::class, $mmrel2->getCTIChildren()->get(0)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php index a461fea19..03bde6ba7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php @@ -30,7 +30,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase public function putTripAroundEurope() { - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); $tour = new NavTour("Trip around Europe"); $tour->addPointOfInterest($poi); @@ -46,9 +46,9 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); - $this->assertInstanceOf('Doctrine\Tests\Models\Navigation\NavPointOfInterest', $poi); + $this->assertInstanceOf(NavPointOfInterest::class, $poi); $this->assertEquals(100, $poi->getLat()); $this->assertEquals(200, $poi->getLong()); $this->assertEquals('Brandenburger Tor', $poi->getName()); @@ -61,7 +61,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); $photo = new NavPhotos($poi, "asdf"); $this->_em->persist($photo); $this->_em->flush(); @@ -79,7 +79,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); $photo = new NavPhotos($poi, "asdf"); $this->_em->persist($photo); $this->_em->flush(); @@ -98,7 +98,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->putGermanysBrandenburderTor(); $tour = $this->putTripAroundEurope(); - $tour = $this->_em->find('Doctrine\Tests\Models\Navigation\NavTour', $tour->getId()); + $tour = $this->_em->find(NavTour::class, $tour->getId()); $this->assertEquals(1, count($tour->getPointOfInterests())); } @@ -140,7 +140,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('The identifier long is missing for a query of Doctrine\Tests\Models\Navigation\NavPointOfInterest'); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['key1' => 100]); + $poi = $this->_em->find(NavPointOfInterest::class, ['key1' => 100]); } public function testUnrecognizedIdentifierFieldsOnGetReference() @@ -148,7 +148,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage("Unrecognized identifier fields: 'key1'"); - $poi = $this->_em->getReference('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 10, 'long' => 20, 'key1' => 100] + $poi = $this->_em->getReference(NavPointOfInterest::class, ['lat' => 10, 'long' => 20, 'key1' => 100] ); } @@ -159,7 +159,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase { $this->putGermanysBrandenburderTor(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); $poi->addVisitor(new NavUser("test1")); $poi->addVisitor(new NavUser("test2")); @@ -170,7 +170,7 @@ class CompositePrimaryKeyTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', ['lat' => 100, 'long' => 200]); + $poi = $this->_em->find(NavPointOfInterest::class, ['lat' => 100, 'long' => 200]); $this->assertEquals(0, count($poi->getVisitors())); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php index 3b5427f05..533f611d4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php @@ -41,8 +41,8 @@ class CompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase public function testFindByAbleToGetCompositeEntitiesWithMixedTypeIdentifiers() { - $admin1Repo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1'); - $admin1NamesRepo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1AlternateName'); + $admin1Repo = $this->_em->getRepository(Admin1::class); + $admin1NamesRepo = $this->_em->getRepository(Admin1AlternateName::class); $admin1Rome = $admin1Repo->findOneBy(['country' => 'IT', 'id' => 1]); diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomIdObjectTypeTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomIdObjectTypeTest.php index ea6fdfaff..08d89fa8e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomIdObjectTypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomIdObjectTypeTest.php @@ -14,9 +14,9 @@ class CustomIdObjectTypeTest extends OrmFunctionalTestCase protected function setUp() { if (DBALType::hasType(CustomIdObjectType::NAME)) { - DBALType::overrideType(CustomIdObjectType::NAME, CustomIdObjectType::CLASSNAME); + DBALType::overrideType(CustomIdObjectType::NAME, CustomIdObjectType::class); } else { - DBALType::addType(CustomIdObjectType::NAME, CustomIdObjectType::CLASSNAME); + DBALType::addType(CustomIdObjectType::NAME, CustomIdObjectType::class); } $this->useModelSet('custom_id_object_type'); @@ -31,7 +31,7 @@ class CustomIdObjectTypeTest extends OrmFunctionalTestCase $this->_em->persist($parent); $this->_em->flush(); - $result = $this->_em->find(CustomIdObjectTypeParent::CLASSNAME, $parent->id); + $result = $this->_em->find(CustomIdObjectTypeParent::class, $parent->id); $this->assertSame($parent, $result); } @@ -53,7 +53,7 @@ class CustomIdObjectTypeTest extends OrmFunctionalTestCase ->_em ->createQuery( 'SELECT parent, children FROM ' - . CustomIdObjectTypeParent::CLASSNAME + . CustomIdObjectTypeParent::class . ' parent LEFT JOIN parent.children children' ) ->getResult(); @@ -80,7 +80,7 @@ class CustomIdObjectTypeTest extends OrmFunctionalTestCase ->_em ->createQuery( 'SELECT parent, children FROM ' - . CustomIdObjectTypeParent::CLASSNAME + . CustomIdObjectTypeParent::class . ' parent LEFT JOIN parent.children children ' . 'WHERE children.id = ?1' ) diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php index 75c0a20e6..2797ba833 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php @@ -1,6 +1,7 @@ _schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueUser'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\DefaultValueAddress') + $this->_em->getClassMetadata(DefaultValueUser::class), + $this->_em->getClassMetadata(DefaultValueAddress::class) ] ); } catch (\Exception $e) { @@ -55,7 +56,7 @@ class DefaultValuesTest extends OrmFunctionalTestCase $this->_em->clear(); $a2 = $this->_em->find(get_class($a), $a->id); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\DefaultValueUser', $a2->getUser()); + $this->assertInstanceOf(DefaultValueUser::class, $a2->getUser()); $this->assertEquals($userId, $a2->getUser()->getId()); $this->assertEquals('Poweruser', $a2->getUser()->type); } @@ -73,13 +74,13 @@ class DefaultValuesTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->getPartialReference('Doctrine\Tests\ORM\Functional\DefaultValueUser', $user->id); + $user = $this->_em->getPartialReference(DefaultValueUser::class, $user->id); $this->assertTrue($this->_em->getUnitOfWork()->isReadOnly($user)); $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\ORM\Functional\DefaultValueUser', $user->id); + $user = $this->_em->find(DefaultValueUser::class, $user->id); $this->assertEquals('Normaluser', $user->type); } diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index d067836f7..b0326e542 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\OptimisticLockException; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; @@ -90,8 +91,8 @@ class DetachedEntityTest extends OrmFunctionalTestCase // Merge back in $user = $this->_em->merge($user); // merge cascaded to phonenumbers - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $user->phonenumbers[0]->user); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $user->phonenumbers[1]->user); + $this->assertInstanceOf(CmsUser::class, $user->phonenumbers[0]->user); + $this->assertInstanceOf(CmsUser::class, $user->phonenumbers[1]->user); $im = $this->_em->getUnitOfWork()->getIdentityMap(); $this->_em->flush(); @@ -100,10 +101,10 @@ class DetachedEntityTest extends OrmFunctionalTestCase $this->assertNotSame($oldPhonenumbers, $phonenumbers, "Merge should replace the Detached Collection with a new PersistentCollection."); $this->assertEquals(2, count($phonenumbers), "Failed to assert that two phonenumbers are contained in the merged users phonenumber collection."); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $phonenumbers[1]); + $this->assertInstanceOf(CmsPhonenumber::class, $phonenumbers[1]); $this->assertTrue($this->_em->contains($phonenumbers[1]), "Failed to assert that second phonenumber in collection is contained inside EntityManager persistence context."); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $phonenumbers[0]); + $this->assertInstanceOf(CmsPhonenumber::class, $phonenumbers[0]); $this->assertTrue($this->_em->getUnitOfWork()->isInIdentityMap($phonenumbers[0])); $this->assertTrue($this->_em->contains($phonenumbers[0]), "Failed to assert that first phonenumber in collection is contained inside EntityManager persistence context."); } @@ -145,14 +146,14 @@ class DetachedEntityTest extends OrmFunctionalTestCase $this->_em->clear(); $address2 = $this->_em->find(get_class($address), $address->id); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $address2->user); + $this->assertInstanceOf(Proxy::class, $address2->user); $this->assertFalse($address2->user->__isInitialized__); $detachedAddress2 = unserialize(serialize($address2)); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $detachedAddress2->user); + $this->assertInstanceOf(Proxy::class, $detachedAddress2->user); $this->assertFalse($detachedAddress2->user->__isInitialized__); $managedAddress2 = $this->_em->merge($detachedAddress2); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $managedAddress2->user); + $this->assertInstanceOf(Proxy::class, $managedAddress2->user); $this->assertFalse($managedAddress2->user === $detachedAddress2->user); $this->assertFalse($managedAddress2->user->__isInitialized__); } @@ -178,7 +179,7 @@ class DetachedEntityTest extends OrmFunctionalTestCase $newUser = $query->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $newUser); + $this->assertInstanceOf(CmsUser::class, $newUser); $this->assertEquals('gblanco', $newUser->username); } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php index 64bc31770..98457dd49 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php @@ -2,6 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\PreFlushEventArgs; +use Doctrine\ORM\Event\PreUpdateEventArgs; +use Doctrine\Tests\Models\Company\CompanyContractListener; use Doctrine\Tests\Models\Company\CompanyFixContract; use Doctrine\Tests\OrmFunctionalTestCase; @@ -23,7 +27,7 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->listener = $this->_em->getConfiguration() ->getEntityListenerResolver() - ->resolve('Doctrine\Tests\Models\Company\CompanyContractListener'); + ->resolve(CompanyContractListener::class); } public function testPreFlushListeners() @@ -37,18 +41,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->preFlushCalls); - $this->assertSame($fix, $this->listener->preFlushCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->preFlushCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\PreFlushEventArgs', - $this->listener->preFlushCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preFlushCalls[0][0]); + $this->assertInstanceOf(PreFlushEventArgs::class, $this->listener->preFlushCalls[0][1]); } public function testPostLoadListeners() @@ -66,18 +61,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $fix = $this->_em->createQuery($dql)->setParameter(1, $fix->getId())->getSingleResult(); $this->assertCount(1,$this->listener->postLoadCalls); - $this->assertSame($fix, $this->listener->postLoadCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->postLoadCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->postLoadCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postLoadCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postLoadCalls[0][1]); } public function testPrePersistListeners() @@ -91,18 +77,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->prePersistCalls); - $this->assertSame($fix, $this->listener->prePersistCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->prePersistCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->prePersistCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->prePersistCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->prePersistCalls[0][1]); } public function testPostPersistListeners() @@ -116,18 +93,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->postPersistCalls); - $this->assertSame($fix, $this->listener->postPersistCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->postPersistCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->postPersistCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postPersistCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postPersistCalls[0][1]); } public function testPreUpdateListeners() @@ -146,18 +114,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->preUpdateCalls); - $this->assertSame($fix, $this->listener->preUpdateCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->preUpdateCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\PreUpdateEventArgs', - $this->listener->preUpdateCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preUpdateCalls[0][0]); + $this->assertInstanceOf(PreUpdateEventArgs::class, $this->listener->preUpdateCalls[0][1]); } public function testPostUpdateListeners() @@ -176,18 +135,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->postUpdateCalls); - $this->assertSame($fix, $this->listener->postUpdateCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->postUpdateCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->postUpdateCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postUpdateCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postUpdateCalls[0][1]); } public function testPreRemoveListeners() @@ -204,18 +154,9 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->preRemoveCalls); - $this->assertSame($fix, $this->listener->preRemoveCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->preRemoveCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->preRemoveCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preRemoveCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->preRemoveCalls[0][1]); } public function testPostRemoveListeners() @@ -232,17 +173,8 @@ class EntityListenersTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertCount(1,$this->listener->postRemoveCalls); - $this->assertSame($fix, $this->listener->postRemoveCalls[0][0]); - - $this->assertInstanceOf( - 'Doctrine\Tests\Models\Company\CompanyFixContract', - $this->listener->postRemoveCalls[0][0] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $this->listener->postRemoveCalls[0][1] - ); + $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postRemoveCalls[0][0]); + $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postRemoveCalls[0][1]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php index 694ad66da..700964b97 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\LazyCriteriaCollection; use Doctrine\Tests\Models\Generic\DateTimeModel; use Doctrine\Common\Collections\Criteria; use Doctrine\Tests\Models\Tweet\Tweet; @@ -64,7 +65,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel'); + $repository = $this->_em->getRepository(DateTimeModel::class); $dates = $repository->matching(new Criteria( Criteria::expr()->lte('datetime', new \DateTime('today')) )); @@ -95,7 +96,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase public function testIsNullComparison() { $this->loadNullFieldFixtures(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel'); + $repository = $this->_em->getRepository(DateTimeModel::class); $dates = $repository->matching(new Criteria( Criteria::expr()->isNull('time') @@ -107,7 +108,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase public function testEqNullComparison() { $this->loadNullFieldFixtures(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel'); + $repository = $this->_em->getRepository(DateTimeModel::class); $dates = $repository->matching(new Criteria( Criteria::expr()->eq('time', null) @@ -119,7 +120,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase public function testNotEqNullComparison() { $this->loadNullFieldFixtures(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel'); + $repository = $this->_em->getRepository(DateTimeModel::class); $dates = $repository->matching(new Criteria( Criteria::expr()->neq('time', null) @@ -131,7 +132,7 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase public function testCanCountWithoutLoadingCollection() { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Generic\DateTimeModel'); + $repository = $this->_em->getRepository(DateTimeModel::class); $dates = $repository->matching(new Criteria()); @@ -171,10 +172,10 @@ class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase $criteria = new Criteria(); $criteria->andWhere($criteria->expr()->contains('content', 'Criteria')); - $user = $this->_em->find('Doctrine\Tests\Models\Tweet\User', $user->id); + $user = $this->_em->find(User::class, $user->id); $tweets = $user->tweets->matching($criteria); - $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets); + $this->assertInstanceOf(LazyCriteriaCollection::class, $tweets); $this->assertFalse($tweets->isInitialized()); $tweets->contains($tweet); diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index 2aa25b8c7..d329b8556 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -2,16 +2,23 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Criteria; use Doctrine\DBAL\Connection; use Doctrine\DBAL\LockMode; +use Doctrine\ORM\EntityRepository; use Doctrine\ORM\OptimisticLockException; use Doctrine\ORM\ORMException; +use Doctrine\ORM\Query; use Doctrine\ORM\TransactionRequiredException; -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\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\DDC753\DDC753CustomRepository; +use Doctrine\Tests\Models\DDC753\DDC753DefaultRepository; +use Doctrine\Tests\Models\DDC753\DDC753EntityWithCustomRepository; +use Doctrine\Tests\Models\DDC753\DDC753EntityWithDefaultCustomRepository; +use Doctrine\Tests\Models\DDC753\DDC753InvalidRepository; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -170,10 +177,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testBasicFind() { $user1Id = $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $user = $repos->find($user1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$user); + $this->assertInstanceOf(CmsUser::class,$user); $this->assertEquals('Roman', $user->name); $this->assertEquals('freak', $user->status); } @@ -181,11 +188,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindByField() { $user1Id = $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findBy(['status' => 'dev']); $this->assertEquals(2, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]); + $this->assertInstanceOf(CmsUser::class,$users[0]); $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('dev', $users[0]->status); } @@ -207,11 +214,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repository = $this->_em->getRepository(CmsAddress::class); $addresses = $repository->findBy(['user' => [$user1->getId(), $user2->getId()]]); $this->assertEquals(2, count($addresses)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]); + $this->assertInstanceOf(CmsAddress::class,$addresses[0]); } public function testFindByAssociationWithObjectAsParameter() @@ -231,21 +238,21 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repository = $this->_em->getRepository(CmsAddress::class); $addresses = $repository->findBy(['user' => [$user1, $user2]]); $this->assertEquals(2, count($addresses)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]); + $this->assertInstanceOf(CmsAddress::class,$addresses[0]); } public function testFindFieldByMagicCall() { $user1Id = $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findByStatus('dev'); $this->assertEquals(2, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]); + $this->assertInstanceOf(CmsUser::class,$users[0]); $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('dev', $users[0]->status); } @@ -253,7 +260,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindAll() { $user1Id = $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findAll(); $this->assertEquals(4, count($users)); @@ -262,7 +269,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindByAlias() { $user1Id = $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $this->_em->getConfiguration()->addEntityNamespace('CMS', 'Doctrine\Tests\Models\CMS'); @@ -300,7 +307,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase * @expectedException \Doctrine\ORM\ORMException */ public function testExceptionIsThrownWhenCallingFindByWithoutParameter() { - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->findByStatus(); } @@ -308,7 +315,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase * @expectedException \Doctrine\ORM\ORMException */ public function testExceptionIsThrownWhenUsingInvalidFieldName() { - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->findByThisFieldDoesNotExist('testvalue'); } @@ -320,7 +327,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->expectException(TransactionRequiredException::class); - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->find(1, LockMode::PESSIMISTIC_READ); } @@ -332,7 +339,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->expectException(TransactionRequiredException::class); - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->find(1, LockMode::PESSIMISTIC_WRITE); } @@ -344,7 +351,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->expectException(OptimisticLockException::class); - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->find(1, LockMode::OPTIMISTIC); } @@ -363,11 +370,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $userId = $user->id; - $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $this->_em->find(CmsUser::class, $userId); $this->expectException(OptimisticLockException::class); - $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, LockMode::OPTIMISTIC); + $this->_em->find(CmsUser::class, $userId, LockMode::OPTIMISTIC); } /** @@ -377,7 +384,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findByStatus(null); $this->assertEquals(1, count($users)); @@ -390,7 +397,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->expectException(\BadMethodCallException::class); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $repos->foo(); } @@ -400,7 +407,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindByAssociationKey_ExceptionOnInverseSide() { list($userId, $addressId) = $this->loadAssociatedFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $this->expectException(ORMException::class); $this->expectExceptionMessage("You cannot search for the association field 'Doctrine\Tests\Models\CMS\CmsUser#address', because it is the inverse side of an association. Find methods only work on owning side associations."); @@ -414,10 +421,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindOneByAssociationKey() { list($userId, $addressId) = $this->loadAssociatedFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repos = $this->_em->getRepository(CmsAddress::class); $address = $repos->findOneBy(['user' => $userId]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address); + $this->assertInstanceOf(CmsAddress::class, $address); $this->assertEquals($addressId, $address->id); } @@ -428,7 +435,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $userAsc = $repos->findOneBy([], ["username" => "ASC"]); $userDesc = $repos->findOneBy([], ["username" => "DESC"]); @@ -441,10 +448,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindByAssociationKey() { list($userId, $addressId) = $this->loadAssociatedFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repos = $this->_em->getRepository(CmsAddress::class); $addresses = $repos->findBy(['user' => $userId]); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsAddress', $addresses); + $this->assertContainsOnly(CmsAddress::class, $addresses); $this->assertEquals(1, count($addresses)); $this->assertEquals($addressId, $addresses[0]->id); } @@ -455,10 +462,10 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindAssociationByMagicCall() { list($userId, $addressId) = $this->loadAssociatedFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repos = $this->_em->getRepository(CmsAddress::class); $addresses = $repos->findByUser($userId); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsAddress', $addresses); + $this->assertContainsOnly(CmsAddress::class, $addresses); $this->assertEquals(1, count($addresses)); $this->assertEquals($addressId, $addresses[0]->id); } @@ -469,26 +476,26 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindOneAssociationByMagicCall() { list($userId, $addressId) = $this->loadAssociatedFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repos = $this->_em->getRepository(CmsAddress::class); $address = $repos->findOneByUser($userId); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address); + $this->assertInstanceOf(CmsAddress::class, $address); $this->assertEquals($addressId, $address->id); } public function testValidNamedQueryRetrieval() { - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $query = $repos->createNamedQuery('all'); - $this->assertInstanceOf('Doctrine\ORM\Query', $query); + $this->assertInstanceOf(Query::class, $query); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $query->getDQL()); } public function testInvalidNamedQueryRetrieval() { - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); @@ -500,7 +507,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testIsNullCriteriaDoesNotGenerateAParameter() { - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findBy(['status' => null, 'username' => 'romanb']); $params = $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params']; @@ -512,7 +519,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users = $repos->findBy(['status' => null]); $this->assertEquals(1, count($users)); @@ -525,7 +532,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users1 = $repos->findBy([], null, 1, 0); $users2 = $repos->findBy([], null, 1, 1); @@ -543,7 +550,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $usersAsc = $repos->findBy([], ["username" => "ASC"]); $usersDesc = $repos->findBy([], ["username" => "DESC"]); @@ -560,7 +567,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixtureUserEmail(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $resultAsc = $repository->findBy([], ['email' => 'ASC']); $resultDesc = $repository->findBy([], ['email' => 'DESC']); @@ -577,7 +584,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindFieldByMagicCallOrderBy() { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $usersAsc = $repos->findByStatus('dev', ['username' => "ASC"]); $usersDesc = $repos->findByStatus('dev', ['username' => "DESC"]); @@ -585,7 +592,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->assertEquals(2, count($usersAsc)); $this->assertEquals(2, count($usersDesc)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$usersAsc[0]); + $this->assertInstanceOf(CmsUser::class,$usersAsc[0]); $this->assertEquals('Alexander', $usersAsc[0]->name); $this->assertEquals('dev', $usersAsc[0]->status); @@ -599,7 +606,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testFindFieldByMagicCallLimitOffset() { $this->loadFixture(); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repos = $this->_em->getRepository(CmsUser::class); $users1 = $repos->findByStatus('dev', [], 1, 0); $users2 = $repos->findByStatus('dev', [], 1, 1); @@ -614,22 +621,22 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testDefaultRepositoryClassName() { - $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository"); - $this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\Tests\Models\DDC753\DDC753DefaultRepository"); - $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\Tests\Models\DDC753\DDC753DefaultRepository"); + $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), EntityRepository::class); + $this->_em->getConfiguration()->setDefaultRepositoryClassName(DDC753DefaultRepository::class); + $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), DDC753DefaultRepository::class); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\DDC753\DDC753EntityWithDefaultCustomRepository'); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC753\DDC753DefaultRepository", $repos); + $repos = $this->_em->getRepository(DDC753EntityWithDefaultCustomRepository::class); + $this->assertInstanceOf(DDC753DefaultRepository::class, $repos); $this->assertTrue($repos->isDefaultRepository()); - $repos = $this->_em->getRepository('Doctrine\Tests\Models\DDC753\DDC753EntityWithCustomRepository'); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC753\DDC753CustomRepository", $repos); + $repos = $this->_em->getRepository(DDC753EntityWithCustomRepository::class); + $this->assertInstanceOf(DDC753CustomRepository::class, $repos); $this->assertTrue($repos->isCustomRepository()); - $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\Tests\Models\DDC753\DDC753DefaultRepository"); - $this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\ORM\EntityRepository"); - $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository"); + $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), DDC753DefaultRepository::class); + $this->_em->getConfiguration()->setDefaultRepositoryClassName(EntityRepository::class); + $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), EntityRepository::class); } @@ -640,8 +647,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testSetDefaultRepositoryInvalidClassError() { - $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository"); - $this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\Tests\Models\DDC753\DDC753InvalidRepository"); + $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), EntityRepository::class); + $this->_em->getConfiguration()->setDefaultRepositoryClassName(DDC753InvalidRepository::class); } /** @@ -654,7 +661,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $config->addEntityNamespace('Aliased', 'Doctrine\Tests\Models\CMS'); $config->addEntityNamespace('AliasedAgain', 'Doctrine\Tests\Models\CMS'); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $this->assertSame($repository, $this->_em->getRepository('Aliased:CmsUser')); $this->assertSame($repository, $this->_em->getRepository('AliasedAgain:CmsUser')); @@ -666,8 +673,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase public function testCanRetrieveRepositoryFromClassNameWithLeadingBackslash() { $this->assertSame( - $this->_em->getRepository('\\Doctrine\\Tests\\Models\\CMS\\CmsUser'), - $this->_em->getRepository('Doctrine\\Tests\\Models\\CMS\\CmsUser') + $this->_em->getRepository('\\' . CmsUser::class), + $this->_em->getRepository(CmsUser::class) ); } @@ -679,7 +686,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testInvalidOrderByAssociation() { - $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + $this->_em->getRepository(CmsUser::class) ->findBy(['status' => 'test'], ['address' => 'ASC']); } @@ -691,7 +698,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('Invalid order by orientation specified for Doctrine\Tests\Models\CMS\CmsUser#username'); - $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repo = $this->_em->getRepository(CmsUser::class); $repo->findBy(['status' => 'test'], ['username' => 'INVALID']); } @@ -700,7 +707,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testFindByAssociationArray() { - $repo = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle'); + $repo = $this->_em->getRepository(CmsAddress::class); $data = $repo->findBy(['user' => [1, 2, 3]]); $query = array_pop($this->_sqlLoggerStack->queries); @@ -715,7 +722,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria()); $this->assertEquals(4, count($users)); @@ -728,7 +735,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->eq('username', 'beberlei') )); @@ -743,7 +750,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->neq('username', 'beberlei') )); @@ -758,7 +765,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->in('username', ['beberlei', 'gblanco']) )); @@ -773,7 +780,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->notIn('username', ['beberlei', 'gblanco', 'asm89']) )); @@ -788,7 +795,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $firstUserId = $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->lt('id', $firstUserId + 1) )); @@ -803,7 +810,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $firstUserId = $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->lte('id', $firstUserId + 1) )); @@ -818,7 +825,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $firstUserId = $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->gt('id', $firstUserId) )); @@ -833,7 +840,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $firstUserId = $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria( Criteria::expr()->gte('id', $firstUserId) )); @@ -848,13 +855,13 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { list($userId, $addressId) = $this->loadAssociatedFixture(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $user = $this->_em->find(CmsUser::class, $userId); $criteria = new Criteria( Criteria::expr()->eq('user', $user) ); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repository = $this->_em->getRepository(CmsAddress::class); $addresses = $repository->matching($criteria); $this->assertEquals(1, count($addresses)); @@ -871,13 +878,13 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { list($userId, $addressId) = $this->loadAssociatedFixture(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $user = $this->_em->find(CmsUser::class, $userId); $criteria = new Criteria( Criteria::expr()->in('user', [$user]) ); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repository = $this->_em->getRepository(CmsAddress::class); $addresses = $repository->matching($criteria); $this->assertEquals(1, count($addresses)); @@ -891,7 +898,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $this->loadFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $users = $repository->matching(new Criteria(Criteria::expr()->contains('name', 'Foobar'))); $this->assertEquals(0, count($users)); @@ -910,7 +917,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase { $fixtures = $this->loadFixtureUserEmail(); $user = $this->_em->merge($fixtures[0]); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $criteriaIsNull = Criteria::create()->where(Criteria::expr()->isNull('email')); $criteriaEqNull = Criteria::create()->where(Criteria::expr()->eq('email', null)); @@ -925,8 +932,8 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->assertCount(1, $usersIsNull); $this->assertCount(1, $usersEqNull); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $usersIsNull[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $usersEqNull[0]); + $this->assertInstanceOf(CmsUser::class, $usersIsNull[0]); + $this->assertInstanceOf(CmsUser::class, $usersEqNull[0]); $this->assertNull($usersIsNull[0]->getEmail()); $this->assertNull($usersEqNull[0]->getEmail()); @@ -937,11 +944,11 @@ class EntityRepositoryTest extends OrmFunctionalTestCase */ public function testCreateResultSetMappingBuilder() { - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $rsm = $repository->createResultSetMappingBuilder('u'); - $this->assertInstanceOf('Doctrine\ORM\Query\ResultSetMappingBuilder', $rsm); - $this->assertEquals(['u' => 'Doctrine\Tests\Models\CMS\CmsUser'], $rsm->aliasMap); + $this->assertInstanceOf(Query\ResultSetMappingBuilder::class, $rsm); + $this->assertEquals(['u' => CmsUser::class], $rsm->aliasMap); } /** @@ -952,7 +959,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('Unrecognized field: '); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $repository->findBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']); } @@ -964,7 +971,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('Unrecognized field: '); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $repository->findOneBy(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test']); } @@ -976,7 +983,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('Unrecognized field: '); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $result = $repository->matching(new Criteria( Criteria::expr()->eq('username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1', 'beberlei') )); @@ -993,7 +1000,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->expectException(ORMException::class); $this->expectExceptionMessage('Unrecognized identifier fields: '); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $repository->find(['username = ?; DELETE FROM cms_users; SELECT 1 WHERE 1' => 'test', 'id' => 1]); } @@ -1016,7 +1023,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->_em->persist($user2); $this->_em->flush(); - $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findBy(['status' => [null]]); + $users = $this->_em->getRepository(CmsUser::class)->findBy(['status' => [null]]); $this->assertCount(1, $users); $this->assertSame($user1, reset($users)); @@ -1043,7 +1050,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $users = $this ->_em - ->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + ->getRepository(CmsUser::class) ->findBy(['status' => ['foo', null]]); $this->assertCount(1, $users); @@ -1071,7 +1078,7 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $users = $this ->_em - ->getRepository('Doctrine\Tests\Models\CMS\CmsUser') + ->getRepository(CmsUser::class) ->findBy(['status' => ['dbal maintainer', null]]); $this->assertCount(2, $users); diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php index c0afab021..dc090a055 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php @@ -40,7 +40,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->useModelSet('ddc2504'); parent::setUp(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->_em->getClassMetadata(CmsUser::class); $class->associationMappings['groups']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $class->associationMappings['groups']['indexBy'] = 'name'; $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; @@ -52,7 +52,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase unset($class->associationMappings['articles']['cache']); unset($class->associationMappings['users']['cache']); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'); + $class = $this->_em->getClassMetadata(CmsGroup::class); $class->associationMappings['users']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $class->associationMappings['users']['indexBy'] = 'username'; @@ -63,7 +63,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase { parent::tearDown(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->_em->getClassMetadata(CmsUser::class); $class->associationMappings['groups']['fetch'] = ClassMetadataInfo::FETCH_LAZY; $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; $class->associationMappings['phonenumbers']['fetch'] = ClassMetadataInfo::FETCH_LAZY; @@ -72,7 +72,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase unset($class->associationMappings['articles']['indexBy']); unset($class->associationMappings['phonenumbers']['indexBy']); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'); + $class = $this->_em->getClassMetadata(CmsGroup::class); $class->associationMappings['users']['fetch'] = ClassMetadataInfo::FETCH_LAZY; unset($class->associationMappings['users']['indexBy']); @@ -84,7 +84,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountNotInitializesCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $this->assertFalse($user->groups->isInitialized()); @@ -101,7 +101,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountWhenNewEntityPresent() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $newGroup = new CmsGroup(); $newGroup->name = "Test4"; @@ -120,7 +120,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountWhenInitialized() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); foreach ($user->groups AS $group) { } @@ -135,7 +135,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountInverseCollection() { - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $this->assertFalse($group->users->isInitialized(), "Pre-Condition"); $this->assertEquals(4, count($group->users)); @@ -147,7 +147,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition"); $this->assertEquals(2, count($user->articles)); @@ -158,7 +158,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountOneToManyJoinedInheritance() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $this->assertFalse($otherClass->childClasses->isInitialized(), "Pre-Condition"); $this->assertEquals(2, count($otherClass->childClasses)); @@ -169,7 +169,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testFullSlice() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition: Collection is not initialized."); $someGroups = $user->groups->slice(null); @@ -182,20 +182,20 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testSlice() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition: Collection is not initialized."); $queryCount = $this->getCurrentQueryCount(); $someGroups = $user->groups->slice(0, 2); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsGroup', $someGroups); + $this->assertContainsOnly(CmsGroup::class, $someGroups); $this->assertEquals(2, count($someGroups)); $this->assertFalse($user->groups->isInitialized(), "Slice should not initialize the collection if it wasn't before!"); $otherGroup = $user->groups->slice(2, 1); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsGroup', $otherGroup); + $this->assertContainsOnly(CmsGroup::class, $otherGroup); $this->assertEquals(1, count($otherGroup)); $this->assertFalse($user->groups->isInitialized()); @@ -213,7 +213,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testSliceInitializedCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); foreach ($user->groups AS $group) { } @@ -232,15 +232,15 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testSliceInverseCollection() { - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $this->assertFalse($group->users->isInitialized(), "Pre-Condition"); $queryCount = $this->getCurrentQueryCount(); $someUsers = $group->users->slice(0, 2); $otherUsers = $group->users->slice(2, 2); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsUser', $someUsers); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsUser', $otherUsers); + $this->assertContainsOnly(CmsUser::class, $someUsers); + $this->assertContainsOnly(CmsUser::class, $otherUsers); $this->assertEquals(2, count($someUsers)); $this->assertEquals(2, count($otherUsers)); @@ -253,7 +253,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testSliceOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->articles->isInitialized(), "Pre-Condition: Collection is not initialized."); $queryCount = $this->getCurrentQueryCount(); @@ -269,11 +269,11 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->articles->isInitialized(), "Pre-Condition: Collection is not initialized."); // Test One to Many existence retrieved from DB - $article = $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId); + $article = $this->_em->find(CmsArticle::class, $this->articleId); $queryCount = $this->getCurrentQueryCount(); $this->assertTrue($user->articles->contains($article)); @@ -317,7 +317,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testLazyOneToManyJoinedInheritanceIsLazilyInitialized() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $this->assertFalse($otherClass->childClasses->isInitialized(), 'Collection is not initialized.'); } @@ -327,10 +327,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsOnOneToManyJoinedInheritanceWillNotInitializeCollectionWhenMatchingItemIsFound() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); // Test One to Many existence retrieved from DB - $childClass = $this->_em->find(DDC2504ChildClass::CLASSNAME, $this->ddc2504ChildClassId); + $childClass = $this->_em->find(DDC2504ChildClass::class, $this->ddc2504ChildClassId); $queryCount = $this->getCurrentQueryCount(); $this->assertTrue($otherClass->childClasses->contains($childClass)); @@ -343,7 +343,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsOnOneToManyJoinedInheritanceWillNotCauseQueriesWhenNonPersistentItemIsMatched() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $queryCount = $this->getCurrentQueryCount(); $this->assertFalse($otherClass->childClasses->contains(new DDC2504ChildClass())); @@ -359,7 +359,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsOnOneToManyJoinedInheritanceWillNotInitializeCollectionWithClearStateMatchingItem() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $childClass = new DDC2504ChildClass(); // Test One to Many existence with state clear @@ -377,7 +377,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsOnOneToManyJoinedInheritanceWillNotInitializeCollectionWithNewStateNotMatchingItem() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $childClass = new DDC2504ChildClass(); $this->_em->persist($childClass); @@ -394,7 +394,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountingOnOneToManyJoinedInheritanceWillNotInitializeCollection() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $this->assertEquals(2, count($otherClass->childClasses)); @@ -406,11 +406,11 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsManyToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition: Collection is not initialized."); // Test Many to Many existence retrieved from DB - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $queryCount = $this->getCurrentQueryCount(); $this->assertTrue($user->groups->contains($group)); @@ -455,10 +455,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testContainsManyToManyInverse() { - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $this->assertFalse($group->users->isInitialized(), "Pre-Condition: Collection is not initialized."); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $this->assertTrue($group->users->contains($user)); @@ -479,11 +479,11 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testRemoveElementOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->articles->isInitialized(), "Pre-Condition: Collection is not initialized."); // Test One to Many removal with Entity retrieved from DB - $article = $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId); + $article = $this->_em->find(CmsArticle::class, $this->articleId); $queryCount = $this->getCurrentQueryCount(); $user->articles->removeElement($article); @@ -533,9 +533,9 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testRemovalOfManagedElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { /* @var $otherClass DDC2504OtherClass */ - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); /* @var $childClass DDC2504ChildClass */ - $childClass = $this->_em->find(DDC2504ChildClass::CLASSNAME, $this->ddc2504ChildClassId); + $childClass = $this->_em->find(DDC2504ChildClass::class, $this->ddc2504ChildClassId); $queryCount = $this->getCurrentQueryCount(); @@ -571,7 +571,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testRemovalOfNonManagedElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { /* @var $otherClass DDC2504OtherClass */ - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $queryCount = $this->getCurrentQueryCount(); $otherClass->childClasses->removeElement(new DDC2504ChildClass()); @@ -589,7 +589,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testRemovalOfNewElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { /* @var $otherClass DDC2504OtherClass */ - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $childClass = new DDC2504ChildClass(); $this->_em->persist($childClass); @@ -610,7 +610,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testRemovalOfNewManagedElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $childClass = new DDC2504ChildClass(); $this->_em->persist($childClass); @@ -633,11 +633,11 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testRemoveElementManyToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->groups->isInitialized(), "Pre-Condition: Collection is not initialized."); // Test Many to Many removal with Entity retrieved from DB - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $queryCount = $this->getCurrentQueryCount(); $user->groups->removeElement($group); @@ -686,10 +686,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testRemoveElementManyToManyInverse() { - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $this->assertFalse($group->users->isInitialized(), "Pre-Condition: Collection is not initialized."); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $group->users->removeElement($user); @@ -713,7 +713,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testCountAfterAddThenFlush() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $newGroup = new CmsGroup(); $newGroup->name = "Test4"; @@ -736,7 +736,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testSliceOnDirtyCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); /* @var $user CmsUser */ $newGroup = new CmsGroup(); @@ -758,7 +758,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testGetIndexByIdentifier() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); /* @var $user CmsUser */ $queryCount = $this->getCurrentQueryCount(); @@ -766,7 +766,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->assertFalse($user->phonenumbers->isInitialized()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertSame($phonenumber, $this->_em->find('Doctrine\Tests\Models\CMS\CmsPhonenumber', $this->phonenumber)); + $this->assertSame($phonenumber, $this->_em->find(CmsPhonenumber::class, $this->phonenumber)); $article = $user->phonenumbers->get($this->phonenumber); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), "Getting the same entity should not cause an extra query to be executed"); @@ -777,7 +777,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testGetIndexByOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); /* @var $user CmsUser */ $queryCount = $this->getCurrentQueryCount(); @@ -786,7 +786,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->assertFalse($user->articles->isInitialized()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertSame($article, $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId)); + $this->assertSame($article, $this->_em->find(CmsArticle::class, $this->articleId)); } /** @@ -794,7 +794,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testGetIndexByManyToManyInverseSide() { - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); /* @var $group CmsGroup */ $queryCount = $this->getCurrentQueryCount(); @@ -803,7 +803,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->assertFalse($group->users->isInitialized()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertSame($user, $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId)); + $this->assertSame($user, $this->_em->find(CmsUser::class, $this->userId)); } /** @@ -811,7 +811,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testGetIndexByManyToManyOwningSide() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); /* @var $user CmsUser */ $queryCount = $this->getCurrentQueryCount(); @@ -820,7 +820,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase $this->assertFalse($user->groups->isInitialized()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertSame($group, $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId)); + $this->assertSame($group, $this->_em->find(CmsGroup::class, $this->groupId)); } /** @@ -828,14 +828,14 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase */ public function testGetNonExistentIndexBy() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertNull($user->articles->get(-1)); $this->assertNull($user->groups->get(-1)); } public function testContainsKeyIndexByOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); /* @var $user CmsUser */ $queryCount = $this->getCurrentQueryCount(); @@ -849,10 +849,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testContainsKeyIndexByOneToManyJoinedInheritance() { - $class = $this->_em->getClassMetadata(DDC2504OtherClass::CLASSNAME); + $class = $this->_em->getClassMetadata(DDC2504OtherClass::class); $class->associationMappings['childClasses']['indexBy'] = 'id'; - $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + $otherClass = $this->_em->find(DDC2504OtherClass::class, $this->ddc2504OtherClassId); $queryCount = $this->getCurrentQueryCount(); @@ -865,9 +865,9 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testContainsKeyIndexByManyToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $queryCount = $this->getCurrentQueryCount(); @@ -879,8 +879,8 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase } public function testContainsKeyIndexByManyToManyNonOwning() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $user = $this->_em->find(CmsUser::class, $this->userId2); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $queryCount = $this->getCurrentQueryCount(); @@ -893,10 +893,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testContainsKeyIndexByWithPkManyToMany() { - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->_em->getClassMetadata(CmsUser::class); $class->associationMappings['groups']['indexBy'] = 'id'; - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); $queryCount = $this->getCurrentQueryCount(); @@ -908,10 +908,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase } public function testContainsKeyIndexByWithPkManyToManyNonOwning() { - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'); + $class = $this->_em->getClassMetadata(CmsGroup::class); $class->associationMappings['users']['indexBy'] = 'id'; - $group = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId); + $group = $this->_em->find(CmsGroup::class, $this->groupId); $queryCount = $this->getCurrentQueryCount(); @@ -924,7 +924,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testContainsKeyNonExistentIndexByOneToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); $queryCount = $this->getCurrentQueryCount(); @@ -937,7 +937,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase public function testContainsKeyNonExistentIndexByManyToMany() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); $queryCount = $this->getCurrentQueryCount(); @@ -1061,14 +1061,14 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $tweetId) = $this->loadTweetFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); - $user->tweets->removeElement($this->_em->find(Tweet::CLASSNAME, $tweetId)); + $user->tweets->removeElement($this->_em->find(Tweet::class, $tweetId)); $this->_em->clear(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); $this->assertCount(1, $user->tweets, 'Element was not removed - need to update the owning side first'); } @@ -1081,23 +1081,23 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $tweetId) = $this->loadTweetFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); - $tweet = $this->_em->find(Tweet::CLASSNAME, $tweetId); + $user = $this->_em->find(User::class, $userId); + $tweet = $this->_em->find(Tweet::class, $tweetId); $user->tweets->removeElement($tweet); $this->_em->clear(); /* @var $tweet Tweet */ - $tweet = $this->_em->find(Tweet::CLASSNAME, $tweetId); + $tweet = $this->_em->find(Tweet::class, $tweetId); $this->assertInstanceOf( - Tweet::CLASSNAME, + Tweet::class, $tweet, 'Even though the collection is extra lazy, the tweet should not have been deleted' ); $this->assertInstanceOf( - User::CLASSNAME, + User::class, $tweet->author, 'Tweet author link has not been removed - need to update the owning side first' ); @@ -1111,25 +1111,25 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $tweetId) = $this->loadTweetFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); - $tweet = $this->_em->getReference(Tweet::CLASSNAME, $tweetId); + $user = $this->_em->find(User::class, $userId); + $tweet = $this->_em->getReference(Tweet::class, $tweetId); - $user->tweets->removeElement($this->_em->getReference(Tweet::CLASSNAME, $tweetId)); + $user->tweets->removeElement($this->_em->getReference(Tweet::class, $tweetId)); $this->_em->clear(); /* @var $tweet Tweet */ - $tweet = $this->_em->find(Tweet::CLASSNAME, $tweet->id); + $tweet = $this->_em->find(Tweet::class, $tweet->id); $this->assertInstanceOf( - Tweet::CLASSNAME, + Tweet::class, $tweet, 'Even though the collection is extra lazy, the tweet should not have been deleted' ); - $this->assertInstanceOf(User::CLASSNAME, $tweet->author); + $this->assertInstanceOf(User::class, $tweet->author); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); $this->assertCount(1, $user->tweets, 'Element was not removed - need to update the owning side first'); } @@ -1142,18 +1142,18 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $userListId) = $this->loadUserListFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); - $user->userLists->removeElement($this->_em->find(UserList::CLASSNAME, $userListId)); + $user->userLists->removeElement($this->_em->find(UserList::class, $userListId)); $this->_em->clear(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); $this->assertCount(0, $user->userLists, 'Element was removed from association due to orphan removal'); $this->assertNull( - $this->_em->find(UserList::CLASSNAME, $userListId), + $this->_em->find(UserList::class, $userListId), 'Element was deleted due to orphan removal' ); } @@ -1166,22 +1166,22 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $userListId) = $this->loadUserListFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); $user->userLists->removeElement(new UserList()); $this->_em->clear(); /* @var $userList UserList */ - $userList = $this->_em->find(UserList::CLASSNAME, $userListId); + $userList = $this->_em->find(UserList::class, $userListId); $this->assertInstanceOf( - UserList::CLASSNAME, + UserList::class, $userList, 'Even though the collection is extra lazy + orphan removal, the user list should not have been deleted' ); $this->assertInstanceOf( - User::CLASSNAME, + User::class, $userList->owner, 'User list to owner link has not been removed' ); @@ -1195,18 +1195,18 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase list($userId, $userListId) = $this->loadUserListFixture(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); - $user->userLists->removeElement($this->_em->getReference(UserList::CLASSNAME, $userListId)); + $user->userLists->removeElement($this->_em->getReference(UserList::class, $userListId)); $this->_em->clear(); /* @var $user User */ - $user = $this->_em->find(User::CLASSNAME, $userId); + $user = $this->_em->find(User::class, $userId); $this->assertCount(0, $user->userLists, 'Element was removed from association due to orphan removal'); $this->assertNull( - $this->_em->find(UserList::CLASSNAME, $userListId), + $this->_em->find(UserList::class, $userListId), 'Element was deleted due to orphan removal' ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php index 9dac4155d..289e55807 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php @@ -46,8 +46,8 @@ class IndexByAssociationTest extends OrmFunctionalTestCase public function testManyToOneFinder() { - /* @var $market Doctrine\Tests\Models\StockExchange\Market */ - $market = $this->_em->find('Doctrine\Tests\Models\StockExchange\Market', $this->market->getId()); + /* @var $market Market */ + $market = $this->_em->find(Market::class, $this->market->getId()); $this->assertEquals(2, count($market->stocks)); $this->assertTrue(isset($market->stocks['AAPL']), "AAPL symbol has to be key in indexed association."); @@ -70,7 +70,7 @@ class IndexByAssociationTest extends OrmFunctionalTestCase public function testManyToMany() { - $bond = $this->_em->find('Doctrine\Tests\Models\StockExchange\Bond', $this->bond->getId()); + $bond = $this->_em->find(Bond::class, $this->bond->getId()); $this->assertEquals(2, count($bond->stocks)); $this->assertTrue(isset($bond->stocks['AAPL']), "AAPL symbol has to be key in indexed association."); diff --git a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php index 21f7cabde..ab5c394e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/JoinedTableCompositeKeyTest.php @@ -1,6 +1,7 @@ _em->find( - 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass', + JoinedRootClass::class, ['keyPart1' => 'part-1', 'keyPart2' => 'part-2'] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 3a31f9c52..ca7f8c7d7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -17,10 +17,10 @@ class LifecycleCallbackTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackEventArgEntity'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestUser'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\LifecycleCallbackCascader'), + $this->_em->getClassMetadata(LifecycleCallbackEventArgEntity::class), + $this->_em->getClassMetadata(LifecycleCallbackTestEntity::class), + $this->_em->getClassMetadata(LifecycleCallbackTestUser::class), + $this->_em->getClassMetadata(LifecycleCallbackCascader::class), ] ); } catch (\Exception $e) { @@ -106,7 +106,7 @@ class LifecycleCallbackTest extends OrmFunctionalTestCase $this->_em->clear(); - $reference = $this->_em->getReference('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity', $id); + $reference = $this->_em->getReference(LifecycleCallbackTestEntity::class, $id); $this->assertFalse($reference->postLoadCallbackInvoked); $reference->getValue(); // trigger proxy load @@ -126,7 +126,7 @@ class LifecycleCallbackTest extends OrmFunctionalTestCase $this->_em->clear(); - $reference = $this->_em->find('Doctrine\Tests\ORM\Functional\LifecycleCallbackTestEntity', $id); + $reference = $this->_em->find(LifecycleCallbackTestEntity::class, $id); $this->assertTrue($reference->postLoadCallbackInvoked); $reference->postLoadCallbackInvoked = false; @@ -271,7 +271,7 @@ DQL; public function testLifecycleCallbacksGetInherited() { - $childMeta = $this->_em->getClassMetadata(__NAMESPACE__ . '\LifecycleCallbackChildEntity'); + $childMeta = $this->_em->getClassMetadata(LifecycleCallbackChildEntity::class); $this->assertEquals(['prePersist' => [0 => 'doStuff']], $childMeta->lifecycleCallbacks); } @@ -331,45 +331,14 @@ DQL; $this->assertArrayHasKey('preRemoveHandler', $e->calls); $this->assertArrayHasKey('postRemoveHandler', $e->calls); - $this->assertInstanceOf( - 'Doctrine\ORM\Event\PreFlushEventArgs', - $e->calls['preFlushHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['postLoadHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['prePersistHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['postPersistHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\PreUpdateEventArgs', - $e->calls['preUpdateHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['postUpdateHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['preRemoveHandler'] - ); - - $this->assertInstanceOf( - 'Doctrine\ORM\Event\LifecycleEventArgs', - $e->calls['postRemoveHandler'] - ); + $this->assertInstanceOf(PreFlushEventArgs::class, $e->calls['preFlushHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['postLoadHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['prePersistHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['postPersistHandler']); + $this->assertInstanceOf(PreUpdateEventArgs::class, $e->calls['preUpdateHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['postUpdateHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['preRemoveHandler']); + $this->assertInstanceOf(LifecycleEventArgs::class, $e->calls['postRemoveHandler']); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index b1ace3513..43a3cbf5b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -46,32 +46,32 @@ class GearmanLockTest extends OrmFunctionalTestCase public function testFindWithLock() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); } public function testFindWithWriteThenReadLock() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_READ); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_READ); $this->assertLockWorked(); } public function testFindWithReadThenWriteLock() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_READ); - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_READ); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); } public function testFindWithOneLock() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::NONE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::NONE); $this->assertLockDoesNotBlock(); } @@ -79,39 +79,39 @@ class GearmanLockTest extends OrmFunctionalTestCase public function testDqlWithLock() { $this->asyncDqlWithLock('SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a', [], LockMode::PESSIMISTIC_WRITE); - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); } public function testLock() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); - $this->asyncLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); } public function testLock2() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); - $this->asyncLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_READ); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_READ); $this->assertLockWorked(); } public function testLock3() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_READ); - $this->asyncLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_READ); + $this->asyncLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockWorked(); } public function testLock4() { - $this->asyncFindWithLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::NONE); - $this->asyncLock('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId, LockMode::PESSIMISTIC_WRITE); + $this->asyncFindWithLock(CmsArticle::class, $this->articleId, LockMode::NONE); + $this->asyncLock(CmsArticle::class, $this->articleId, LockMode::PESSIMISTIC_WRITE); $this->assertLockDoesNotBlock(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index ff1502daa..b5aa9c0ec 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -2,9 +2,9 @@ namespace Doctrine\Tests\ORM\Functional\Locking; -use Doctrine\ORM\OptimisticLockException; -use Doctrine\DBAL\LockMode; use DateTime; +use Doctrine\DBAL\LockMode; +use Doctrine\ORM\OptimisticLockException; use Doctrine\Tests\OrmFunctionalTestCase; class OptimisticTest extends OrmFunctionalTestCase @@ -16,10 +16,10 @@ class OptimisticTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedParent'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticJoinedChild'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticStandard'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Locking\OptimisticTimestamp') + $this->_em->getClassMetadata(OptimisticJoinedParent::class), + $this->_em->getClassMetadata(OptimisticJoinedChild::class), + $this->_em->getClassMetadata(OptimisticStandard::class), + $this->_em->getClassMetadata(OptimisticTimestamp::class) ] ); } catch (\Exception $e) { @@ -175,7 +175,7 @@ class OptimisticTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $proxy = $this->_em->getReference('Doctrine\Tests\ORM\Functional\Locking\OptimisticStandard', $test->id); + $proxy = $this->_em->getReference(OptimisticStandard::class, $test->id); $this->_em->lock($proxy, LockMode::OPTIMISTIC, 1); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index b6d5957a2..9aa044f5d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\UnitOfWork; +use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\Tests\Models\CMS\CmsTag; -use Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\Tests\Models\CMS\CmsGroup, - Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -49,7 +50,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(2, $this->_em->getUnitOfWork()->size()); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); $this->assertEquals('Guilherme', $result[0]->name); $this->assertEquals(1, $result[0]->getGroups()->count()); $groups = $result[0]->getGroups(); @@ -58,8 +59,8 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $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()); + $this->assertInstanceOf(PersistentCollection::class, $groups); + $this->assertInstanceOf(PersistentCollection::class, $groups[0]->getUsers()); $groups[0]->getUsers()->clear(); $groups->clear(); @@ -152,7 +153,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $user->groups[] = $group; } - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->groups); + $this->assertInstanceOf(PersistentCollection::class, $user->groups); $this->assertTrue($user->groups->isDirty()); $this->assertEquals($groupCount, count($user->groups), "There should be 10 groups in the collection."); @@ -187,7 +188,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $this->_em->clear(); /* @var $freshUser CmsUser */ - $freshUser = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->getId()); + $freshUser = $this->_em->find(CmsUser::class, $user->getId()); $newGroup = new CmsGroup(); $newGroup->setName('12Monkeys'); $freshUser->addGroup($newGroup); @@ -202,7 +203,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $this->_em->clear(); - $freshUser = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->getId()); + $freshUser = $this->_em->find(CmsUser::class, $user->getId()); $this->assertEquals(3, count($freshUser->getGroups())); } @@ -333,7 +334,7 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase $coll = new ArrayCollection([$group1, $group2]); $user->groups = $coll; $this->_em->flush(); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->groups, + $this->assertInstanceOf(PersistentCollection::class, $user->groups, "UnitOfWork should have replaced ArrayCollection with PersistentCollection."); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php index 51121b09a..9c70ab7f6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php @@ -115,8 +115,8 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati //$query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); $result = $query->getResult(); $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $result[1]); + $this->assertInstanceOf(ECommerceCategory::class, $result[0]); + $this->assertInstanceOf(ECommerceCategory::class, $result[1]); $prods1 = $result[0]->getProducts(); $prods2 = $result[1]->getProducts(); $this->assertTrue($prods1->isInitialized()); @@ -155,10 +155,10 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati $this->assertEquals(2, count($secondCategoryProducts)); // lazy-load $this->assertTrue($secondCategoryProducts->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstCategoryProducts[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstCategoryProducts[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondCategoryProducts[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondCategoryProducts[1]); + $this->assertInstanceOf(ECommerceProduct::class, $firstCategoryProducts[0]); + $this->assertInstanceOf(ECommerceProduct::class, $firstCategoryProducts[1]); + $this->assertInstanceOf(ECommerceProduct::class, $secondCategoryProducts[0]); + $this->assertInstanceOf(ECommerceProduct::class, $secondCategoryProducts[1]); $this->assertCollectionEquals($firstCategoryProducts, $secondCategoryProducts); } @@ -190,10 +190,10 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati $this->assertEquals(2, count($secondProductCategories)); // lazy-load $this->assertTrue($secondProductCategories->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $firstProductCategories[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $firstProductCategories[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $secondProductCategories[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $secondProductCategories[1]); + $this->assertInstanceOf(ECommerceCategory::class, $firstProductCategories[0]); + $this->assertInstanceOf(ECommerceCategory::class, $firstProductCategories[1]); + $this->assertInstanceOf(ECommerceCategory::class, $secondProductCategories[0]); + $this->assertInstanceOf(ECommerceCategory::class, $secondProductCategories[1]); $this->assertCollectionEquals($firstProductCategories, $secondProductCategories); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php index 3ad406880..559cd4ba6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php @@ -72,7 +72,7 @@ class ManyToManySelfReferentialAssociationTest extends AbstractManyToManyAssocia { $this->_createLoadingFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $metadata = $this->_em->getClassMetadata(ECommerceProduct::class); $metadata->associationMappings['related']['fetch'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery('SELECT p FROM Doctrine\Tests\Models\ECommerce\ECommerceProduct p'); @@ -93,10 +93,10 @@ class ManyToManySelfReferentialAssociationTest extends AbstractManyToManyAssocia $this->assertEquals(2, count($firstRelatedBy)); $this->assertEquals(2, count($secondRelatedBy)); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstRelatedBy[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstRelatedBy[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondRelatedBy[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondRelatedBy[1]); + $this->assertInstanceOf(ECommerceProduct::class, $firstRelatedBy[0]); + $this->assertInstanceOf(ECommerceProduct::class, $firstRelatedBy[1]); + $this->assertInstanceOf(ECommerceProduct::class, $secondRelatedBy[0]); + $this->assertInstanceOf(ECommerceProduct::class, $secondRelatedBy[1]); $this->assertCollectionEquals($firstRelatedBy, $secondRelatedBy); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php index 241b3c2fb..20e31db00 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php @@ -67,8 +67,8 @@ class ManyToManyUnidirectionalAssociationTest extends AbstractManyToManyAssociat $products = $firstCart->getProducts(); $secondCart = $result[1]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[1]); + $this->assertInstanceOf(ECommerceProduct::class, $products[0]); + $this->assertInstanceOf(ECommerceProduct::class, $products[1]); $this->assertCollectionEquals($products, $secondCart->getProducts()); //$this->assertEquals("Doctrine 1.x Manual", $products[0]->getName()); //$this->assertEquals("Doctrine 2.x Manual", $products[1]->getName()); @@ -77,7 +77,7 @@ class ManyToManyUnidirectionalAssociationTest extends AbstractManyToManyAssociat public function testLazyLoadsCollection() { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCart'); + $metadata = $this->_em->getClassMetadata(ECommerceCart::class); $metadata->associationMappings['products']['fetch'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery('SELECT c FROM Doctrine\Tests\Models\ECommerce\ECommerceCart c'); @@ -86,8 +86,8 @@ class ManyToManyUnidirectionalAssociationTest extends AbstractManyToManyAssociat $products = $firstCart->getProducts(); $secondCart = $result[1]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[1]); + $this->assertInstanceOf(ECommerceProduct::class, $products[0]); + $this->assertInstanceOf(ECommerceProduct::class, $products[1]); $this->assertCollectionEquals($products, $secondCart->getProducts()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php index fb7f0a724..97c34bba3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php @@ -1,6 +1,8 @@ _em->find(get_class($file), $file->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $cleanFile->getParent()); + $this->assertInstanceOf(Directory::class, $cleanFile->getParent()); + $this->assertInstanceOf(Proxy::class, $cleanFile->getParent()); $this->assertEquals($directory->getId(), $cleanFile->getParent()->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()->getParent()); + $this->assertInstanceOf(Directory::class, $cleanFile->getParent()->getParent()); $this->assertEquals($root->getId(), $cleanFile->getParent()->getParent()->getId()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php index 48263f3c4..fab94a906 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php @@ -17,8 +17,8 @@ class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(Country::CLASSNAME), - $this->_em->getClassMetadata(CompositeToOneKeyState::CLASSNAME), + $this->_em->getClassMetadata(Country::class), + $this->_em->getClassMetadata(CompositeToOneKeyState::class), ] ); } @@ -39,9 +39,9 @@ class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase /* @var $merged CompositeToOneKeyState */ $merged = $this->_em->merge($state); - $this->assertInstanceOf(CompositeToOneKeyState::CLASSNAME, $state); + $this->assertInstanceOf(CompositeToOneKeyState::class, $state); $this->assertNotSame($state, $merged); - $this->assertInstanceOf(Country::CLASSNAME, $merged->country); + $this->assertInstanceOf(Country::class, $merged->country); $this->assertNotSame($country, $merged->country); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php index e32b0385c..3d0acd1f8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php @@ -7,6 +7,7 @@ use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Logging\SQLLogger; use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\Models\Generic\DateTimeModel; use Doctrine\Tests\OrmFunctionalTestCase; @@ -31,11 +32,11 @@ class MergeProxiesTest extends OrmFunctionalTestCase */ public function testMergeDetachedUnInitializedProxy() { - $detachedUninitialized = $this->_em->getReference(DateTimeModel::CLASSNAME, 123); + $detachedUninitialized = $this->_em->getReference(DateTimeModel::class, 123); $this->_em->clear(); - $managed = $this->_em->getReference(DateTimeModel::CLASSNAME, 123); + $managed = $this->_em->getReference(DateTimeModel::class, 123); $this->assertSame($managed, $this->_em->merge($detachedUninitialized)); @@ -51,11 +52,11 @@ class MergeProxiesTest extends OrmFunctionalTestCase */ public function testMergeUnserializedUnInitializedProxy() { - $detachedUninitialized = $this->_em->getReference(DateTimeModel::CLASSNAME, 123); + $detachedUninitialized = $this->_em->getReference(DateTimeModel::class, 123); $this->_em->clear(); - $managed = $this->_em->getReference(DateTimeModel::CLASSNAME, 123); + $managed = $this->_em->getReference(DateTimeModel::class, 123); $this->assertSame( $managed, @@ -74,7 +75,7 @@ class MergeProxiesTest extends OrmFunctionalTestCase */ public function testMergeManagedProxy() { - $managed = $this->_em->getReference(DateTimeModel::CLASSNAME, 123); + $managed = $this->_em->getReference(DateTimeModel::class, 123); $this->assertSame($managed, $this->_em->merge($managed)); @@ -98,9 +99,9 @@ class MergeProxiesTest extends OrmFunctionalTestCase $this->_em->flush($date); $this->_em->clear(); - $managed = $this->_em->getReference(DateTimeModel::CLASSNAME, $date->id); + $managed = $this->_em->getReference(DateTimeModel::class, $date->id); - $this->assertInstanceOf('Doctrine\Common\Proxy\Proxy', $managed); + $this->assertInstanceOf(Proxy::class, $managed); $this->assertFalse($managed->__isInitialized()); $date->date = $dateTime = new \DateTime(); @@ -134,8 +135,8 @@ class MergeProxiesTest extends OrmFunctionalTestCase $queryCount1 = count($logger1->queries); $queryCount2 = count($logger2->queries); - $proxy1 = $em1->getReference(DateTimeModel::CLASSNAME, $file1->id); - $proxy2 = $em2->getReference(DateTimeModel::CLASSNAME, $file1->id); + $proxy1 = $em1->getReference(DateTimeModel::class, $file1->id); + $proxy2 = $em2->getReference(DateTimeModel::class, $file1->id); $merged2 = $em2->merge($proxy1); $this->assertNotSame($proxy1, $merged2); @@ -195,10 +196,10 @@ class MergeProxiesTest extends OrmFunctionalTestCase $queryCount1 = count($logger1->queries); $queryCount2 = count($logger1->queries); - $unManagedProxy = $em1->getReference(DateTimeModel::CLASSNAME, $file1->id); + $unManagedProxy = $em1->getReference(DateTimeModel::class, $file1->id); $mergedInstance = $em2->merge($unManagedProxy); - $this->assertNotInstanceOf('Doctrine\Common\Proxy\Proxy', $mergedInstance); + $this->assertNotInstanceOf(Proxy::class, $mergedInstance); $this->assertNotSame($unManagedProxy, $mergedInstance); $this->assertFalse($unManagedProxy->__isInitialized()); @@ -258,7 +259,7 @@ class MergeProxiesTest extends OrmFunctionalTestCase $entityManager = EntityManager::create($connection, $config); - (new SchemaTool($entityManager))->createSchema([$entityManager->getClassMetadata(DateTimeModel::CLASSNAME)]); + (new SchemaTool($entityManager))->createSchema([$entityManager->getClassMetadata(DateTimeModel::class)]); return $entityManager; } diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php index e77b39694..b549a4201 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeSharedEntitiesTest.php @@ -17,8 +17,8 @@ class MergeSharedEntitiesTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEFile'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\MSEPicture'), + $this->_em->getClassMetadata(MSEFile::class), + $this->_em->getClassMetadata(MSEPicture::class), ] ); } catch (ToolsException $ignored) { diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 9d9eb233d..93eab2667 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -3,17 +3,22 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; - use Doctrine\ORM\Internal\Hydration\HydrationException; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\ORM\Query\ResultSetMappingBuilder; -use Doctrine\ORM\Query\Parameter; -use Doctrine\Tests\Models\CMS\CmsUser; -use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Company\CompanyContract; use Doctrine\Tests\Models\Company\CompanyEmployee; +use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\Models\Company\CompanyFlexContract; use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\DDC3899\DDC3899FixContract; +use Doctrine\Tests\Models\DDC3899\DDC3899User; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -45,7 +50,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('name'), 'name'); @@ -55,7 +60,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals('Roman', $users[0]->name); } @@ -80,7 +85,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $rsm->addEntityResult(CmsAddress::class, 'a'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('country'), 'country'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('zip'), 'zip'); @@ -119,11 +124,11 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('name'), 'name'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('status'), 'status'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p', 'u', 'phonenumbers'); + $rsm->addJoinedEntityResult(CmsPhonenumber::class, 'p', 'u', 'phonenumbers'); $rsm->addFieldResult('p', $this->platform->getSQLResultCasing('phonenumber'), 'phonenumber'); $query = $this->_em->createNativeQuery('SELECT id, name, status, phonenumber FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', $rsm); @@ -131,9 +136,9 @@ class NativeQueryTest extends OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $users[0]->getPhonenumbers()); $this->assertTrue($users[0]->getPhonenumbers()->isInitialized()); $this->assertEquals(1, count($users[0]->getPhonenumbers())); $phones = $users[0]->getPhonenumbers(); @@ -164,11 +169,11 @@ class NativeQueryTest extends OrmFunctionalTestCase $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('name'), 'name'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('status'), 'status'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address'); + $rsm->addJoinedEntityResult(CmsAddress::class, 'a', 'u', 'address'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('a_id'), 'id'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('country'), 'country'); $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('zip'), 'zip'); @@ -180,11 +185,11 @@ class NativeQueryTest extends OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $users[0]->getPhonenumbers()); $this->assertFalse($users[0]->getPhonenumbers()->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $users[0]->getAddress()); + $this->assertInstanceOf(CmsAddress::class, $users[0]->getAddress()); $this->assertTrue($users[0]->getAddress()->getUser() == $users[0]); $this->assertEquals('germany', $users[0]->getAddress()->getCountry()); $this->assertEquals(10827, $users[0]->getAddress()->getZipCode()); @@ -230,16 +235,16 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p', 'u', 'phonenumbers'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); + $rsm->addJoinedEntityFromClassMetadata(CmsPhonenumber::class, 'p', 'u', 'phonenumbers'); $query = $this->_em->createNativeQuery('SELECT u.*, p.* FROM cms_users u LEFT JOIN cms_phonenumbers p ON u.id = p.user_id WHERE username = ?', $rsm); $query->setParameter(1, 'romanb'); $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $users[0]->getPhonenumbers()); $this->assertTrue($users[0]->getPhonenumbers()->isInitialized()); $this->assertEquals(1, count($users[0]->getPhonenumbers())); $phones = $users[0]->getPhonenumbers(); @@ -249,7 +254,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p'); + $rsm->addRootEntityFromClassMetadata(CmsPhonenumber::class, 'p'); $query = $this->_em->createNativeQuery('SELECT p.* FROM cms_phonenumbers p WHERE p.phonenumber = ?', $rsm); $query->setParameter(1, $phone->phonenumber); $phone = $query->getSingleResult(); @@ -280,8 +285,8 @@ class NativeQueryTest extends OrmFunctionalTestCase $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address', ['id' => 'a_id'] + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); + $rsm->addJoinedEntityFromClassMetadata(CmsAddress::class, 'a', 'u', 'address', ['id' => 'a_id'] ); $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm); @@ -290,11 +295,11 @@ class NativeQueryTest extends OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $users[0]->getPhonenumbers()); $this->assertFalse($users[0]->getPhonenumbers()->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $users[0]->getAddress()); + $this->assertInstanceOf(CmsAddress::class, $users[0]->getAddress()); $this->assertTrue($users[0]->getAddress()->getUser() == $users[0]); $this->assertEquals('germany', $users[0]->getAddress()->getCountry()); $this->assertEquals(10827, $users[0]->getAddress()->getZipCode()); @@ -303,7 +308,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $rsm->addRootEntityFromClassMetadata(CmsAddress::class, 'a'); $query = $this->_em->createNativeQuery('SELECT a.* FROM cms_addresses a WHERE a.id = ?', $rsm); $query->setParameter(1, $addr->getId()); $address = $query->getSingleResult(); @@ -318,7 +323,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testConcreteClassInSingleTableInheritanceSchemaWithRSMBuilderIsFine() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\Company\CompanyFixContract', 'c'); + $rsm->addRootEntityFromClassMetadata(CompanyFixContract::class, 'c'); } /** @@ -330,7 +335,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->expectExceptionMessage('ResultSetMapping builder does not currently support your inheritance scheme.'); $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\Company\CompanyContract', 'c'); + $rsm->addRootEntityFromClassMetadata(CompanyContract::class, 'c'); } /** @@ -339,8 +344,8 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testRSMBuilderThrowsExceptionOnColumnConflict() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'u', 'address'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); + $rsm->addJoinedEntityFromClassMetadata(CmsAddress::class, 'a', 'u', 'address'); } /** @@ -349,8 +354,8 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testUnknownParentAliasThrowsException() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a', 'un', 'address', ['id' => 'a_id'] + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); + $rsm->addJoinedEntityFromClassMetadata(CmsAddress::class, 'a', 'un', 'address', ['id' => 'a_id'] ); $query = $this->_em->createNativeQuery('SELECT u.*, a.*, a.id AS a_id FROM cms_users u INNER JOIN cms_addresses a ON u.id = a.user_id WHERE u.username = ?', $rsm); @@ -387,12 +392,12 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); + $repository = $this->_em->getRepository(CmsAddress::class); $query = $repository->createNativeNamedQuery('find-all'); $result = $query->getResult(); $this->assertCount(1, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $result[0]); + $this->assertInstanceOf(CmsAddress::class, $result[0]); $this->assertEquals($addr->id, $result[0]->id); $this->assertEquals($addr->city, $result[0]->city); $this->assertEquals($addr->country, $result[0]->country); @@ -419,14 +424,14 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $result = $repository->createNativeNamedQuery('fetchIdAndUsernameWithResultClass') ->setParameter(1, 'FabioBatSilva')->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); $this->assertNull($result[0]->name); $this->assertNull($result[0]->email); $this->assertEquals($user->id, $result[0]->id); @@ -439,12 +444,12 @@ class NativeQueryTest extends OrmFunctionalTestCase ->setParameter(1, 'FabioBatSilva')->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); $this->assertEquals($user->id, $result[0]->id); $this->assertEquals('Fabio B. Silva', $result[0]->name); $this->assertEquals('FabioBatSilva', $result[0]->username); $this->assertEquals('dev', $result[0]->status); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsEmail', $result[0]->email); + $this->assertInstanceOf(CmsEmail::class, $result[0]->email); } @@ -471,18 +476,18 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $result = $repository->createNativeNamedQuery('fetchJoinedAddress') ->setParameter(1, 'FabioBatSilva')->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); $this->assertEquals('Fabio B. Silva', $result[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $result[0]->getPhonenumbers()); $this->assertFalse($result[0]->getPhonenumbers()->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $result[0]->getAddress()); + $this->assertInstanceOf(CmsAddress::class, $result[0]->getAddress()); $this->assertTrue($result[0]->getAddress()->getUser() == $result[0]); $this->assertEquals('Brazil', $result[0]->getAddress()->getCountry()); $this->assertEquals(10827, $result[0]->getAddress()->getZipCode()); @@ -509,15 +514,15 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $result = $repository->createNativeNamedQuery('fetchJoinedPhonenumber') ->setParameter(1, 'FabioBatSilva')->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); $this->assertEquals('Fabio B. Silva', $result[0]->name); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0]->getPhonenumbers()); + $this->assertInstanceOf(PersistentCollection::class, $result[0]->getPhonenumbers()); $this->assertTrue($result[0]->getPhonenumbers()->isInitialized()); $this->assertEquals(1, count($result[0]->getPhonenumbers())); $phones = $result[0]->getPhonenumbers(); @@ -557,7 +562,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $result = $repository->createNativeNamedQuery('fetchUserPhonenumberCount') ->setParameter(1, ['test','FabioBatSilva'])->getResult(); @@ -567,12 +572,12 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->assertTrue(is_array($result[1])); // first user => 2 phonenumbers - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf(CmsUser::class, $result[0][0]); $this->assertEquals('Fabio B. Silva', $result[0][0]->name); $this->assertEquals(2, $result[0]['numphones']); // second user => 1 phonenumbers - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); + $this->assertInstanceOf(CmsUser::class, $result[1][0]); $this->assertEquals('test tester', $result[1][0]->name); $this->assertEquals(1, $result[1]['numphones']); } @@ -596,14 +601,14 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson'); + $repository = $this->_em->getRepository(CompanyPerson::class); $result = $repository->createNativeNamedQuery('fetchAllWithSqlResultSetMapping') ->getResult(); $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result[1]); + $this->assertInstanceOf(CompanyPerson::class, $result[0]); + $this->assertInstanceOf(CompanyEmployee::class, $result[1]); $this->assertTrue(is_numeric($result[0]->getId())); $this->assertTrue(is_numeric($result[1]->getId())); $this->assertEquals('Fabio B. Silva', $result[0]->getName()); @@ -617,8 +622,8 @@ class NativeQueryTest extends OrmFunctionalTestCase ->getResult(); $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result[1]); + $this->assertInstanceOf(CompanyPerson::class, $result[0]); + $this->assertInstanceOf(CompanyEmployee::class, $result[1]); $this->assertTrue(is_numeric($result[0]->getId())); $this->assertTrue(is_numeric($result[1]->getId())); $this->assertEquals('Fabio B. Silva', $result[0]->getName()); @@ -657,7 +662,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); + $repository = $this->_em->getRepository(CmsUser::class); $query = $repository->createNativeNamedQuery('fetchMultipleJoinsEntityResults'); $result = $query->getResult(); @@ -665,9 +670,9 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->assertEquals(1, count($result)); $this->assertTrue(is_array($result[0])); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf(CmsUser::class, $result[0][0]); $this->assertEquals('Fabio B. Silva', $result[0][0]->name); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $result[0][0]->getAddress()); + $this->assertInstanceOf(CmsAddress::class, $result[0][0]->getAddress()); $this->assertTrue($result[0][0]->getAddress()->getUser() == $result[0][0]); $this->assertEquals('Brazil', $result[0][0]->getAddress()->getCountry()); $this->assertEquals(10827, $result[0][0]->getAddress()->getZipCode()); @@ -681,8 +686,8 @@ class NativeQueryTest extends OrmFunctionalTestCase */ public function testNamedNativeQueryInheritance() { - $contractMetadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyContract'); - $flexMetadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyFlexContract'); + $contractMetadata = $this->_em->getClassMetadata(CompanyContract::class); + $flexMetadata = $this->_em->getClassMetadata(CompanyFlexContract::class); $contractQueries = $contractMetadata->getNamedNativeQueries(); $flexQueries = $flexMetadata->getNamedNativeQueries(); @@ -693,39 +698,39 @@ class NativeQueryTest extends OrmFunctionalTestCase // contract queries $this->assertEquals('all-contracts', $contractQueries['all-contracts']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContract', $contractQueries['all-contracts']['resultClass']); + $this->assertEquals(CompanyContract::class, $contractQueries['all-contracts']['resultClass']); $this->assertEquals('all', $contractQueries['all']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContract', $contractQueries['all']['resultClass']); + $this->assertEquals(CompanyContract::class, $contractQueries['all']['resultClass']); // flex contract queries $this->assertEquals('all-contracts', $flexQueries['all-contracts']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexQueries['all-contracts']['resultClass']); + $this->assertEquals(CompanyFlexContract::class, $flexQueries['all-contracts']['resultClass']); $this->assertEquals('all-flex', $flexQueries['all-flex']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexQueries['all-flex']['resultClass']); + $this->assertEquals(CompanyFlexContract::class, $flexQueries['all-flex']['resultClass']); $this->assertEquals('all', $flexQueries['all']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexQueries['all']['resultClass']); + $this->assertEquals(CompanyFlexContract::class, $flexQueries['all']['resultClass']); // contract result mapping $this->assertEquals('mapping-all-contracts', $contractMappings['mapping-all-contracts']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContract', $contractMappings['mapping-all-contracts']['entities'][0]['entityClass']); + $this->assertEquals(CompanyContract::class, $contractMappings['mapping-all-contracts']['entities'][0]['entityClass']); $this->assertEquals('mapping-all', $contractMappings['mapping-all']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContract', $contractMappings['mapping-all-contracts']['entities'][0]['entityClass']); + $this->assertEquals(CompanyContract::class, $contractMappings['mapping-all-contracts']['entities'][0]['entityClass']); // flex contract result mapping $this->assertEquals('mapping-all-contracts', $flexMappings['mapping-all-contracts']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexMappings['mapping-all-contracts']['entities'][0]['entityClass']); + $this->assertEquals(CompanyFlexContract::class, $flexMappings['mapping-all-contracts']['entities'][0]['entityClass']); $this->assertEquals('mapping-all', $flexMappings['mapping-all']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexMappings['mapping-all']['entities'][0]['entityClass']); + $this->assertEquals(CompanyFlexContract::class, $flexMappings['mapping-all']['entities'][0]['entityClass']); $this->assertEquals('mapping-all-flex', $flexMappings['mapping-all-flex']['name']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexContract', $flexMappings['mapping-all-flex']['entities'][0]['entityClass']); + $this->assertEquals(CompanyFlexContract::class, $flexMappings['mapping-all-flex']['entities'][0]['entityClass']); } @@ -735,7 +740,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseNoRenameSingleEntity() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); $selectClause = $rsm->generateSelectClause(); @@ -748,7 +753,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseCustomRenames() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u', [ + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u', [ 'id' => 'id1', 'username' => 'username2' ] @@ -765,7 +770,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseRenameTableAlias() { $rsm = new ResultSetMappingBuilder($this->_em); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); $selectClause = $rsm->generateSelectClause(['u' => 'u1']); @@ -778,7 +783,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseIncrement() { $rsm = new ResultSetMappingBuilder($this->_em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); $selectClause = $rsm->generateSelectClause(); @@ -791,7 +796,7 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseToString() { $rsm = new ResultSetMappingBuilder($this->_em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT); - $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addRootEntityFromClassMetadata(CmsUser::class, 'u'); $this->assertSQLEquals('u.id AS id0, u.status AS status1, u.username AS username2, u.name AS name3, u.email_id AS email_id4', (string)$rsm); } @@ -802,8 +807,8 @@ class NativeQueryTest extends OrmFunctionalTestCase public function testGenerateSelectClauseWithDiscriminatorColumn() { $rsm = new ResultSetMappingBuilder($this->_em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT); - $rsm->addEntityResult('Doctrine\Tests\Models\DDC3899\DDC3899User', 'u'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\DDC3899\DDC3899FixContract', 'c', 'u', 'contracts'); + $rsm->addEntityResult(DDC3899User::class, 'u'); + $rsm->addJoinedEntityResult(DDC3899FixContract::class, 'c', 'u', 'contracts'); $rsm->addFieldResult('u', $this->platform->getSQLResultCasing('id'), 'id'); $rsm->setDiscriminatorColumn('c', $this->platform->getSQLResultCasing('discr')); diff --git a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php index 972412199..1422dcd9a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php @@ -3,10 +3,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Query; +use Doctrine\Tests\Models\CMS\CmsAddressDTO; 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\Tests\Models\CMS\CmsUserDTO; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -122,9 +124,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1]->name); @@ -165,9 +167,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1]->name); @@ -201,9 +203,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); } public function testShouldSupportFromEntityNamespaceAlias() @@ -229,9 +231,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); } public function testShouldSupportValueObjectNamespaceAlias() @@ -257,9 +259,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); } public function testShouldSupportLiteralExpression() @@ -290,9 +292,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); @@ -338,9 +340,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); @@ -380,9 +382,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1]->name); @@ -440,9 +442,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1]->name); @@ -500,9 +502,9 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]); $this->assertEquals($this->fixtures[0]->name, $result[0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1]->name); @@ -558,13 +560,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][1]); $this->assertEquals($this->fixtures[0]->name, $result[0][0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1][0]->name); @@ -610,13 +612,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2]['cmsAddress']); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); @@ -662,13 +664,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][0]); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); @@ -715,13 +717,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][1]); $this->assertEquals($this->fixtures[0]->name, $result[0][0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1][0]->name); @@ -772,13 +774,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2]['cmsAddress']); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); @@ -829,13 +831,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][0]); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); @@ -887,13 +889,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsUserDTO::class, $result[2][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][1]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][1]); $this->assertEquals($this->fixtures[0]->name, $result[0][0]->name); $this->assertEquals($this->fixtures[1]->name, $result[1][0]->name); @@ -949,13 +951,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1]['cmsAddress']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1]['cmsAddress']); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2]['cmsAddress']); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); @@ -1011,13 +1013,13 @@ class NewOperatorTest extends OrmFunctionalTestCase $this->assertCount(3, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[0]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[1]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUserDTO', $result[2]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[0]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[1]['cmsUser']); + $this->assertInstanceOf(CmsUserDTO::class, $result[2]['cmsUser']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[0][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[1][0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddressDTO', $result[2][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[0][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[1][0]); + $this->assertInstanceOf(CmsAddressDTO::class, $result[2][0]); $this->assertEquals($this->fixtures[0]->name, $result[0]['cmsUser']->name); $this->assertEquals($this->fixtures[1]->name, $result[1]['cmsUser']->name); diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php index a289ef9dd..24dc6fd24 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php @@ -20,8 +20,8 @@ class NotifyPolicyTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyUser'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\NotifyGroup') + $this->_em->getClassMetadata(NotifyUser::class), + $this->_em->getClassMetadata(NotifyGroup::class) ] ); } catch (\Exception $e) { @@ -57,9 +57,9 @@ class NotifyPolicyTest extends OrmFunctionalTestCase $groupId = $group->getId(); unset($user, $group); - $user = $this->_em->find(__NAMESPACE__.'\NotifyUser', $userId); + $user = $this->_em->find(NotifyUser::class, $userId); $this->assertEquals(1, $user->getGroups()->count()); - $group = $this->_em->find(__NAMESPACE__.'\NotifyGroup', $groupId); + $group = $this->_em->find(NotifyGroup::class, $groupId); $this->assertEquals(1, $group->getUsers()->count()); $this->assertEquals(1, count($user->listeners)); @@ -82,11 +82,11 @@ class NotifyPolicyTest extends OrmFunctionalTestCase $group2Id = $group2->getId(); unset($group2, $user); - $user = $this->_em->find(__NAMESPACE__.'\NotifyUser', $userId); + $user = $this->_em->find(NotifyUser::class, $userId); $this->assertEquals(2, $user->getGroups()->count()); - $group2 = $this->_em->find(__NAMESPACE__.'\NotifyGroup', $group2Id); + $group2 = $this->_em->find(NotifyGroup::class, $group2Id); $this->assertEquals(1, $group2->getUsers()->count()); - $group = $this->_em->find(__NAMESPACE__.'\NotifyGroup', $groupId); + $group = $this->_em->find(NotifyGroup::class, $groupId); $this->assertEquals(1, $group->getUsers()->count()); $this->assertEquals('geeks', $group->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index ddc7378f7..95309c605 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -2,9 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceProduct; -use Doctrine\Tests\Models\ECommerce\ECommerceFeature; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\Tests\Models\ECommerce\ECommerceFeature; +use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -76,13 +78,13 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase $features = $product->getFeatures(); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[0]); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $features[0]->getProduct()); + $this->assertInstanceOf(ECommerceFeature::class, $features[0]); + $this->assertNotInstanceOf(Proxy::class, $features[0]->getProduct()); $this->assertSame($product, $features[0]->getProduct()); $this->assertEquals('Model writing tutorial', $features[0]->getDescription()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[1]); + $this->assertInstanceOf(ECommerceFeature::class, $features[1]); $this->assertSame($product, $features[1]->getProduct()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $features[1]->getProduct()); + $this->assertNotInstanceOf(Proxy::class, $features[1]->getProduct()); $this->assertEquals('Annotations examples', $features[1]->getDescription()); } @@ -96,11 +98,11 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase $features = $product->getFeatures(); $this->assertFalse($features->isInitialized()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[0]); + $this->assertInstanceOf(ECommerceFeature::class, $features[0]); $this->assertTrue($features->isInitialized()); $this->assertSame($product, $features[0]->getProduct()); $this->assertEquals('Model writing tutorial', $features[0]->getDescription()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[1]); + $this->assertInstanceOf(ECommerceFeature::class, $features[1]); $this->assertSame($product, $features[1]->getProduct()); $this->assertEquals('Annotations examples', $features[1]->getDescription()); } @@ -113,8 +115,8 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase $features = $query->getResult(); $product = $features[0]->getProduct(); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $product); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $product); + $this->assertInstanceOf(Proxy::class, $product); + $this->assertInstanceOf(ECommerceProduct::class, $product); $this->assertFalse($product->__isInitialized__); $this->assertSame('Doctrine Cookbook', $product->getName()); $this->assertTrue($product->__isInitialized__); @@ -129,8 +131,8 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase $features = $query->getResult(); $product = $features[0]->getProduct(); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $product); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $product); + $this->assertNotInstanceOf(Proxy::class, $product); + $this->assertInstanceOf(ECommerceProduct::class, $product); $this->assertSame('Doctrine Cookbook', $product->getName()); $this->assertFalse($product->getFeatures()->isInitialized()); @@ -157,19 +159,19 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase { $this->_createFixture(); - $product = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId()); + $product = $this->_em->find(ECommerceProduct::class, $this->product->getId()); $features = $product->getFeatures(); $results = $features->matching(new Criteria( Criteria::expr()->eq('description', 'Model writing tutorial') )); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results); + $this->assertInstanceOf(Collection::class, $results); $this->assertEquals(1, count($results)); $results = $features->matching(new Criteria()); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results); + $this->assertInstanceOf(Collection::class, $results); $this->assertEquals(2, count($results)); } @@ -180,7 +182,7 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase { $this->_createFixture(); - $product = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId()); + $product = $this->_em->find(ECommerceProduct::class, $this->product->getId()); $thirdFeature = new ECommerceFeature(); $thirdFeature->setDescription('Model writing tutorial'); @@ -199,7 +201,7 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase { $this->_createFixture(); - $product = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $this->product->getId()); + $product = $this->_em->find(ECommerceProduct::class, $this->product->getId()); $features = $product->getFeatures(); $thirdFeature = new ECommerceFeature(); @@ -210,12 +212,12 @@ class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase Criteria::expr()->eq('description', 'Third feature') )); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results); + $this->assertInstanceOf(Collection::class, $results); $this->assertCount(1, $results); $results = $features->matching(new Criteria()); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results); + $this->assertInstanceOf(Collection::class, $results); $this->assertCount(3, $results); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php index d22dbd4e2..da70672b6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php @@ -2,8 +2,8 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -42,7 +42,7 @@ class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase public function testOrphanRemoval() { - $userProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $userProxy = $this->_em->getReference(CmsUser::class, $this->userId); $this->_em->remove($userProxy); $this->_em->flush(); @@ -64,7 +64,7 @@ class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase */ public function testOrphanRemovalRemoveFromCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $phonenumber = $user->getPhonenumbers()->remove(0); @@ -82,7 +82,7 @@ class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase */ public function testOrphanRemovalClearCollectionAndReAdd() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $phone1 = $user->getPhonenumbers()->first(); @@ -102,7 +102,7 @@ class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase */ public function testOrphanRemovalClearCollectionAndAddNew() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $newPhone = new CmsPhonenumber(); $newPhone->phonenumber = '654321'; @@ -123,7 +123,7 @@ class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase */ public function testOrphanRemovalUnitializedCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $user->phonenumbers->clear(); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php index f6b64b5eb..c9f42237d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php @@ -2,9 +2,9 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceCategory; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\Models\ECommerce\ECommerceCategory; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -78,10 +78,10 @@ class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase $parent = $result[0]; $children = $parent->getChildren(); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[0]); + $this->assertInstanceOf(ECommerceCategory::class, $children[0]); $this->assertSame($parent, $children[0]->getParent()); $this->assertEquals(' books', strstr($children[0]->getName(), ' books')); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[1]); + $this->assertInstanceOf(ECommerceCategory::class, $children[1]); $this->assertSame($parent, $children[1]->getParent()); $this->assertEquals(' books', strstr($children[1]->getName(), ' books')); } @@ -89,7 +89,7 @@ class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase public function testLazyLoadsOneToManyAssociation() { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCategory'); + $metadata = $this->_em->getClassMetadata(ECommerceCategory::class); $metadata->associationMappings['children']['fetch'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery('select c from Doctrine\Tests\Models\ECommerce\ECommerceCategory c order by c.id asc'); @@ -97,10 +97,10 @@ class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase $parent = $result[0]; $children = $parent->getChildren(); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[0]); + $this->assertInstanceOf(ECommerceCategory::class, $children[0]); $this->assertSame($parent, $children[0]->getParent()); $this->assertEquals(' books', strstr($children[0]->getName(), ' books')); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[1]); + $this->assertInstanceOf(ECommerceCategory::class, $children[1]); $this->assertSame($parent, $children[1]->getParent()); $this->assertEquals(' books', strstr($children[1]->getName(), ' books')); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php index d2880ee81..c989e126c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php @@ -2,10 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceCart; -use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\Tests\Models\ECommerce\ECommerceCart; +use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -61,27 +62,27 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase $result = $query->getResult(); $customer = $result[0]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); + $this->assertInstanceOf(ECommerceCart::class, $customer->getCart()); $this->assertEquals('paypal', $customer->getCart()->getPayment()); } public function testLazyLoadsObjectsOnTheOwningSide() { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCart'); + $metadata = $this->_em->getClassMetadata(ECommerceCart::class); $metadata->associationMappings['customer']['fetchMode'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery('select c from Doctrine\Tests\Models\ECommerce\ECommerceCart c'); $result = $query->getResult(); $cart = $result[0]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart->getCustomer()); + $this->assertInstanceOf(ECommerceCustomer::class, $cart->getCustomer()); $this->assertEquals('Giorgio', $cart->getCustomer()->getName()); } public function testInverseSideIsNeverLazy() { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCustomer'); + $metadata = $this->_em->getClassMetadata(ECommerceCustomer::class); $metadata->associationMappings['mentor']['fetch'] = ClassMetadata::FETCH_EAGER; $query = $this->_em->createQuery('select c from Doctrine\Tests\Models\ECommerce\ECommerceCustomer c'); @@ -89,8 +90,8 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase $customer = $result[0]; $this->assertNull($customer->getMentor()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getCart()); + $this->assertInstanceOf(ECommerceCart::class, $customer->getCart()); + $this->assertNotInstanceOf(Proxy::class, $customer->getCart()); $this->assertEquals('paypal', $customer->getCart()->getPayment()); } @@ -106,7 +107,7 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $cust->getCart()); + $this->assertInstanceOf(ECommerceCart::class, $cust->getCart()); $this->assertEquals('Roman', $cust->getName()); $this->assertSame($cust, $cart->getCustomer()); @@ -125,7 +126,7 @@ class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase $cart3 = $query2->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart3->getCustomer()); + $this->assertInstanceOf(ECommerceCustomer::class, $cart3->getCustomer()); $this->assertEquals('Roman', $cart3->getCustomer()->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php index 8a9921002..5b4cdffdf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\OrmFunctionalTestCase; @@ -17,11 +18,11 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase try { $schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Train'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainDriver'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOwner'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Waggon'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\TrainOrder'), + $this->_em->getClassMetadata(Train::class), + $this->_em->getClassMetadata(TrainDriver::class), + $this->_em->getClassMetadata(TrainOwner::class), + $this->_em->getClassMetadata(Waggon::class), + $this->_em->getClassMetadata(TrainOrder::class), ] ); } catch(\Exception $e) {} @@ -46,7 +47,7 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase $sqlCount = count($this->_sqlLoggerStack->queries); $train = $this->_em->find(get_class($train), $train->id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $train->driver); + $this->assertNotInstanceOf(Proxy::class, $train->driver); $this->assertEquals("Benjamin", $train->driver->name); $this->assertEquals($sqlCount + 1, count($this->_sqlLoggerStack->queries)); @@ -66,7 +67,7 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase $sqlCount = count($this->_sqlLoggerStack->queries); $train = $this->_em->find(get_class($train), $train->id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $train->driver); + $this->assertNotInstanceOf(Proxy::class, $train->driver); $this->assertNull($train->driver); $this->assertEquals($sqlCount + 1, count($this->_sqlLoggerStack->queries)); @@ -87,7 +88,7 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase $sqlCount = count($this->_sqlLoggerStack->queries); $driver = $this->_em->find(get_class($owner), $owner->id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $owner->train); + $this->assertNotInstanceOf(Proxy::class, $owner->train); $this->assertNotNull($owner->train); $this->assertEquals($sqlCount + 1, count($this->_sqlLoggerStack->queries)); @@ -109,7 +110,7 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase $sqlCount = count($this->_sqlLoggerStack->queries); $driver = $this->_em->find(get_class($driver), $driver->id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $driver->train); + $this->assertNotInstanceOf(Proxy::class, $driver->train); $this->assertNull($driver->train); $this->assertEquals($sqlCount + 1, count($this->_sqlLoggerStack->queries)); @@ -126,7 +127,7 @@ class OneToOneEagerLoadingTest extends OrmFunctionalTestCase $this->_em->clear(); $waggon = $this->_em->find(get_class($waggon), $waggon->id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $waggon->train); + $this->assertNotInstanceOf(Proxy::class, $waggon->train); $this->assertNotNull($waggon->train); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php index 34bbc8c55..09ef64e02 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php @@ -2,9 +2,9 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\CMS\CmsUser, - Doctrine\Tests\Models\CMS\CmsEmail, - Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -40,7 +40,7 @@ class OneToOneOrphanRemovalTest extends OrmFunctionalTestCase $this->_em->clear(); - $userProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $userProxy = $this->_em->getReference(CmsUser::class, $userId); $this->_em->remove($userProxy); $this->_em->flush(); @@ -76,7 +76,7 @@ class OneToOneOrphanRemovalTest extends OrmFunctionalTestCase $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); + $user = $this->_em->find(CmsUser::class, $userId); $user->setEmail(null); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index bc7897f6a..0011e8c8c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -2,9 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -52,8 +53,8 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase { $id = $this->_createFixture(); - $customer = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $id); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getMentor()); + $customer = $this->_em->find(ECommerceCustomer::class, $id); + $this->assertNotInstanceOf(Proxy::class, $customer->getMentor()); } public function testEagerLoadsAssociation() @@ -74,7 +75,7 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCustomer'); + $metadata = $this->_em->getClassMetadata(ECommerceCustomer::class); $metadata->associationMappings['mentor']['fetch'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery("select c from Doctrine\Tests\Models\ECommerce\ECommerceCustomer c where c.name='Luke Skywalker'"); @@ -88,7 +89,7 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\MultiSelfReference') + $this->_em->getClassMetadata(MultiSelfReference::class) ] ); } catch (\Exception $e) { @@ -105,8 +106,8 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase $entity2 = $this->_em->find(get_class($entity1), $entity1->getId()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\MultiSelfReference', $entity2->getOther1()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\MultiSelfReference', $entity2->getOther2()); + $this->assertInstanceOf(MultiSelfReference::class, $entity2->getOther1()); + $this->assertInstanceOf(MultiSelfReference::class, $entity2->getOther2()); $this->assertNull($entity2->getOther1()->getOther1()); $this->assertNull($entity2->getOther1()->getOther2()); $this->assertNull($entity2->getOther2()->getOther1()); @@ -115,7 +116,7 @@ class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase public function assertLoadingOfAssociation($customer) { - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $customer->getMentor()); + $this->assertInstanceOf(ECommerceCustomer::class, $customer->getMentor()); $this->assertEquals('Obi-wan Kenobi', $customer->getMentor()->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php index b677df624..3e9a291f0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php @@ -15,9 +15,9 @@ class OneToOneSingleTableInheritanceTest extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema([ - $this->_em->getClassMetadata(Pet::CLASSNAME), - $this->_em->getClassMetadata(Cat::CLASSNAME), - $this->_em->getClassMetadata(LitterBox::CLASSNAME), + $this->_em->getClassMetadata(Pet::class), + $this->_em->getClassMetadata(Cat::class), + $this->_em->getClassMetadata(LitterBox::class), ]); } @@ -38,11 +38,11 @@ class OneToOneSingleTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); /* @var $foundCat Cat */ - $foundCat = $this->_em->find(Pet::CLASSNAME, $cat->id); + $foundCat = $this->_em->find(Pet::class, $cat->id); - $this->assertInstanceOf(Cat::CLASSNAME, $foundCat); + $this->assertInstanceOf(Cat::class, $foundCat); $this->assertSame($cat->id, $foundCat->id); - $this->assertInstanceOf(LitterBox::CLASSNAME, $foundCat->litterBox); + $this->assertInstanceOf(LitterBox::class, $foundCat->litterBox); $this->assertSame($cat->litterBox->id, $foundCat->litterBox->id); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php index 2ffbfa443..797a38517 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php @@ -2,11 +2,11 @@ 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\ECommerce\ECommerceProduct; +use Doctrine\Tests\Models\ECommerce\ECommerceShipping; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -55,20 +55,20 @@ class OneToOneUnidirectionalAssociationTest extends OrmFunctionalTestCase $result = $query->getResult(); $product = $result[0]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceShipping', $product->getShipping()); + $this->assertInstanceOf(ECommerceShipping::class, $product->getShipping()); $this->assertEquals(1, $product->getShipping()->getDays()); } public function testLazyLoadsObjects() { $this->_createFixture(); - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $metadata = $this->_em->getClassMetadata(ECommerceProduct::class); $metadata->associationMappings['shipping']['fetch'] = ClassMetadata::FETCH_LAZY; $query = $this->_em->createQuery('select p from Doctrine\Tests\Models\ECommerce\ECommerceProduct p'); $result = $query->getResult(); $product = $result[0]; - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceShipping', $product->getShipping()); + $this->assertInstanceOf(ECommerceShipping::class, $product->getShipping()); $this->assertEquals(1, $product->getShipping()->getDays()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php index 5d5c54e24..aa4fb1da0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php @@ -2,9 +2,9 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\Routing\RoutingRoute; -use Doctrine\Tests\Models\Routing\RoutingLocation; use Doctrine\Tests\Models\Routing\RoutingLeg; +use Doctrine\Tests\Models\Routing\RoutingLocation; +use Doctrine\Tests\Models\Routing\RoutingRoute; use Doctrine\Tests\Models\Routing\RoutingRouteBooking; use Doctrine\Tests\OrmFunctionalTestCase; @@ -59,7 +59,7 @@ class OrderedCollectionTest extends OrmFunctionalTestCase { $routeId = $this->createPersistedRouteWithLegs(); - $route = $this->_em->find('Doctrine\Tests\Models\Routing\RoutingRoute', $routeId); + $route = $this->_em->find(RoutingRoute::class, $routeId); $this->assertEquals(2, count($route->legs)); $this->assertEquals("Berlin", $route->legs[0]->fromLocation->getName()); @@ -90,7 +90,7 @@ class OrderedCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $route = $this->_em->find('Doctrine\Tests\Models\Routing\RoutingRoute', $routeId); + $route = $this->_em->find(RoutingRoute::class, $routeId); $this->assertEquals(2, count($route->bookings)); $this->assertEquals('Benjamin', $route->bookings[0]->getPassengerName()); diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php index d71bfb0b4..30531bae9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php @@ -18,9 +18,9 @@ class OrderedJoinedTableInheritanceCollectionTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Pet'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Cat'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\OJTIC_Dog'), + $this->_em->getClassMetadata(OJTIC_Pet::class), + $this->_em->getClassMetadata(OJTIC_Cat::class), + $this->_em->getClassMetadata(OJTIC_Dog::class), ] ); } catch (\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php index dcf44ce45..58a88dbd7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PaginationTest.php @@ -3,11 +3,11 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Query; +use Doctrine\ORM\Tools\Pagination\Paginator; use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Tests\Models\CMS\CmsEmail; -use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsGroup; -use Doctrine\ORM\Tools\Pagination\Paginator; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\Models\Pagination\Company; use Doctrine\Tests\Models\Pagination\Department; @@ -595,7 +595,7 @@ class PaginationTest extends OrmFunctionalTestCase // If the Paginator detects the custom output walker it should fall back to using the // Tree walkers for pagination, which leads to an exception. If the query works, the output walkers were used - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Query\SqlWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, Query\SqlWalker::class); $paginator = new Paginator($query); $this->expectException(\RuntimeException::class); @@ -633,8 +633,7 @@ class PaginationTest extends OrmFunctionalTestCase { $dql = 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u'; $query = $this->_em->createQuery($dql); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\CustomPaginationTestTreeWalker'] - ); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CustomPaginationTestTreeWalker::class]); $paginator = new Paginator($query, true); $paginator->setUseOutputWalkers(false); @@ -662,7 +661,7 @@ class PaginationTest extends OrmFunctionalTestCase $this->assertCount(2, $getCountQuery->invoke($paginator)->getParameters()); $this->assertCount(9, $paginator); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Query\SqlWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, Query\SqlWalker::class); $paginator = new Paginator($query); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php index 99a04d52b..a02f4091a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php @@ -3,9 +3,11 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\LazyCriteriaCollection; use Doctrine\Tests\Models\Quote\Group; use Doctrine\Tests\Models\Quote\User as QuoteUser; use Doctrine\Tests\Models\Tweet\Tweet; +use Doctrine\Tests\Models\Tweet\User; use Doctrine\Tests\Models\Tweet\User as TweetUser; use Doctrine\Tests\OrmFunctionalTestCase; @@ -73,12 +75,12 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase { $this->loadTweetFixture(); - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Tweet\User'); + $repository = $this->_em->getRepository(User::class); $user = $repository->findOneBy(['name' => 'ngal']); $tweets = $user->tweets->matching(new Criteria()); - $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets); + $this->assertInstanceOf(LazyCriteriaCollection::class, $tweets); $this->assertFalse($tweets->isInitialized()); $this->assertCount(2, $tweets); $this->assertFalse($tweets->isInitialized()); @@ -88,7 +90,7 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase Criteria::expr()->eq('content', 'Foo') )); - $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets); + $this->assertInstanceOf(LazyCriteriaCollection::class, $tweets); $this->assertFalse($tweets->isInitialized()); $this->assertCount(1, $tweets); $this->assertFalse($tweets->isInitialized()); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php index 3eac4263c..b1751455f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php @@ -15,8 +15,8 @@ class PersistentCollectionTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionHolder'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\PersistentCollectionContent'), + $this->_em->getClassMetadata(PersistentCollectionHolder::class), + $this->_em->getClassMetadata(PersistentCollectionContent::class), ] ); } catch (\Exception $e) { @@ -35,7 +35,7 @@ class PersistentCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $collectionHolder = $this->_em->find(__NAMESPACE__ . '\PersistentCollectionHolder', $collectionHolder->getId()); + $collectionHolder = $this->_em->find(PersistentCollectionHolder::class, $collectionHolder->getId()); $collectionHolder->getCollection(); $content = new PersistentCollectionContent('second element'); @@ -55,7 +55,7 @@ class PersistentCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $collectionHolder = $this->_em->find(__NAMESPACE__ . '\PersistentCollectionHolder', $collectionHolder->getId()); + $collectionHolder = $this->_em->find(PersistentCollectionHolder::class, $collectionHolder->getId()); $collection = $collectionHolder->getRawCollection(); $this->assertTrue($collection->isEmpty()); @@ -66,7 +66,7 @@ class PersistentCollectionTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $collectionHolder = $this->_em->find(__NAMESPACE__ . '\PersistentCollectionHolder', $collectionHolder->getId()); + $collectionHolder = $this->_em->find(PersistentCollectionHolder::class, $collectionHolder->getId()); $collection = $collectionHolder->getRawCollection(); $this->assertFalse($collection->isEmpty()); @@ -87,7 +87,7 @@ class PersistentCollectionTest extends OrmFunctionalTestCase $criteria = new Criteria(); - $collectionHolder = $this->_em->find(__NAMESPACE__ . '\PersistentCollectionHolder', $collectionHolder->getId()); + $collectionHolder = $this->_em->find(PersistentCollectionHolder::class, $collectionHolder->getId()); $collectionHolder->getCollection()->matching($criteria); $this->assertEmpty($criteria->getWhereExpression()); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index 459c0549c..9f73bf5e8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -19,7 +19,7 @@ class PersistentObjectTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\PersistentEntity'), + $this->_em->getClassMetadata(PersistentEntity::class), ] ); } catch (\Exception $e) { @@ -46,7 +46,7 @@ class PersistentObjectTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $entity = $this->_em->find(__NAMESPACE__ . '\PersistentEntity', $entity->getId()); + $entity = $this->_em->find(PersistentEntity::class, $entity->getId()); $this->assertEquals('test', $entity->getName()); $entity->setName('foobar'); @@ -63,7 +63,7 @@ class PersistentObjectTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $entity = $this->_em->getReference(__NAMESPACE__ . '\PersistentEntity', $entity->getId()); + $entity = $this->_em->getReference(PersistentEntity::class, $entity->getId()); $this->assertEquals('test', $entity->getName()); } @@ -78,7 +78,7 @@ class PersistentObjectTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $entity = $this->_em->getReference(__NAMESPACE__ . '\PersistentEntity', $entity->getId()); + $entity = $this->_em->getReference(PersistentEntity::class, $entity->getId()); $this->assertSame($entity, $entity->getParent()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php index 0debc2ca6..02a086666 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php @@ -2,12 +2,12 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Util\ClassUtils; -use Doctrine\Tests\Models\CMS\CmsUser; -use Doctrine\Tests\Models\CMS\CmsPhonenumber; -use Doctrine\Tests\Models\CMS\CmsAddress; -use Doctrine\Tests\Models\CMS\CmsEmail; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -48,7 +48,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager->addEventListener([Events::postLoad], $mockListener); - $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $this->_em->find(CmsUser::class, $this->userId); } public function testLoadedEntityUsingQueryShouldTriggerEvent() @@ -125,7 +125,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $eventManager->addEventListener([Events::postLoad], $mockListener); - $userProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $userProxy = $this->_em->getReference(CmsUser::class, $this->userId); // Now deactivate original listener and attach new one $eventManager->removeEventListener([Events::postLoad], $mockListener); @@ -165,7 +165,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase public function testLoadedProxyAssociationToOneShouldTriggerEvent() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $mockListener = $this->createMock(PostLoadListener::class); @@ -186,7 +186,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase public function testLoadedProxyAssociationToManyShouldTriggerEvent() { - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $mockListener = $this->createMock(PostLoadListener::class); @@ -213,7 +213,7 @@ class PostLoadEventTest extends OrmFunctionalTestCase $checkerListener = new PostLoadListenerCheckAssociationsArePopulated(); $this->_em->getEventManager()->addEventListener([Events::postLoad], $checkerListener); - $qb = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->createQueryBuilder('u'); + $qb = $this->_em->getRepository(CmsUser::class)->createQueryBuilder('u'); $qb->leftJoin('u.email', 'email'); $qb->addSelect('email'); $qb->getQuery()->getSingleResult(); @@ -231,9 +231,9 @@ class PostLoadEventTest extends OrmFunctionalTestCase $listener = new PostLoadListenerLoadEntityInEventHandler(); $eventManager->addEventListener([Events::postLoad], $listener); - $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); - $this->assertSame(1, $listener->countHandledEvents('Doctrine\Tests\Models\CMS\CmsUser'), 'Doctrine\Tests\Models\CMS\CmsUser should be handled once!'); - $this->assertSame(1, $listener->countHandledEvents('Doctrine\Tests\Models\CMS\CmsEmail'), '\Doctrine\Tests\Models\CMS\CmsEmail should be handled once!'); + $this->_em->find(CmsUser::class, $this->userId); + $this->assertSame(1, $listener->countHandledEvents(CmsUser::class), CmsUser::class . ' should be handled once!'); + $this->assertSame(1, $listener->countHandledEvents(CmsEmail::class), CmsEmail::class . ' should be handled once!'); } private function loadFixture() diff --git a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php index 7d9fbce9d..c88eff4ab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ProxiesLikeEntitiesTest.php @@ -2,8 +2,15 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsTag; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; +use Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser as CmsUserProxy; /** * Test that Doctrine ORM correctly works with proxy instances exactly like with ordinary Entities @@ -26,12 +33,13 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), + $this->_em->getClassMetadata(CmsUser::class), + $this->_em->getClassMetadata(CmsTag::class), + $this->_em->getClassMetadata(CmsPhonenumber::class), + $this->_em->getClassMetadata(CmsArticle::class), + $this->_em->getClassMetadata(CmsAddress::class), + $this->_em->getClassMetadata(CmsEmail::class), + $this->_em->getClassMetadata(CmsGroup::class), ] ); } catch (\Exception $e) { @@ -50,7 +58,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase public function testPersistUpdate() { // Considering case (a) - $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => 123]); + $proxy = $this->_em->getProxyFactory()->getProxy(CmsUser::class, ['id' => 123]); $proxy->__isInitialized__ = true; $proxy->id = null; $proxy->username = 'ocra'; @@ -59,12 +67,10 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertNotNull($proxy->getId()); $proxy->name = 'Marco Pivetta'; - $this - ->_em - ->getUnitOfWork() - ->computeChangeSet($this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), $proxy); + $this->_em->getUnitOfWork() + ->computeChangeSet($this->_em->getClassMetadata(CmsUser::class), $proxy); $this->assertNotEmpty($this->_em->getUnitOfWork()->getEntityChangeSet($proxy)); - $this->assertEquals('Marco Pivetta', $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $proxy->getId())->name); + $this->assertEquals('Marco Pivetta', $this->_em->find(CmsUser::class, $proxy->getId())->name); $this->_em->remove($proxy); $this->_em->flush(); } @@ -72,9 +78,9 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase public function testEntityWithIdentifier() { $userId = $this->user->getId(); - /* @var $uninitializedProxy \Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser */ - $uninitializedProxy = $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $userId); - $this->assertInstanceOf('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser', $uninitializedProxy); + /* @var $uninitializedProxy CmsUserProxy */ + $uninitializedProxy = $this->_em->getReference(CmsUser::class, $userId); + $this->assertInstanceOf(CmsUserProxy::class, $uninitializedProxy); $this->_em->persist($uninitializedProxy); $this->_em->flush($uninitializedProxy); @@ -89,7 +95,7 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase */ public function testProxyAsDqlParameterPersist() { - $proxy = $this->_em->getProxyFactory()->getProxy('Doctrine\Tests\Models\CMS\CmsUser', ['id' => $this->user->getId()] + $proxy = $this->_em->getProxyFactory()->getProxy(CmsUser::class, ['id' => $this->user->getId()] ); $proxy->id = $this->user->getId(); $result = $this @@ -107,27 +113,23 @@ class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase */ public function testFindWithProxyName() { - $result = $this - ->_em - ->find('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser', $this->user->getId()); + $result = $this->_em->find(CmsUserProxy::class, $this->user->getId()); $this->assertSame($this->user->getId(), $result->getId()); $this->_em->clear(); - $result = $this - ->_em - ->getReference('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser', $this->user->getId()); + + $result = $this->_em->getReference(CmsUserProxy::class, $this->user->getId()); $this->assertSame($this->user->getId(), $result->getId()); $this->_em->clear(); - $result = $this - ->_em - ->getRepository('Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser') - ->findOneBy(['username' => $this->user->username]); + + $result = $this->_em->getRepository(CmsUserProxy::class)->findOneBy(['username' => $this->user->username]); $this->assertSame($this->user->getId(), $result->getId()); $this->_em->clear(); - $result = $this - ->_em + + $result = $this->_em ->createQuery('SELECT u FROM Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1') ->setParameter(1, $this->user->getId()) ->getSingleResult(); + $this->assertSame($this->user->getId(), $result->getId()); $this->_em->clear(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php index 6eec3609f..a307ad137 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php @@ -23,7 +23,7 @@ class QueryCacheTest extends OrmFunctionalTestCase protected function setUp() { - $this->cacheDataReflection = new \ReflectionProperty("Doctrine\Common\Cache\ArrayCache", "data"); + $this->cacheDataReflection = new \ReflectionProperty(ArrayCache::class, "data"); $this->cacheDataReflection->setAccessible(true); $this->useModelSet('cms'); @@ -116,7 +116,7 @@ class QueryCacheTest extends OrmFunctionalTestCase $cache ->expects(self::once()) ->method('save') - ->with(self::isType('string'), self::isInstanceOf('Doctrine\ORM\Query\ParserResult')); + ->with(self::isType('string'), self::isInstanceOf(ParserResult::class)); $query->getResult(); } @@ -151,6 +151,7 @@ class QueryCacheTest extends OrmFunctionalTestCase ->method('doFetch') ->with($this->isType('string')) ->will($this->returnValue($parserResultMock)); + $cache->expects($this->never()) ->method('doSave'); diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 8d0ad2d8d..805478bdf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\NonUniqueResultException; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\ORM\Query\QueryException; use Doctrine\ORM\UnexpectedResultException; use Doctrine\Tests\Models\CMS\CmsUser, @@ -43,7 +44,7 @@ class QueryTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf(CmsUser::class, $result[0][0]); $this->assertEquals('Guilherme', $result[0][0]->name); $this->assertEquals('gblanco', $result[0][0]->username); $this->assertEquals('developer', $result[0][0]->status); @@ -95,7 +96,7 @@ class QueryTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a ORDER BY a.topic"); $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); $this->assertEquals(2, count($users[0]->articles)); $this->assertEquals('Doctrine 2', $users[0]->articles[0]->topic); $this->assertEquals('Symfony 2', $users[0]->articles[1]->topic); @@ -239,7 +240,7 @@ class QueryTest extends OrmFunctionalTestCase $topics[] = $article->topic; $identityMap = $this->_em->getUnitOfWork()->getIdentityMap(); - $identityMapCount = count($identityMap['Doctrine\Tests\Models\CMS\CmsArticle']); + $identityMapCount = count($identityMap[CmsArticle::class]); $this->assertTrue($identityMapCount>$iteratedCount); $iteratedCount++; @@ -417,14 +418,14 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a where a.topic = :topic and a.user = :user") - ->setParameter("user", $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $author->id)) + ->setParameter("user", $this->_em->getReference(CmsUser::class, $author->id)) ->setParameter("topic", "dr. dolittle"); $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0]); + $this->assertInstanceOf(CmsArticle::class, $result[0]); $this->assertEquals("dr. dolittle", $result[0]->topic); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->user); + $this->assertInstanceOf(Proxy::class, $result[0]->user); $this->assertFalse($result[0]->user->__isInitialized__); } @@ -449,12 +450,12 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); $articles = $this->_em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a') - ->setFetchMode('Doctrine\Tests\Models\CMS\CmsArticle', 'user', ClassMetadata::FETCH_EAGER) + ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER) ->getResult(); $this->assertEquals(10, count($articles)); foreach ($articles AS $article) { - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $article); + $this->assertNotInstanceOf(Proxy::class, $article); } } @@ -474,7 +475,7 @@ class QueryTest extends OrmFunctionalTestCase $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u where u.username = 'gblanco'"); $fetchedUser = $query->getOneOrNullResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $fetchedUser); + $this->assertInstanceOf(CmsUser::class, $fetchedUser); $this->assertEquals('gblanco', $fetchedUser->username); $query = $this->_em->createQuery("select u.username from Doctrine\Tests\Models\CMS\CmsUser u where u.username = 'gblanco'"); @@ -592,7 +593,7 @@ class QueryTest extends OrmFunctionalTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->innerJoin('u.articles', 'a') ->where('(u.id = 0) OR (u.id IS NULL)'); @@ -661,7 +662,7 @@ class QueryTest extends OrmFunctionalTestCase $users = $query->execute(); $this->assertEquals(3, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[0]); } /** @@ -724,9 +725,9 @@ class QueryTest extends OrmFunctionalTestCase $users = $q->execute(); $this->assertEquals(3, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[2]); + $this->assertInstanceOf(CmsUser::class, $users[0]); + $this->assertInstanceOf(CmsUser::class, $users[1]); + $this->assertInstanceOf(CmsUser::class, $users[2]); $resultUser1 = $users[0]; $resultUser2 = $users[1]; @@ -802,8 +803,8 @@ class QueryTest extends OrmFunctionalTestCase $users = $query->execute(); $this->assertEquals(2, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $users[1]); + $this->assertInstanceOf(CmsUser::class, $users[0]); + $this->assertInstanceOf(CmsPhonenumber::class, $users[1]); } public function testMultipleJoinComponentsUsingLeftJoin() @@ -835,9 +836,9 @@ class QueryTest extends OrmFunctionalTestCase $users = $query->execute(); $this->assertEquals(4, count($users)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $users[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[2]); + $this->assertInstanceOf(CmsUser::class, $users[0]); + $this->assertInstanceOf(CmsPhonenumber::class, $users[1]); + $this->assertInstanceOf(CmsUser::class, $users[2]); $this->assertNull($users[3]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php index 9eacc7a9c..a664a4df2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php @@ -1,6 +1,7 @@ _schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\ReadOnlyEntity'), + $this->_em->getClassMetadata(ReadOnlyEntity::class), ] ); } catch(\Exception $e) { @@ -36,7 +37,7 @@ class ReadOnlyTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dbReadOnly = $this->_em->find('Doctrine\Tests\ORM\Functional\ReadOnlyEntity', $readOnly->id); + $dbReadOnly = $this->_em->find(ReadOnlyEntity::class, $readOnly->id); $this->assertEquals("Test1", $dbReadOnly->name); $this->assertEquals(1234, $dbReadOnly->numericValue); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php index b7116a3cd..5e1cb2fb2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php @@ -2,12 +2,12 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Persistence\Proxy; use Doctrine\Common\Util\ClassUtils; use Doctrine\ORM\Proxy\ProxyFactory; -use Doctrine\ORM\Proxy\ProxyClassGenerator; +use Doctrine\Tests\Models\Company\CompanyAuction; use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\Models\ECommerce\ECommerceShipping; -use Doctrine\Tests\Models\Company\CompanyAuction; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -57,7 +57,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - $productProxy = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct', ['id' => $id]); + $productProxy = $this->_em->getReference(ECommerceProduct::class, ['id' => $id]); $this->assertEquals('Doctrine Cookbook', $productProxy->getName()); } @@ -68,10 +68,10 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $class = $this->_em->getClassMetadata(get_class($entity)); - $this->assertEquals('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $class->name); + $this->assertEquals(ECommerceProduct::class, $class->name); } /** @@ -81,8 +81,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); - $entity2 = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $entity = $this->_em->getReference(ECommerceProduct::class , $id); + $entity2 = $this->_em->find(ECommerceProduct::class , $id); $this->assertSame($entity, $entity2); $this->assertEquals('Doctrine Cookbook', $entity2->getName()); @@ -95,10 +95,10 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); - /* @var $clone Doctrine\Tests\Models\ECommerce\ECommerceProduct */ + /* @var $clone ECommerceProduct */ $clone = clone $entity; $this->assertEquals($id, $entity->getId()); @@ -120,8 +120,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); $this->_em->getUnitOfWork()->initializeObject($entity); @@ -135,14 +135,14 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $entity->setName('Doctrine 2 Cookbook'); $this->_em->flush(); $this->_em->clear(); - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $this->assertEquals('Doctrine 2 Cookbook', $entity->getName()); } @@ -153,8 +153,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $this->assertFalse($entity->wakeUp); @@ -167,8 +167,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); $this->assertEquals($id, $entity->getId()); @@ -182,8 +182,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createAuction(); - /* @var $entity Doctrine\Tests\Models\Company\CompanyAuction */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyAuction' , $id); + /* @var $entity CompanyAuction */ + $entity = $this->_em->getReference(CompanyAuction::class , $id); $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); $this->assertEquals($id, $entity->getId()); @@ -204,7 +204,7 @@ class ReferenceProxyTest extends OrmFunctionalTestCase $id = $shipping->getId(); - $product = $this->_em->getRepository('Doctrine\Tests\Models\ECommerce\ECommerceProduct')->find($product->getId()); + $product = $this->_em->getRepository(ECommerceProduct::class)->find($product->getId()); $entity = $product->getShipping(); $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); @@ -217,8 +217,8 @@ class ReferenceProxyTest extends OrmFunctionalTestCase { $id = $this->createProduct(); - /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + /* @var $entity ECommerceProduct */ + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); $this->assertEquals('Doctrine Cookbook', $entity->getName()); @@ -233,12 +233,12 @@ class ReferenceProxyTest extends OrmFunctionalTestCase $id = $this->createProduct(); /* @var $entity ECommerceProduct */ - $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $entity = $this->_em->getReference(ECommerceProduct::class , $id); $className = ClassUtils::getClass($entity); - $this->assertInstanceOf('Doctrine\Common\Persistence\Proxy', $entity); + $this->assertInstanceOf(Proxy::class, $entity); $this->assertFalse($entity->__isInitialized()); - $this->assertEquals('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $className); + $this->assertEquals(ECommerceProduct::class, $className); $restName = str_replace($this->_em->getConfiguration()->getProxyNamespace(), "", get_class($entity)); $restName = substr(get_class($entity), strlen($this->_em->getConfiguration()->getProxyNamespace()) +1); diff --git a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php index e1bd93ed7..bfadf2c25 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php @@ -22,7 +22,7 @@ class ResultCacheTest extends OrmFunctionalTestCase private $cacheDataReflection; protected function setUp() { - $this->cacheDataReflection = new \ReflectionProperty("Doctrine\Common\Cache\ArrayCache", "data"); + $this->cacheDataReflection = new \ReflectionProperty(ArrayCache::class, "data"); $this->cacheDataReflection->setAccessible(true); $this->useModelSet('cms'); parent::setUp(); diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php index 42db02906..c35036b6e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php @@ -2,26 +2,27 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Cache\ArrayCache; +use Doctrine\DBAL\Connection; use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\Configuration; -use Doctrine\ORM\Query\Filter\SQLFilter; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\Common\Cache\ArrayCache; - use Doctrine\ORM\Mapping\ClassMetadataInfo; - -use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\ORM\Query\Filter\SQLFilter; +use Doctrine\ORM\Query\FilterCollection; use Doctrine\Tests\Models\CMS\CmsAddress; -use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\Tests\Models\CMS\CmsArticle; - -use Doctrine\Tests\Models\Company\CompanyPerson; -use Doctrine\Tests\Models\Company\CompanyManager; -use Doctrine\Tests\Models\Company\CompanyOrganization; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\Company\CompanyAuction; - +use Doctrine\Tests\Models\Company\CompanyContract; +use Doctrine\Tests\Models\Company\CompanyEvent; use Doctrine\Tests\Models\Company\CompanyFlexContract; use Doctrine\Tests\Models\Company\CompanyFlexUltraContract; +use Doctrine\Tests\Models\Company\CompanyManager; +use Doctrine\Tests\Models\Company\CompanyOrganization; +use Doctrine\Tests\Models\Company\CompanyPerson; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -49,7 +50,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { parent::tearDown(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->_em->getClassMetadata(CmsUser::class); $class->associationMappings['groups']['fetch'] = ClassMetadataInfo::FETCH_LAZY; $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; } @@ -186,7 +187,7 @@ class SQLFilterTest extends OrmFunctionalTestCase protected function getMockConnection() { // Setup connection mock - $conn = $this->getMockBuilder('Doctrine\DBAL\Connection') + $conn = $this->getMockBuilder(Connection::class) ->disableOriginalConstructor() ->getMock(); @@ -196,7 +197,7 @@ class SQLFilterTest extends OrmFunctionalTestCase protected function getMockEntityManager() { // Setup connection mock - $em = $this->getMockBuilder('Doctrine\ORM\EntityManager') + $em = $this->getMockBuilder(EntityManager::class) ->disableOriginalConstructor() ->getMock(); @@ -205,7 +206,7 @@ class SQLFilterTest extends OrmFunctionalTestCase protected function addMockFilterCollection($em) { - $filterCollection = $this->getMockBuilder('Doctrine\ORM\Query\FilterCollection') + $filterCollection = $this->getMockBuilder(FilterCollection::class) ->disableOriginalConstructor() ->getMock(); @@ -258,7 +259,7 @@ class SQLFilterTest extends OrmFunctionalTestCase $filter = new MyLocaleFilter($em); - $reflMethod = new \ReflectionMethod('Doctrine\ORM\Query\Filter\SQLFilter', 'getConnection'); + $reflMethod = new \ReflectionMethod(SQLFilter::class, 'getConnection'); $reflMethod->setAccessible(true); $this->assertSame($conn, $reflMethod->invoke($filter)); @@ -293,7 +294,7 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testSQLFilterAddConstraint() { // Set up metadata mock - $targetEntity = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata') + $targetEntity = $this->getMockBuilder(ClassMetadata::class) ->disableOriginalConstructor() ->getMock(); @@ -333,7 +334,7 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testQueryCache_DependsOnFilters() { - $cacheDataReflection = new \ReflectionProperty("Doctrine\Common\Cache\ArrayCache", "data"); + $cacheDataReflection = new \ReflectionProperty(ArrayCache::class, "data"); $cacheDataReflection->setAccessible(true); $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux'); @@ -373,40 +374,40 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadFixtureData(); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->find($this->groupId)); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->find($this->groupId2)); + $this->assertNotNull($this->_em->getRepository(CmsGroup::class)->find($this->groupId)); + $this->assertNotNull($this->_em->getRepository(CmsGroup::class)->find($this->groupId2)); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->find($this->groupId)); - $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->find($this->groupId2)); + $this->assertNotNull($this->_em->getRepository(CmsGroup::class)->find($this->groupId)); + $this->assertNull($this->_em->getRepository(CmsGroup::class)->find($this->groupId2)); } public function testRepositoryFindAll() { $this->loadFixtureData(); - $this->assertCount(2, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll()); + $this->assertCount(2, $this->_em->getRepository(CmsGroup::class)->findAll()); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll()); + $this->assertCount(1, $this->_em->getRepository(CmsGroup::class)->findAll()); } public function testRepositoryFindBy() { $this->loadFixtureData(); - $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy( + $this->assertCount(1, $this->_em->getRepository(CmsGroup::class)->findBy( ['id' => $this->groupId2] )); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findBy( + $this->assertCount(0, $this->_em->getRepository(CmsGroup::class)->findBy( ['id' => $this->groupId2] )); } @@ -415,26 +416,26 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadFixtureData(); - $this->assertCount(1, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findById($this->groupId2)); + $this->assertCount(1, $this->_em->getRepository(CmsGroup::class)->findById($this->groupId2)); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertCount(0, $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findById($this->groupId2)); + $this->assertCount(0, $this->_em->getRepository(CmsGroup::class)->findById($this->groupId2)); } public function testRepositoryFindOneBy() { $this->loadFixtureData(); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy( + $this->assertNotNull($this->_em->getRepository(CmsGroup::class)->findOneBy( ['id' => $this->groupId2] )); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneBy( + $this->assertNull($this->_em->getRepository(CmsGroup::class)->findOneBy( ['id' => $this->groupId2] )); } @@ -443,12 +444,12 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadFixtureData(); - $this->assertNotNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneById($this->groupId2)); + $this->assertNotNull($this->_em->getRepository(CmsGroup::class)->findOneById($this->groupId2)); $this->useCMSGroupPrefixFilter(); $this->_em->clear(); - $this->assertNull($this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findOneById($this->groupId2)); + $this->assertNull($this->_em->getRepository(CmsGroup::class)->findOneById($this->groupId2)); } public function testToOneFilter() @@ -521,7 +522,7 @@ class SQLFilterTest extends OrmFunctionalTestCase private function loadLazyFixtureData() { - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->_em->getClassMetadata(CmsUser::class); $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $class->associationMappings['groups']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $this->loadFixtureData(); @@ -537,7 +538,7 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testOneToMany_ExtraLazyCountWithFilter() { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->articles->isInitialized()); $this->assertEquals(2, count($user->articles)); @@ -550,8 +551,8 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testOneToMany_ExtraLazyContainsWithFilter() { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); - $filteredArticle = $this->_em->find('Doctrine\Tests\Models\CMS\CmsArticle', $this->articleId2); + $user = $this->_em->find(CmsUser::class, $this->userId); + $filteredArticle = $this->_em->find(CmsArticle::class, $this->articleId2); $this->assertFalse($user->articles->isInitialized()); $this->assertTrue($user->articles->contains($filteredArticle)); @@ -564,7 +565,7 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testOneToMany_ExtraLazySliceWithFilter() { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $this->assertFalse($user->articles->isInitialized()); $this->assertEquals(2, count($user->articles->slice(0,10))); @@ -585,7 +586,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); $this->assertFalse($user->groups->isInitialized()); $this->assertEquals(2, count($user->groups)); @@ -598,8 +599,8 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testManyToMany_ExtraLazyContainsWithFilter() { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); - $filteredArticle = $this->_em->find('Doctrine\Tests\Models\CMS\CmsGroup', $this->groupId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); + $filteredArticle = $this->_em->find(CmsGroup::class, $this->groupId2); $this->assertFalse($user->groups->isInitialized()); $this->assertTrue($user->groups->contains($filteredArticle)); @@ -612,7 +613,7 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testManyToMany_ExtraLazySliceWithFilter() { $this->loadLazyFixtureData(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId2); + $user = $this->_em->find(CmsUser::class, $this->userId2); $this->assertFalse($user->groups->isInitialized()); $this->assertEquals(2, count($user->groups->slice(0,10))); @@ -690,14 +691,14 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanyJoinedSubclassFixtureData(); // Persister - $this->assertEquals(2, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager')->findAll())); + $this->assertEquals(2, count($this->_em->getRepository(CompanyManager::class)->findAll())); // SQLWalker $this->assertEquals(2, count($this->_em->createQuery("SELECT cm FROM Doctrine\Tests\Models\Company\CompanyManager cm")->getResult())); // Enable the filter $this->usePersonNameFilter('Guilh%'); - $managers = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyManager')->findAll(); + $managers = $this->_em->getRepository(CompanyManager::class)->findAll(); $this->assertEquals(1, count($managers)); $this->assertEquals("Guilherme", $managers[0]->getName()); @@ -707,13 +708,13 @@ class SQLFilterTest extends OrmFunctionalTestCase public function testJoinSubclassPersister_FilterOnlyOnRootTableWhenFetchingRootEntity() { $this->loadCompanyJoinedSubclassFixtureData(); - $this->assertEquals(3, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson')->findAll())); + $this->assertEquals(3, count($this->_em->getRepository(CompanyPerson::class)->findAll())); $this->assertEquals(3, count($this->_em->createQuery("SELECT cp FROM Doctrine\Tests\Models\Company\CompanyPerson cp")->getResult())); // Enable the filter $this->usePersonNameFilter('Guilh%'); - $persons = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyPerson')->findAll(); + $persons = $this->_em->getRepository(CompanyPerson::class)->findAll(); $this->assertEquals(1, count($persons)); $this->assertEquals("Guilherme", $persons[0]->getName()); @@ -748,7 +749,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); // Persister - $this->assertEquals(2, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexUltraContract')->findAll())); + $this->assertEquals(2, count($this->_em->getRepository(CompanyFlexUltraContract::class)->findAll())); // SQLWalker $this->assertEquals(2, count($this->_em->createQuery("SELECT cfc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract cfc")->getResult())); @@ -759,14 +760,14 @@ class SQLFilterTest extends OrmFunctionalTestCase ->enable("completed_contract") ->setParameter("completed", true, DBALType::BOOLEAN); - $this->assertEquals(1, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexUltraContract')->findAll())); + $this->assertEquals(1, count($this->_em->getRepository(CompanyFlexUltraContract::class)->findAll())); $this->assertEquals(1, count($this->_em->createQuery("SELECT cfc FROM Doctrine\Tests\Models\Company\CompanyFlexUltraContract cfc")->getResult())); } public function testSingleTableInheritance_FilterOnlyOnRootTableWhenFetchingRootEntity() { $this->loadCompanySingleTableInheritanceFixtureData(); - $this->assertEquals(4, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexContract')->findAll())); + $this->assertEquals(4, count($this->_em->getRepository(CompanyFlexContract::class)->findAll())); $this->assertEquals(4, count($this->_em->createQuery("SELECT cfc FROM Doctrine\Tests\Models\Company\CompanyFlexContract cfc")->getResult())); // Enable the filter @@ -776,7 +777,7 @@ class SQLFilterTest extends OrmFunctionalTestCase ->enable("completed_contract") ->setParameter("completed", true, DBALType::BOOLEAN); - $this->assertEquals(2, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexContract')->findAll())); + $this->assertEquals(2, count($this->_em->getRepository(CompanyFlexContract::class)->findAll())); $this->assertEquals(2, count($this->_em->createQuery("SELECT cfc FROM Doctrine\Tests\Models\Company\CompanyFlexContract cfc")->getResult())); } @@ -840,7 +841,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); $this->assertFalse($manager->managedContracts->isInitialized()); $this->assertEquals(4, count($manager->managedContracts)); @@ -856,9 +857,9 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); - $contract1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId1); - $contract2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId2); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); + $contract1 = $this->_em->find(CompanyContract::class, $this->contractId1); + $contract2 = $this->_em->find(CompanyContract::class, $this->contractId2); $this->assertFalse($manager->managedContracts->isInitialized()); $this->assertTrue($manager->managedContracts->contains($contract1)); @@ -876,7 +877,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); $this->assertFalse($manager->managedContracts->isInitialized()); $this->assertEquals(4, count($manager->managedContracts->slice(0, 10))); @@ -902,7 +903,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1); + $contract = $this->_em->find(CompanyFlexUltraContract::class, $this->contractId1); $this->assertFalse($contract->managers->isInitialized()); $this->assertEquals(2, count($contract->managers)); @@ -918,9 +919,9 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1); - $manager1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); - $manager2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId2); + $contract = $this->_em->find(CompanyFlexUltraContract::class, $this->contractId1); + $manager1 = $this->_em->find(CompanyManager::class, $this->managerId); + $manager2 = $this->_em->find(CompanyManager::class, $this->managerId2); $this->assertFalse($contract->managers->isInitialized()); $this->assertTrue($contract->managers->contains($manager1)); @@ -938,7 +939,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $this->contractId1); + $contract = $this->_em->find(CompanyFlexUltraContract::class, $this->contractId1); $this->assertFalse($contract->managers->isInitialized()); $this->assertEquals(2, count($contract->managers->slice(0, 10))); @@ -954,7 +955,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); $this->assertFalse($manager->soldContracts->isInitialized()); $this->assertEquals(2, count($manager->soldContracts)); @@ -970,9 +971,9 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); - $contract1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId1); - $contract2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->contractId2); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); + $contract1 = $this->_em->find(CompanyContract::class, $this->contractId1); + $contract2 = $this->_em->find(CompanyContract::class, $this->contractId2); $this->assertFalse($manager->soldContracts->isInitialized()); $this->assertTrue($manager->soldContracts->contains($contract1)); @@ -991,7 +992,7 @@ class SQLFilterTest extends OrmFunctionalTestCase $this->loadCompanySingleTableInheritanceFixtureData(); - $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $this->managerId); + $manager = $this->_em->find(CompanyManager::class, $this->managerId); $this->assertFalse($manager->soldContracts->isInitialized()); $this->assertEquals(2, count($manager->soldContracts->slice(0, 10))); @@ -1028,7 +1029,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { // Enable the filter $conf = $this->_em->getConfiguration(); - $conf->addFilter("event_id", "\Doctrine\Tests\ORM\Functional\CompanyEventFilter"); + $conf->addFilter("event_id", CompanyEventFilter::class); $this->_em->getFilters() ->enable("event_id") ->setParameter("id", $this->eventId2); @@ -1039,7 +1040,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanyOrganizationEventJoinedSubclassFixtureData(); - $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId); + $organization = $this->_em->find(CompanyOrganization::class, $this->organizationId); $this->assertFalse($organization->events->isInitialized()); $this->assertEquals(2, count($organization->events)); @@ -1055,10 +1056,10 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanyOrganizationEventJoinedSubclassFixtureData(); - $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId); + $organization = $this->_em->find(CompanyOrganization::class, $this->organizationId); - $event1 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyEvent', $this->eventId1); - $event2 = $this->_em->find('Doctrine\Tests\Models\Company\CompanyEvent', $this->eventId2); + $event1 = $this->_em->find(CompanyEvent::class, $this->eventId1); + $event2 = $this->_em->find(CompanyEvent::class, $this->eventId2); $this->assertFalse($organization->events->isInitialized()); $this->assertTrue($organization->events->contains($event1)); @@ -1076,7 +1077,7 @@ class SQLFilterTest extends OrmFunctionalTestCase { $this->loadCompanyOrganizationEventJoinedSubclassFixtureData(); - $organization = $this->_em->find('Doctrine\Tests\Models\Company\CompanyOrganization', $this->organizationId); + $organization = $this->_em->find(CompanyOrganization::class, $this->organizationId); $this->assertFalse($organization->events->isInitialized()); $this->assertEquals(2, count($organization->events->slice(0, 10))); @@ -1117,7 +1118,7 @@ class CMSCountryFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) { - if ($targetEntity->name != "Doctrine\Tests\Models\CMS\CmsAddress") { + if ($targetEntity->name != CmsAddress::class) { return ""; } @@ -1129,7 +1130,7 @@ class CMSGroupPrefixFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) { - if ($targetEntity->name != "Doctrine\Tests\Models\CMS\CmsGroup") { + if ($targetEntity->name != CmsGroup::class) { return ""; } @@ -1141,7 +1142,7 @@ class CMSArticleTopicFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) { - if ($targetEntity->name != "Doctrine\Tests\Models\CMS\CmsArticle") { + if ($targetEntity->name != CmsArticle::class) { return ""; } @@ -1153,7 +1154,7 @@ class CompanyPersonNameFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias, $targetTable = '') { - if ($targetEntity->name != "Doctrine\Tests\Models\Company\CompanyPerson") { + if ($targetEntity->name != CompanyPerson::class) { return ""; } @@ -1165,7 +1166,7 @@ class CompletedContractFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias, $targetTable = '') { - if ($targetEntity->name != "Doctrine\Tests\Models\Company\CompanyContract") { + if ($targetEntity->name != CompanyContract::class) { return ""; } @@ -1177,7 +1178,7 @@ class CompanyEventFilter extends SQLFilter { public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias, $targetTable = '') { - if ($targetEntity->name != "Doctrine\Tests\Models\Company\CompanyEvent") { + if ($targetEntity->name != CompanyEvent::class) { return ""; } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php index 66eee731a..1a36591cf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\DBAL\Schema\Schema; +use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -61,7 +62,7 @@ class CompanySchemaTest extends OrmFunctionalTestCase $sql = $this->_schemaTool->getDropSchemaSQL( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyManager'), + $this->_em->getClassMetadata(CompanyManager::class), ] ); $this->assertEquals(4, count($sql)); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php index 54caeb34a..8a874c478 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php @@ -21,7 +21,7 @@ class DBAL483Test extends OrmFunctionalTestCase */ public function testDefaultValueIsComparedCorrectly() { - $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DBAL483Default'); + $class = $this->_em->getClassMetadata(DBAL483Default::class); $this->schemaTool->createSchema([$class]); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php index 3ca501ae0..8c414b119 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\DBAL\Schema\Comparator; use Doctrine\ORM\Tools; +use Doctrine\Tests\Models; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -32,12 +33,12 @@ class DDC214Test extends OrmFunctionalTestCase public function testCmsAddressModel() { $this->classes = [ - 'Doctrine\Tests\Models\CMS\CmsUser', - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', - 'Doctrine\Tests\Models\CMS\CmsAddress', - 'Doctrine\Tests\Models\CMS\CmsGroup', - 'Doctrine\Tests\Models\CMS\CmsArticle', - 'Doctrine\Tests\Models\CMS\CmsEmail', + Models\CMS\CmsUser::class, + Models\CMS\CmsPhonenumber::class, + Models\CMS\CmsAddress::class, + Models\CMS\CmsGroup::class, + Models\CMS\CmsArticle::class, + Models\CMS\CmsEmail::class, ]; $this->assertCreatedSchemaNeedsNoUpdates($this->classes); @@ -49,14 +50,14 @@ class DDC214Test extends OrmFunctionalTestCase public function testCompanyModel() { $this->classes = [ - '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' + Models\Company\CompanyPerson::class, + Models\Company\CompanyEmployee::class, + Models\Company\CompanyManager::class, + Models\Company\CompanyOrganization::class, + Models\Company\CompanyEvent::class, + Models\Company\CompanyAuction::class, + Models\Company\CompanyRaffle::class, + Models\Company\CompanyCar::class ]; $this->assertCreatedSchemaNeedsNoUpdates($this->classes); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php index 9df372c91..2deedb37a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\OrmFunctionalTestCase; +use Doctrine\Tests\Models; class MySqlSchemaToolTest extends OrmFunctionalTestCase { @@ -17,12 +18,12 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsTag'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmail'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), + $this->_em->getClassMetadata(Models\CMS\CmsGroup::class), + $this->_em->getClassMetadata(Models\CMS\CmsUser::class), + $this->_em->getClassMetadata(Models\CMS\CmsTag::class), + $this->_em->getClassMetadata(Models\CMS\CmsAddress::class), + $this->_em->getClassMetadata(Models\CMS\CmsEmail::class), + $this->_em->getClassMetadata(Models\CMS\CmsPhonenumber::class), ]; $tool = new SchemaTool($this->_em); @@ -50,7 +51,7 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql2() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel') + $this->_em->getClassMetadata(Models\Generic\DecimalModel::class) ]; $tool = new SchemaTool($this->_em); @@ -63,7 +64,7 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql3() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel') + $this->_em->getClassMetadata(Models\Generic\BooleanModel::class) ]; $tool = new SchemaTool($this->_em); @@ -79,7 +80,7 @@ class MySqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql4() { $classes = [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\MysqlSchemaNamespacedEntity') + $this->_em->getClassMetadata(MysqlSchemaNamespacedEntity::class) ]; $tool = new SchemaTool($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php index f71bfe9ce..5ebf84c56 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool; use Doctrine\ORM\Tools\SchemaTool; +use Doctrine\Tests\Models; use Doctrine\Tests\OrmFunctionalTestCase; class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase @@ -18,7 +19,7 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testPostgresMetadataSequenceIncrementedBy10() { - $address = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $address = $this->_em->getClassMetadata(Models\CMS\CmsAddress::class); $this->assertEquals(1, $address->sequenceGeneratorDefinition['allocationSize']); } @@ -26,9 +27,9 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), + $this->_em->getClassMetadata(Models\CMS\CmsAddress::class), + $this->_em->getClassMetadata(Models\CMS\CmsUser::class), + $this->_em->getClassMetadata(Models\CMS\CmsPhonenumber::class), ]; $tool = new SchemaTool($this->_em); @@ -65,7 +66,7 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql2() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\DecimalModel') + $this->_em->getClassMetadata(Models\Generic\DecimalModel::class) ]; $tool = new SchemaTool($this->_em); @@ -80,7 +81,7 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetCreateSchemaSql3() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\BooleanModel') + $this->_em->getClassMetadata(Models\Generic\BooleanModel::class) ]; $tool = new SchemaTool($this->_em); @@ -94,9 +95,9 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testGetDropSchemaSql() { $classes = [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), + $this->_em->getClassMetadata(Models\CMS\CmsAddress::class), + $this->_em->getClassMetadata(Models\CMS\CmsUser::class), + $this->_em->getClassMetadata(Models\CMS\CmsPhonenumber::class), ]; $tool = new SchemaTool($this->_em); @@ -120,8 +121,8 @@ class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase public function testUpdateSchemaWithPostgreSQLSchema() { $classes = [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Screen'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Avatar'), + $this->_em->getClassMetadata(DDC1657Screen::class), + $this->_em->getClassMetadata(DDC1657Avatar::class), ]; $tool = new SchemaTool($this->_em); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php index efa8f9f4d..9dff7df1d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyTest.php @@ -21,8 +21,8 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $leavingFromId = $this->cities[0]->getId(); $goingToId = $this->cities[1]->getId(); - $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); - $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); + $leavingFrom = $this->_em->find(City::class, $leavingFromId); + $goingTo = $this->_em->find(City::class, $goingToId); $flight = new Flight($leavingFrom, $goingTo); $id = [ 'leavingFrom' => $leavingFromId, @@ -31,25 +31,25 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $flight->setDeparture(new \DateTime('tomorrow')); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $this->_em->persist($flight); $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Flight::CLASSNAME, $id)); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Flight::class, $id)); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $queryCount = $this->getCurrentQueryCount(); - $flight = $this->_em->find(Flight::CLASSNAME, $id); + $flight = $this->_em->find(Flight::class, $id); $leavingFrom = $flight->getLeavingFrom(); $goingTo = $flight->getGoingTo(); - $this->assertInstanceOf(Flight::CLASSNAME, $flight); - $this->assertInstanceOf(City::CLASSNAME, $goingTo); - $this->assertInstanceOf(City::CLASSNAME, $leavingFrom); + $this->assertInstanceOf(Flight::class, $flight); + $this->assertInstanceOf(City::class, $goingTo); + $this->assertInstanceOf(City::class, $leavingFrom); $this->assertEquals($goingTo->getId(), $goingToId); $this->assertEquals($leavingFrom->getId(), $leavingFromId); @@ -67,8 +67,8 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $leavingFromId = $this->cities[0]->getId(); $goingToId = $this->cities[1]->getId(); - $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); - $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); + $leavingFrom = $this->_em->find(City::class, $leavingFromId); + $goingTo = $this->_em->find(City::class, $goingToId); $flight = new Flight($leavingFrom, $goingTo); $id = [ 'leavingFrom' => $leavingFromId, @@ -77,25 +77,25 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $flight->setDeparture(new \DateTime('tomorrow')); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $this->_em->persist($flight); $this->_em->flush(); - $this->assertTrue($this->cache->containsEntity(Flight::CLASSNAME, $id)); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Flight::class, $id)); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $this->_em->remove($flight); $this->_em->flush(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Flight::CLASSNAME, $id)); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Flight::class, $id)); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); - $this->assertNull($this->_em->find(Flight::CLASSNAME, $id)); + $this->assertNull($this->_em->find(Flight::class, $id)); } public function testUpdateCompositPrimaryKeyEntities() @@ -111,8 +111,8 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $tomorrow = new \DateTime('tomorrow'); $leavingFromId = $this->cities[0]->getId(); $goingToId = $this->cities[1]->getId(); - $leavingFrom = $this->_em->find(City::CLASSNAME, $leavingFromId); - $goingTo = $this->_em->find(City::CLASSNAME, $goingToId); + $leavingFrom = $this->_em->find(City::class, $leavingFromId); + $goingTo = $this->_em->find(City::class, $goingToId); $flight = new Flight($leavingFrom, $goingTo); $id = [ 'leavingFrom' => $leavingFromId, @@ -121,25 +121,25 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $flight->setDeparture($now); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $this->_em->persist($flight); $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Flight::CLASSNAME, $id)); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Flight::class, $id)); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $queryCount = $this->getCurrentQueryCount(); - $flight = $this->_em->find(Flight::CLASSNAME, $id); + $flight = $this->_em->find(Flight::class, $id); $leavingFrom = $flight->getLeavingFrom(); $goingTo = $flight->getGoingTo(); - $this->assertInstanceOf(Flight::CLASSNAME, $flight); - $this->assertInstanceOf(City::CLASSNAME, $goingTo); - $this->assertInstanceOf(City::CLASSNAME, $leavingFrom); + $this->assertInstanceOf(Flight::class, $flight); + $this->assertInstanceOf(City::class, $goingTo); + $this->assertInstanceOf(City::class, $leavingFrom); $this->assertEquals($goingTo->getId(), $goingToId); $this->assertEquals($flight->getDeparture(), $now); @@ -153,18 +153,18 @@ class SecondLevelCacheCompositePrimaryKeyTest extends SecondLevelCacheAbstractTe $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Flight::CLASSNAME, $id)); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Flight::class, $id)); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); $queryCount = $this->getCurrentQueryCount(); - $flight = $this->_em->find(Flight::CLASSNAME, $id); + $flight = $this->_em->find(Flight::class, $id); $leavingFrom = $flight->getLeavingFrom(); $goingTo = $flight->getGoingTo(); - $this->assertInstanceOf(Flight::CLASSNAME, $flight); - $this->assertInstanceOf(City::CLASSNAME, $goingTo); - $this->assertInstanceOf(City::CLASSNAME, $leavingFrom); + $this->assertInstanceOf(Flight::class, $flight); + $this->assertInstanceOf(City::class, $goingTo); + $this->assertInstanceOf(City::class, $leavingFrom); $this->assertEquals($goingTo->getId(), $goingToId); $this->assertEquals($flight->getDeparture(), $tomorrow); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php index 0fc7ae415..8af09c9bf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php @@ -2,10 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\OrmFunctionalTestCase; -use Doctrine\Tests\Models\GeoNames\Country; use Doctrine\Tests\Models\GeoNames\Admin1; use Doctrine\Tests\Models\GeoNames\Admin1AlternateName; +use Doctrine\Tests\Models\GeoNames\Country; +use Doctrine\Tests\OrmFunctionalTestCase; class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase { @@ -51,7 +51,7 @@ class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctio public function testFindByReturnsCachedEntity() { - $admin1Repo = $this->_em->getRepository('Doctrine\Tests\Models\GeoNames\Admin1'); + $admin1Repo = $this->_em->getRepository(Admin1::class); $queries = $this->getCurrentQueryCount(); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php index ee5aa3fbd..0f4ca3832 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php @@ -37,19 +37,19 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest ->getSecondLevelCacheConfiguration() ->setCacheFactory($this->cacheFactory); - $this->countryMetadata = $this->_em->getClassMetadata(Country::CLASSNAME); + $this->countryMetadata = $this->_em->getClassMetadata(Country::class); $countryMetadata = clone $this->countryMetadata; $countryMetadata->cache['usage'] = ClassMetadata::CACHE_USAGE_NONSTRICT_READ_WRITE; - $this->_em->getMetadataFactory()->setMetadataFor(Country::CLASSNAME, $countryMetadata); + $this->_em->getMetadataFactory()->setMetadataFor(Country::class, $countryMetadata); } protected function tearDown() { parent::tearDown(); - $this->_em->getMetadataFactory()->setMetadataFor(Country::CLASSNAME, $this->countryMetadata); + $this->_em->getMetadataFactory()->setMetadataFor(Country::class, $this->countryMetadata); } public function testBasicConcurrentEntityReadLock() @@ -58,22 +58,22 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $countryId = $this->countries[0]->getId(); - $cacheId = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId]); - $region = $this->_em->getCache()->getEntityCacheRegion(Country::CLASSNAME); + $cacheId = new EntityCacheKey(Country::class, ['id'=>$countryId]); + $region = $this->_em->getCache()->getEntityCacheRegion(Country::class); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId)); + $this->assertTrue($this->cache->containsEntity(Country::class, $countryId)); /** @var \Doctrine\Tests\Mocks\ConcurrentRegionMock */ $region->setLock($cacheId, Lock::createLockRead()); // another proc lock the entity cache - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $countryId)); + $this->assertFalse($this->cache->containsEntity(Country::class, $countryId)); $queryCount = $this->getCurrentQueryCount(); - $country = $this->_em->find(Country::CLASSNAME, $countryId); + $country = $this->_em->find(Country::class, $countryId); - $this->assertInstanceOf(Country::CLASSNAME, $country); + $this->assertInstanceOf(Country::class, $country); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $countryId)); + $this->assertFalse($this->cache->containsEntity(Country::class, $countryId)); } public function testBasicConcurrentCollectionReadLock() @@ -86,10 +86,10 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest $this->evictRegions(); $stateId = $this->states[0]->getId(); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); - $this->assertInstanceOf(State::CLASSNAME, $state); - $this->assertInstanceOf(Country::CLASSNAME, $state->getCountry()); + $this->assertInstanceOf(State::class, $state); + $this->assertInstanceOf(Country::class, $state->getCountry()); $this->assertNotNull($state->getCountry()->getName()); $this->assertCount(2, $state->getCities()); @@ -97,34 +97,34 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $stateId = $this->states[0]->getId(); - $cacheId = new CollectionCacheKey(State::CLASSNAME, 'cities', ['id'=>$stateId]); - $region = $this->_em->getCache()->getCollectionCacheRegion(State::CLASSNAME, 'cities'); + $cacheId = new CollectionCacheKey(State::class, 'cities', ['id'=>$stateId]); + $region = $this->_em->getCache()->getCollectionCacheRegion(State::class, 'cities'); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId)); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $stateId)); /* @var $region \Doctrine\Tests\Mocks\ConcurrentRegionMock */ $region->setLock($cacheId, Lock::createLockRead()); // another proc lock the entity cache - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId)); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $stateId)); $queryCount = $this->getCurrentQueryCount(); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); $this->assertEquals(0, $this->secondLevelCacheLogger->getMissCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(0, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(0, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::class))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); - $this->assertInstanceOf(State::CLASSNAME, $state); + $this->assertInstanceOf(State::class, $state); $this->assertCount(2, $state->getCities()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::class, 'cities'))); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId)); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $stateId)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCriteriaTest.php index 2096c520c..17d0ac7fc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCriteriaTest.php @@ -2,9 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\Cache\State; -use Doctrine\Tests\Models\Cache\Country; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; +use Doctrine\Tests\Models\Cache\Country; +use Doctrine\Tests\Models\Cache\State; /** * @group DDC-2183 @@ -19,9 +20,9 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->evictRegions(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $name = $this->countries[0]->getName(); $result1 = $repository->matching(new Criteria( @@ -35,7 +36,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->assertEquals($this->countries[0]->getId(), $result1[0]->getId()); $this->assertEquals($this->countries[0]->getName(), $result1[0]->getName()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); $this->_em->clear(); @@ -46,7 +47,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->assertCount(1, $result2); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); + $this->assertInstanceOf(Country::class, $result2[0]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[0]->getName(), $result2[0]->getName()); @@ -59,9 +60,9 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->loadFixturesCountries(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $result1 = $repository->matching(new Criteria( Criteria::expr()->eq('name', $this->countries[0]->getName()) @@ -87,7 +88,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->assertCount(1, $result2); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); + $this->assertInstanceOf(Country::class, $result2[0]); $this->assertEquals($this->countries[0]->getId(), $result2[0]->getId()); $this->assertEquals($this->countries[0]->getName(), $result2[0]->getName()); @@ -102,7 +103,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); $this->assertCount(1, $result3); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result3[0]); + $this->assertInstanceOf(Country::class, $result3[0]); $this->assertEquals($this->countries[1]->getId(), $result3[0]->getId()); $this->assertEquals($this->countries[1]->getName(), $result3[0]->getName()); @@ -114,7 +115,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); $this->assertCount(1, $result4); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result4[0]); + $this->assertInstanceOf(Country::class, $result4[0]); $this->assertEquals($this->countries[1]->getId(), $result4[0]->getId()); $this->assertEquals($this->countries[1]->getName(), $result4[0]->getName()); @@ -128,7 +129,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); - $entity = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $entity = $this->_em->find(State::class, $this->states[0]->getId()); $itemName = $this->states[0]->getCities()->get(0)->getName(); $queryCount = $this->getCurrentQueryCount(); $collection = $entity->getCities(); @@ -137,12 +138,12 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest )); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $matching); + $this->assertInstanceOf(Collection::class, $matching); $this->assertCount(1, $matching); $this->_em->clear(); - $entity = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $entity = $this->_em->find(State::class, $this->states[0]->getId()); $queryCount = $this->getCurrentQueryCount(); $collection = $entity->getCities(); $matching = $collection->matching(new Criteria( @@ -150,7 +151,7 @@ class SecondLevelCacheCriteriaTest extends SecondLevelCacheAbstractTest )); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $matching); + $this->assertInstanceOf(Collection::class, $matching); $this->assertCount(1, $matching); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheExtraLazyCollectionTest.php index 366f846f8..75499ac30 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheExtraLazyCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheExtraLazyCollectionTest.php @@ -16,8 +16,8 @@ class SecondLevelCacheExtraLazyCollectionTest extends SecondLevelCacheAbstractTe { parent::setUp(); - $sourceEntity = $this->_em->getClassMetadata(Travel::CLASSNAME); - $targetEntity = $this->_em->getClassMetadata(City::CLASSNAME); + $sourceEntity = $this->_em->getClassMetadata(Travel::class); + $targetEntity = $this->_em->getClassMetadata(City::class); $sourceEntity->associationMappings['visitedCities']['fetch'] = ClassMetadata::FETCH_EXTRA_LAZY; $targetEntity->associationMappings['travels']['fetch'] = ClassMetadata::FETCH_EXTRA_LAZY; @@ -27,13 +27,13 @@ class SecondLevelCacheExtraLazyCollectionTest extends SecondLevelCacheAbstractTe { parent::tearDown(); - $sourceEntity = $this->_em->getClassMetadata(Travel::CLASSNAME); - $targetEntity = $this->_em->getClassMetadata(City::CLASSNAME); + $sourceEntity = $this->_em->getClassMetadata(Travel::class); + $targetEntity = $this->_em->getClassMetadata(City::class); $sourceEntity->associationMappings['visitedCities']['fetch'] = ClassMetadata::FETCH_LAZY; $targetEntity->associationMappings['travels']['fetch'] = ClassMetadata::FETCH_LAZY; } - + public function testCacheCountAfterAddThenFlush() { $this->loadFixturesCountries(); @@ -45,11 +45,11 @@ class SecondLevelCacheExtraLazyCollectionTest extends SecondLevelCacheAbstractTe $this->_em->clear(); $ownerId = $this->travels[0]->getId(); - $owner = $this->_em->find(Travel::CLASSNAME, $ownerId); - $ref = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); - - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $ownerId)); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $ownerId)); + $owner = $this->_em->find(Travel::class, $ownerId); + $ref = $this->_em->find(State::class, $this->states[1]->getId()); + + $this->assertTrue($this->cache->containsEntity(Travel::class, $ownerId)); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $ownerId)); $newItem = new City("New City", $ref); $owner->getVisitedCities()->add($newItem); @@ -67,15 +67,15 @@ class SecondLevelCacheExtraLazyCollectionTest extends SecondLevelCacheAbstractTe $this->_em->flush(); $this->assertFalse($owner->getVisitedCities()->isInitialized()); - $this->assertFalse($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $ownerId)); + $this->assertFalse($this->cache->containsCollection(Travel::class, 'visitedCities', $ownerId)); $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $owner = $this->_em->find(Travel::CLASSNAME, $ownerId); + $owner = $this->_em->find(Travel::class, $ownerId); $this->assertEquals(4, $owner->getVisitedCities()->count()); $this->assertFalse($owner->getVisitedCities()->isInitialized()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php index 9864172fa..f9b954244 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\Models\Cache\Attraction; use Doctrine\Tests\Models\Cache\AttractionContactInfo; use Doctrine\Tests\Models\Cache\AttractionInfo; @@ -14,9 +15,9 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT { public function testUseSameRegion() { - $infoRegion = $this->cache->getEntityCacheRegion(AttractionInfo::CLASSNAME); - $contactRegion = $this->cache->getEntityCacheRegion(AttractionContactInfo::CLASSNAME); - $locationRegion = $this->cache->getEntityCacheRegion(AttractionLocationInfo::CLASSNAME); + $infoRegion = $this->cache->getEntityCacheRegion(AttractionInfo::class); + $contactRegion = $this->cache->getEntityCacheRegion(AttractionContactInfo::class); + $locationRegion = $this->cache->getEntityCacheRegion(AttractionLocationInfo::class); $this->assertEquals($infoRegion->getName(), $contactRegion->getName()); $this->assertEquals($infoRegion->getName(), $locationRegion->getName()); @@ -32,10 +33,10 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $this->attractionsInfo[0]->getId())); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $this->attractionsInfo[1]->getId())); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $this->attractionsInfo[2]->getId())); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $this->attractionsInfo[3]->getId())); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $this->attractionsInfo[0]->getId())); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $this->attractionsInfo[1]->getId())); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $this->attractionsInfo[2]->getId())); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $this->attractionsInfo[3]->getId())); } public function testJoinTableCountaisRootClass() @@ -49,7 +50,7 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->_em->clear(); foreach ($this->attractionsInfo as $info) { - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $info->getId())); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $info->getId())); $this->assertTrue($this->cache->containsEntity(get_class($info), $info->getId())); } } @@ -64,32 +65,32 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->_em->clear(); - $this->cache->evictEntityRegion(AttractionInfo::CLASSNAME); + $this->cache->evictEntityRegion(AttractionInfo::class); $entityId1 = $this->attractionsInfo[0]->getId(); $entityId2 = $this->attractionsInfo[1]->getId(); - $this->assertFalse($this->cache->containsEntity(AttractionInfo::CLASSNAME, $entityId1)); - $this->assertFalse($this->cache->containsEntity(AttractionInfo::CLASSNAME, $entityId2)); - $this->assertFalse($this->cache->containsEntity(AttractionContactInfo::CLASSNAME, $entityId1)); - $this->assertFalse($this->cache->containsEntity(AttractionContactInfo::CLASSNAME, $entityId2)); + $this->assertFalse($this->cache->containsEntity(AttractionInfo::class, $entityId1)); + $this->assertFalse($this->cache->containsEntity(AttractionInfo::class, $entityId2)); + $this->assertFalse($this->cache->containsEntity(AttractionContactInfo::class, $entityId1)); + $this->assertFalse($this->cache->containsEntity(AttractionContactInfo::class, $entityId2)); $queryCount = $this->getCurrentQueryCount(); - $entity1 = $this->_em->find(AttractionInfo::CLASSNAME, $entityId1); - $entity2 = $this->_em->find(AttractionInfo::CLASSNAME, $entityId2); + $entity1 = $this->_em->find(AttractionInfo::class, $entityId1); + $entity2 = $this->_em->find(AttractionInfo::class, $entityId2); //load entity and relation whit sub classes $this->assertEquals($queryCount + 4, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $entityId1)); - $this->assertTrue($this->cache->containsEntity(AttractionInfo::CLASSNAME, $entityId2)); - $this->assertTrue($this->cache->containsEntity(AttractionContactInfo::CLASSNAME, $entityId1)); - $this->assertTrue($this->cache->containsEntity(AttractionContactInfo::CLASSNAME, $entityId2)); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $entityId1)); + $this->assertTrue($this->cache->containsEntity(AttractionInfo::class, $entityId2)); + $this->assertTrue($this->cache->containsEntity(AttractionContactInfo::class, $entityId1)); + $this->assertTrue($this->cache->containsEntity(AttractionContactInfo::class, $entityId2)); - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity1); - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity2); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity1); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity2); + $this->assertInstanceOf(AttractionInfo::class, $entity1); + $this->assertInstanceOf(AttractionInfo::class, $entity2); + $this->assertInstanceOf(AttractionContactInfo::class, $entity1); + $this->assertInstanceOf(AttractionContactInfo::class, $entity2); $this->assertEquals($this->attractionsInfo[0]->getId(), $entity1->getId()); $this->assertEquals($this->attractionsInfo[0]->getFone(), $entity1->getFone()); @@ -100,15 +101,15 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $entity3 = $this->_em->find(AttractionInfo::CLASSNAME, $entityId1); - $entity4 = $this->_em->find(AttractionInfo::CLASSNAME, $entityId2); + $entity3 = $this->_em->find(AttractionInfo::class, $entityId1); + $entity4 = $this->_em->find(AttractionInfo::class, $entityId2); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity3); - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity4); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity3); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity4); + $this->assertInstanceOf(AttractionInfo::class, $entity3); + $this->assertInstanceOf(AttractionInfo::class, $entity4); + $this->assertInstanceOf(AttractionContactInfo::class, $entity3); + $this->assertInstanceOf(AttractionContactInfo::class, $entity4); $this->assertNotSame($entity1, $entity3); $this->assertEquals($entity1->getId(), $entity3->getId()); @@ -148,7 +149,7 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); foreach ($result2 as $entity) { - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity); + $this->assertInstanceOf(AttractionInfo::class, $entity); } } @@ -162,30 +163,30 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->evictRegions(); $this->_em->clear(); - $entity = $this->_em->find(Attraction::CLASSNAME, $this->attractions[0]->getId()); + $entity = $this->_em->find(Attraction::class, $this->attractions[0]->getId()); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $entity->getInfos()); + $this->assertInstanceOf(Attraction::class, $entity); + $this->assertInstanceOf(PersistentCollection::class, $entity->getInfos()); $this->assertCount(1, $entity->getInfos()); $ownerId = $this->attractions[0]->getId(); $queryCount = $this->getCurrentQueryCount(); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $ownerId)); - $this->assertTrue($this->cache->containsCollection(Attraction::CLASSNAME, 'infos', $ownerId)); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $ownerId)); + $this->assertTrue($this->cache->containsCollection(Attraction::class, 'infos', $ownerId)); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity->getInfos()->get(0)); + $this->assertInstanceOf(AttractionContactInfo::class, $entity->getInfos()->get(0)); $this->assertEquals($this->attractionsInfo[0]->getFone(), $entity->getInfos()->get(0)->getFone()); $this->_em->clear(); - $entity = $this->_em->find(Attraction::CLASSNAME, $this->attractions[0]->getId()); + $entity = $this->_em->find(Attraction::class, $this->attractions[0]->getId()); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $entity->getInfos()); + $this->assertInstanceOf(Attraction::class, $entity); + $this->assertInstanceOf(PersistentCollection::class, $entity->getInfos()); $this->assertCount(1, $entity->getInfos()); - $this->assertInstanceOf(AttractionContactInfo::CLASSNAME, $entity->getInfos()->get(0)); + $this->assertInstanceOf(AttractionContactInfo::class, $entity->getInfos()->get(0)); $this->assertEquals($this->attractionsInfo[0]->getFone(), $entity->getInfos()->get(0)->getFone()); } @@ -228,7 +229,7 @@ class SecondLevelCacheJoinTableInheritanceTest extends SecondLevelCacheAbstractT $this->assertEquals($queryCount + 6, $this->getCurrentQueryCount()); foreach ($result2 as $entity) { - $this->assertInstanceOf(AttractionInfo::CLASSNAME, $entity); + $this->assertInstanceOf(AttractionInfo::class, $entity); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToManyTest.php index 0db9e1cbc..efe19f3e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToManyTest.php @@ -23,16 +23,16 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->loadFixturesTravels(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $this->travels[1]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[0]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[1]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[2]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[3]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[2]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[3]->getId())); } public function testPutAndLoadManyToManyRelation() @@ -46,30 +46,30 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->loadFixturesTravels(); $this->_em->clear(); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictEntityRegion(Travel::CLASSNAME); - $this->cache->evictCollectionRegion(Travel::CLASSNAME, 'visitedCities'); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictEntityRegion(Travel::class); + $this->cache->evictCollectionRegion(Travel::class, 'visitedCities'); $this->secondLevelCacheLogger->clearStats(); - $this->assertFalse($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Travel::class, $this->travels[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Travel::class, $this->travels[1]->getId())); - $this->assertFalse($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[0]->getId())); - $this->assertFalse($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[1]->getId())); + $this->assertFalse($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[0]->getId())); + $this->assertFalse($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[1]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->cities[2]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->cities[3]->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->cities[1]->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->cities[2]->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->cities[3]->getId())); - $t1 = $this->_em->find(Travel::CLASSNAME, $this->travels[0]->getId()); - $t2 = $this->_em->find(Travel::CLASSNAME, $this->travels[1]->getId()); + $t1 = $this->_em->find(Travel::class, $this->travels[0]->getId()); + $t2 = $this->_em->find(Travel::class, $this->travels[1]->getId()); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Travel::CLASSNAME))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(Travel::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Travel::class))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(Travel::class))); //trigger lazy load $this->assertCount(3, $t1->getVisitedCities()); @@ -77,49 +77,49 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->assertEquals(4, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(4, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(Travel::CLASSNAME, 'visitedCities'))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(Travel::CLASSNAME, 'visitedCities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(Travel::class, 'visitedCities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(Travel::class, 'visitedCities'))); - $this->assertInstanceOf(City::CLASSNAME, $t1->getVisitedCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $t1->getVisitedCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $t1->getVisitedCities()->get(2)); + $this->assertInstanceOf(City::class, $t1->getVisitedCities()->get(0)); + $this->assertInstanceOf(City::class, $t1->getVisitedCities()->get(1)); + $this->assertInstanceOf(City::class, $t1->getVisitedCities()->get(2)); - $this->assertInstanceOf(City::CLASSNAME, $t2->getVisitedCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $t2->getVisitedCities()->get(1)); + $this->assertInstanceOf(City::class, $t2->getVisitedCities()->get(0)); + $this->assertInstanceOf(City::class, $t2->getVisitedCities()->get(1)); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $this->travels[1]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[0]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[1]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[2]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[3]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[2]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[3]->getId())); $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); $queryCount = $this->getCurrentQueryCount(); - $t3 = $this->_em->find(Travel::CLASSNAME, $this->travels[0]->getId()); - $t4 = $this->_em->find(Travel::CLASSNAME, $this->travels[1]->getId()); + $t3 = $this->_em->find(Travel::class, $this->travels[0]->getId()); + $t4 = $this->_em->find(Travel::class, $this->travels[1]->getId()); //trigger lazy load from cache $this->assertCount(3, $t3->getVisitedCities()); $this->assertCount(2, $t4->getVisitedCities()); - $this->assertInstanceOf(City::CLASSNAME, $t3->getVisitedCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $t3->getVisitedCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $t3->getVisitedCities()->get(2)); + $this->assertInstanceOf(City::class, $t3->getVisitedCities()->get(0)); + $this->assertInstanceOf(City::class, $t3->getVisitedCities()->get(1)); + $this->assertInstanceOf(City::class, $t3->getVisitedCities()->get(2)); - $this->assertInstanceOf(City::CLASSNAME, $t4->getVisitedCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $t4->getVisitedCities()->get(1)); + $this->assertInstanceOf(City::class, $t4->getVisitedCities()->get(0)); + $this->assertInstanceOf(City::class, $t4->getVisitedCities()->get(1)); $this->assertEquals(4, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Travel::CLASSNAME))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(Travel::CLASSNAME, 'visitedCities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Travel::class))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(Travel::class, 'visitedCities'))); $this->assertNotSame($t1->getVisitedCities()->get(0), $t3->getVisitedCities()->get(0)); $this->assertEquals($t1->getVisitedCities()->get(0)->getId(), $t3->getVisitedCities()->get(0)->getId()); @@ -153,11 +153,11 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->loadFixturesStates(); $this->loadFixturesCities(); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictEntityRegion(Traveler::CLASSNAME); - $this->cache->evictEntityRegion(Travel::CLASSNAME); - $this->cache->evictCollectionRegion(State::CLASSNAME, 'cities'); - $this->cache->evictCollectionRegion(Traveler::CLASSNAME, 'travels'); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictEntityRegion(Traveler::class); + $this->cache->evictEntityRegion(Travel::class); + $this->cache->evictCollectionRegion(State::class, 'cities'); + $this->cache->evictCollectionRegion(Traveler::class, 'travels'); $traveler = new Traveler('Doctrine Bot'); $travel = new Travel($traveler); @@ -171,17 +171,17 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $travel->getId())); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $traveler->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[3]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $travel->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $travel->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $traveler->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[3]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $travel->getId())); $queryCount1 = $this->getCurrentQueryCount(); - $t1 = $this->_em->find(Travel::CLASSNAME, $travel->getId()); + $t1 = $this->_em->find(Travel::class, $travel->getId()); - $this->assertInstanceOf(Travel::CLASSNAME, $t1); + $this->assertInstanceOf(Travel::class, $t1); $this->assertCount(3, $t1->getVisitedCities()); $this->assertEquals($queryCount1, $this->getCurrentQueryCount()); } @@ -202,10 +202,10 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Travel::CLASSNAME, $this->travels[0]->getId())); - $this->assertTrue($this->cache->containsCollection(Travel::CLASSNAME, 'visitedCities', $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Travel::class, $this->travels[0]->getId())); + $this->assertTrue($this->cache->containsCollection(Travel::class, 'visitedCities', $this->travels[0]->getId())); - $travel = $this->_em->find(Travel::CLASSNAME, $this->travels[0]->getId()); + $travel = $this->_em->find(Travel::class, $this->travels[0]->getId()); $this->assertCount(3, $travel->getVisitedCities()); @@ -229,18 +229,18 @@ class SecondLevelCacheManyToManyTest extends SecondLevelCacheAbstractTest $queryCount = $this->getCurrentQueryCount(); $entitiId = $this->travels[2]->getId(); //empty travel - $entity = $this->_em->find(Travel::CLASSNAME, $entitiId); + $entity = $this->_em->find(Travel::class, $entitiId); $this->assertEquals(0, $entity->getVisitedCities()->count()); $this->assertEquals($queryCount+2, $this->getCurrentQueryCount()); $this->_em->clear(); - $entity = $this->_em->find(Travel::CLASSNAME, $entitiId); + $entity = $this->_em->find(Travel::class, $entitiId); $queryCount = $this->getCurrentQueryCount(); $this->assertEquals(0, $entity->getVisitedCities()->count()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php index 57215f8e0..7af52f741 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php @@ -2,12 +2,13 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Cache\Region; +use Doctrine\Tests\Models\Cache\Action; use Doctrine\Tests\Models\Cache\City; use Doctrine\Tests\Models\Cache\ComplexAction; use Doctrine\Tests\Models\Cache\Country; use Doctrine\Tests\Models\Cache\State; use Doctrine\Tests\Models\Cache\Token; -use Doctrine\Tests\Models\Cache\Action; /** * @group DDC-2183 @@ -20,10 +21,10 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->loadFixturesStates(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->states[0]->getCountry()->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->states[1]->getCountry()->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->states[0]->getCountry()->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->states[1]->getCountry()->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); } public function testPutAndLoadManyToOneRelation() @@ -32,30 +33,30 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->loadFixturesStates(); $this->_em->clear(); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictEntityRegion(Country::class); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->states[0]->getCountry()->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->states[1]->getCountry()->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->states[0]->getCountry()->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->states[1]->getCountry()->getId())); - $c1 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $c2 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $c1 = $this->_em->find(State::class, $this->states[0]->getId()); + $c2 = $this->_em->find(State::class, $this->states[1]->getId()); //trigger lazy load $this->assertNotNull($c1->getCountry()->getName()); $this->assertNotNull($c2->getCountry()->getName()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->states[0]->getCountry()->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->states[1]->getCountry()->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->states[0]->getCountry()->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->states[1]->getCountry()->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertInstanceOf(State::CLASSNAME, $c1); - $this->assertInstanceOf(State::CLASSNAME, $c2); - $this->assertInstanceOf(Country::CLASSNAME, $c1->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $c2->getCountry()); + $this->assertInstanceOf(State::class, $c1); + $this->assertInstanceOf(State::class, $c2); + $this->assertInstanceOf(Country::class, $c1->getCountry()); + $this->assertInstanceOf(Country::class, $c2->getCountry()); $this->assertEquals($this->states[0]->getId(), $c1->getId()); $this->assertEquals($this->states[0]->getName(), $c1->getName()); @@ -71,8 +72,8 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $queryCount = $this->getCurrentQueryCount(); - $c3 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $c4 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $c3 = $this->_em->find(State::class, $this->states[0]->getId()); + $c4 = $this->_em->find(State::class, $this->states[1]->getId()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); @@ -80,10 +81,10 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->assertNotNull($c3->getCountry()->getName()); $this->assertNotNull($c4->getCountry()->getName()); - $this->assertInstanceOf(State::CLASSNAME, $c3); - $this->assertInstanceOf(State::CLASSNAME, $c4); - $this->assertInstanceOf(Country::CLASSNAME, $c3->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $c4->getCountry()); + $this->assertInstanceOf(State::class, $c3); + $this->assertInstanceOf(State::class, $c4); + $this->assertInstanceOf(Country::class, $c3->getCountry()); + $this->assertInstanceOf(Country::class, $c4->getCountry()); $this->assertEquals($c1->getId(), $c3->getId()); $this->assertEquals($c1->getName(), $c3->getName()); @@ -105,11 +106,11 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictEntityRegion(Country::class); //evict collection on add - $c3 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $c3 = $this->_em->find(State::class, $this->states[0]->getId()); $prev = $c3->getCities(); $count = $prev->count(); $city = new City("Buenos Aires", $c3); @@ -121,7 +122,7 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $state = $this->_em->find(State::CLASSNAME, $c3->getId()); + $state = $this->_em->find(State::class, $c3->getId()); $queryCount = $this->getCurrentQueryCount(); // Association was cleared from EM @@ -144,29 +145,29 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $countryId1 = $this->states[0]->getCountry()->getId(); $countryId2 = $this->states[3]->getCountry()->getId(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId1)); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId2)); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId1)); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId2)); + $this->assertTrue($this->cache->containsEntity(Country::class, $countryId1)); + $this->assertTrue($this->cache->containsEntity(Country::class, $countryId2)); + $this->assertTrue($this->cache->containsEntity(State::class, $stateId1)); + $this->assertTrue($this->cache->containsEntity(State::class, $stateId2)); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(Country::class); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $countryId1)); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $countryId2)); + $this->assertFalse($this->cache->containsEntity(Country::class, $countryId1)); + $this->assertFalse($this->cache->containsEntity(Country::class, $countryId2)); $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $state1 = $this->_em->find(State::CLASSNAME, $stateId1); - $state2 = $this->_em->find(State::CLASSNAME, $stateId2); + $state1 = $this->_em->find(State::class, $stateId1); + $state2 = $this->_em->find(State::class, $stateId2); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $state1); - $this->assertInstanceOf(State::CLASSNAME, $state2); - $this->assertInstanceOf(Country::CLASSNAME, $state1->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $state2->getCountry()); + $this->assertInstanceOf(State::class, $state1); + $this->assertInstanceOf(State::class, $state2); + $this->assertInstanceOf(Country::class, $state1->getCountry()); + $this->assertInstanceOf(Country::class, $state2->getCountry()); $queryCount = $this->getCurrentQueryCount(); @@ -180,8 +181,8 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest public function testPutAndLoadNonCacheableManyToOne() { - $this->assertNull($this->cache->getEntityCacheRegion(Action::CLASSNAME)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(Token::CLASSNAME)); + $this->assertNull($this->cache->getEntityCacheRegion(Action::class)); + $this->assertInstanceOf(Region::class, $this->cache->getEntityCacheRegion(Token::class)); $token = new Token('token-hash'); $action = new Action('exec'); @@ -192,16 +193,16 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token)); - $this->assertFalse($this->cache->containsEntity(Token::CLASSNAME, $action->name)); + $this->assertTrue($this->cache->containsEntity(Token::class, $token->token)); + $this->assertFalse($this->cache->containsEntity(Token::class, $action->name)); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(Token::CLASSNAME, $token->token); + $entity = $this->_em->find(Token::class, $token->token); - $this->assertInstanceOf(Token::CLASSNAME, $entity); + $this->assertInstanceOf(Token::class, $entity); $this->assertEquals('token-hash', $entity->token); - $this->assertInstanceOf(Action::CLASSNAME, $entity->getAction()); + $this->assertInstanceOf(Action::class, $entity->getAction()); $this->assertEquals('exec', $entity->getAction()->name); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); @@ -209,9 +210,9 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest public function testPutAndLoadNonCacheableCompositeManyToOne() { - $this->assertNull($this->cache->getEntityCacheRegion(Action::CLASSNAME)); - $this->assertNull($this->cache->getEntityCacheRegion(ComplexAction::CLASSNAME)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(Token::CLASSNAME)); + $this->assertNull($this->cache->getEntityCacheRegion(Action::class)); + $this->assertNull($this->cache->getEntityCacheRegion(ComplexAction::class)); + $this->assertInstanceOf(Region::class, $this->cache->getEntityCacheRegion(Token::class)); $token = new Token('token-hash'); @@ -230,28 +231,28 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token)); - $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action1->name)); - $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action2->name)); - $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action3->name)); + $this->assertTrue($this->cache->containsEntity(Token::class, $token->token)); + $this->assertFalse($this->cache->containsEntity(Action::class, $action1->name)); + $this->assertFalse($this->cache->containsEntity(Action::class, $action2->name)); + $this->assertFalse($this->cache->containsEntity(Action::class, $action3->name)); $queryCount = $this->getCurrentQueryCount(); /** * @var $entity Token */ - $entity = $this->_em->find(Token::CLASSNAME, $token->token); + $entity = $this->_em->find(Token::class, $token->token); - $this->assertInstanceOf(Token::CLASSNAME, $entity); + $this->assertInstanceOf(Token::class, $entity); $this->assertEquals('token-hash', $entity->token); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Action::CLASSNAME, $entity->getAction()); - $this->assertInstanceOf(ComplexAction::CLASSNAME, $entity->getComplexAction()); + $this->assertInstanceOf(Action::class, $entity->getAction()); + $this->assertInstanceOf(ComplexAction::class, $entity->getComplexAction()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Action::CLASSNAME, $entity->getComplexAction()->getAction1()); - $this->assertInstanceOf(Action::CLASSNAME, $entity->getComplexAction()->getAction2()); + $this->assertInstanceOf(Action::class, $entity->getComplexAction()->getAction1()); + $this->assertInstanceOf(Action::class, $entity->getComplexAction()->getAction2()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->assertEquals('login', $entity->getComplexAction()->getAction1()->name); @@ -259,4 +260,4 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->assertEquals('rememberme', $entity->getComplexAction()->getAction2()->name); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php index 829cc4056..9f347cc5b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Cache\Region; use Doctrine\Tests\Models\Cache\City; use Doctrine\Tests\Models\Cache\Login; use Doctrine\Tests\Models\Cache\State; @@ -22,10 +23,10 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[0]->getId())); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $this->states[0]->getId())); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $this->states[1]->getId())); } public function testPutAndLoadOneToManyRelation() @@ -36,28 +37,28 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictCollectionRegion(State::CLASSNAME, 'cities'); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictCollectionRegion(State::class, 'cities'); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[0]->getId())); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[1]->getId())); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $this->states[0]->getId())); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $this->states[1]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(0)->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(1)->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[1]->getCities()->get(0)->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[1]->getCities()->get(1)->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(0)->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(1)->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[1]->getCities()->get(0)->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[1]->getCities()->get(1)->getId())); - $s1 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $s2 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $s1 = $this->_em->find(State::class, $this->states[0]->getId()); + $s2 = $this->_em->find(State::class, $this->states[1]->getId()); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::class))); //trigger lazy load $this->assertCount(2, $s1->getCities()); @@ -65,46 +66,46 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->assertEquals(4, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(4, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(State::class, 'cities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::class, 'cities'))); - $this->assertInstanceOf(City::CLASSNAME, $s1->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $s1->getCities()->get(1)); + $this->assertInstanceOf(City::class, $s1->getCities()->get(0)); + $this->assertInstanceOf(City::class, $s1->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $s2->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $s2->getCities()->get(1)); + $this->assertInstanceOf(City::class, $s2->getCities()->get(0)); + $this->assertInstanceOf(City::class, $s2->getCities()->get(1)); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[0]->getId())); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[1]->getId())); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $this->states[0]->getId())); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $this->states[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(0)->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(1)->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[1]->getCities()->get(0)->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[1]->getCities()->get(1)->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(0)->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(1)->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[1]->getCities()->get(0)->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[1]->getCities()->get(1)->getId())); $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); $queryCount = $this->getCurrentQueryCount(); - $s3 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $s4 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $s3 = $this->_em->find(State::class, $this->states[0]->getId()); + $s4 = $this->_em->find(State::class, $this->states[1]->getId()); //trigger lazy load from cache $this->assertCount(2, $s3->getCities()); $this->assertCount(2, $s4->getCities()); $this->assertEquals(4, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::class, 'cities'))); - $this->assertInstanceOf(City::CLASSNAME, $s3->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $s3->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $s4->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $s4->getCities()->get(1)); + $this->assertInstanceOf(City::class, $s3->getCities()->get(0)); + $this->assertInstanceOf(City::class, $s3->getCities()->get(1)); + $this->assertInstanceOf(City::class, $s4->getCities()->get(0)); + $this->assertInstanceOf(City::class, $s4->getCities()->get(1)); $this->assertNotSame($s1->getCities()->get(0), $s3->getCities()->get(0)); $this->assertEquals($s1->getCities()->get(0)->getId(), $s3->getCities()->get(0)->getId()); @@ -134,32 +135,32 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); //trigger lazy load from database - $this->assertCount(2, $this->_em->find(State::CLASSNAME, $this->states[0]->getId())->getCities()); + $this->assertCount(2, $this->_em->find(State::class, $this->states[0]->getId())->getCities()); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(0)->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(1)->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(0)->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(1)->getId())); $queryCount = $this->getCurrentQueryCount(); $stateId = $this->states[0]->getId(); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); $cityId = $this->states[0]->getCities()->get(1)->getId(); //trigger lazy load from cache $this->assertCount(2, $state->getCities()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $cityId)); + $this->assertTrue($this->cache->containsEntity(City::class, $cityId)); - $this->cache->evictEntity(City::CLASSNAME, $cityId); + $this->cache->evictEntity(City::class, $cityId); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $cityId)); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId)); - $this->assertTrue($this->cache->containsCollection(State::CLASSNAME, 'cities', $stateId)); + $this->assertFalse($this->cache->containsEntity(City::class, $cityId)); + $this->assertTrue($this->cache->containsEntity(State::class, $stateId)); + $this->assertTrue($this->cache->containsCollection(State::class, 'cities', $stateId)); $this->_em->clear(); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); //trigger lazy load from database $this->assertCount(2, $state->getCities()); @@ -178,8 +179,8 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $state->getId())); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $state->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $state->getId())); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $state->getId())); } public function testOneToManyRemove() @@ -191,51 +192,51 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictCollectionRegion(State::CLASSNAME, 'cities'); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictCollectionRegion(State::class, 'cities'); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertFalse($this->cache->containsCollection(State::CLASSNAME, 'cities', $this->states[0]->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(0)->getId())); - $this->assertFalse($this->cache->containsEntity(City::CLASSNAME, $this->states[0]->getCities()->get(1)->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertFalse($this->cache->containsCollection(State::class, 'cities', $this->states[0]->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(0)->getId())); + $this->assertFalse($this->cache->containsEntity(City::class, $this->states[0]->getCities()->get(1)->getId())); - $entity = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $entity = $this->_em->find(State::class, $this->states[0]->getId()); $this->assertEquals(1, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getEntityRegion(State::class))); //trigger lazy load $this->assertCount(2, $entity->getCities()); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getCollectionRegion(State::class, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getCollectionRegion(State::class, 'cities'))); - $this->assertInstanceOf(City::CLASSNAME, $entity->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $entity->getCities()->get(1)); + $this->assertInstanceOf(City::class, $entity->getCities()->get(0)); + $this->assertInstanceOf(City::class, $entity->getCities()->get(1)); $this->_em->clear(); $this->secondLevelCacheLogger->clearStats(); $queryCount = $this->getCurrentQueryCount(); - $state = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $state = $this->_em->find(State::class, $this->states[0]->getId()); //trigger lazy load from cache $this->assertCount(2, $state->getCities()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::class, 'cities'))); $city0 = $state->getCities()->get(0); $city1 = $state->getCities()->get(1); - $this->assertInstanceOf(City::CLASSNAME, $city0); - $this->assertInstanceOf(City::CLASSNAME, $city1); + $this->assertInstanceOf(City::class, $city0); + $this->assertInstanceOf(City::class, $city1); $this->assertEquals($entity->getCities()->get(0)->getName(), $city0->getName()); $this->assertEquals($entity->getCities()->get(1)->getName(), $city1->getName()); @@ -253,18 +254,18 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $queryCount = $this->getCurrentQueryCount(); - $state = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $state = $this->_em->find(State::class, $this->states[0]->getId()); //trigger lazy load from cache $this->assertCount(1, $state->getCities()); $city1 = $state->getCities()->get(0); - $this->assertInstanceOf(City::CLASSNAME, $city1); + $this->assertInstanceOf(City::class, $city1); $this->assertEquals($entity->getCities()->get(1)->getName(), $city1->getName()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::class, 'cities'))); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); @@ -278,13 +279,13 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $queryCount = $this->getCurrentQueryCount(); - $state = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); + $state = $this->_em->find(State::class, $this->states[0]->getId()); $this->assertCount(0, $state->getCities()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::CLASSNAME, 'cities'))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); + $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getCollectionRegion(State::class, 'cities'))); } public function testOneToManyWithEmptyRelation() @@ -294,14 +295,14 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->loadFixturesCities(); $this->secondLevelCacheLogger->clearStats(); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictCollectionRegion(State::CLASSNAME, 'cities'); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictCollectionRegion(State::class, 'cities'); $this->_em->clear(); $entitiId = $this->states[2]->getId(); // bavaria (cities count = 0) $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(State::CLASSNAME, $entitiId); + $entity = $this->_em->find(State::class, $entitiId); $this->assertEquals(0, $entity->getCities()->count()); $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); @@ -309,7 +310,7 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(State::CLASSNAME, $entitiId); + $entity = $this->_em->find(State::class, $entitiId); $this->assertEquals(0, $entity->getCities()->count()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); @@ -323,14 +324,14 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->loadFixturesCities(); $this->secondLevelCacheLogger->clearStats(); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->cache->evictCollectionRegion(State::CLASSNAME, 'cities'); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictEntityRegion(State::class); + $this->cache->evictCollectionRegion(State::class, 'cities'); $this->_em->clear(); $entityId = $this->states[0]->getId(); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(State::CLASSNAME, $entityId); + $entity = $this->_em->find(State::class, $entityId); $this->assertEquals(2, $entity->getCities()->count()); $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); @@ -338,7 +339,7 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(State::CLASSNAME, $entityId); + $entity = $this->_em->find(State::class, $entityId); $this->assertEquals(2, $entity->getCities()->count()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); @@ -364,7 +365,7 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $travelerId = $traveler->getId(); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(Traveler::CLASSNAME, $travelerId); + $entity = $this->_em->find(Traveler::class, $travelerId); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertFalse($entity->getTravels()->isInitialized()); @@ -388,8 +389,8 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest public function testPutAndLoadNonCacheableOneToMany() { - $this->assertNull($this->cache->getEntityCacheRegion(Login::CLASSNAME)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(Token::CLASSNAME)); + $this->assertNull($this->cache->getEntityCacheRegion(Login::class)); + $this->assertInstanceOf(Region::class, $this->cache->getEntityCacheRegion(Token::class)); $l1 = new Login('session1'); $l2 = new Login('session2'); @@ -401,13 +402,13 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token)); + $this->assertTrue($this->cache->containsEntity(Token::class, $token->token)); $queryCount = $this->getCurrentQueryCount(); - $entity = $this->_em->find(Token::CLASSNAME, $token->token); + $entity = $this->_em->find(Token::class, $token->token); - $this->assertInstanceOf(Token::CLASSNAME, $entity); + $this->assertInstanceOf(Token::class, $entity); $this->assertEquals('token-hash', $entity->token); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php index 316620f82..6e428814d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToOneTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Cache\Region; use Doctrine\Tests\Models\Cache\Address; use Doctrine\Tests\Models\Cache\Client; use Doctrine\Tests\Models\Cache\Person; @@ -27,10 +28,10 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $entity1 = $this->travelersWithProfile[0]; $entity2 = $this->travelersWithProfile[1]; - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity1->getId())); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity2->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity1->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity2->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity2->getProfile()->getId())); } public function testPutOneToOneOnBidirectionalPersist() @@ -46,12 +47,12 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $entity1 = $this->travelersWithProfile[0]; $entity2 = $this->travelersWithProfile[1]; - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity1->getId())); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity2->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getProfile()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity1->getProfile()->getInfo()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity2->getProfile()->getInfo()->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity1->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity2->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity2->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::class, $entity1->getProfile()->getInfo()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::class, $entity2->getProfile()->getInfo()->getId())); } public function testPutAndLoadOneToOneUnidirectionalRelation() @@ -64,30 +65,30 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->cache->evictEntityRegion(Traveler::CLASSNAME); - $this->cache->evictEntityRegion(TravelerProfile::CLASSNAME); + $this->cache->evictEntityRegion(Traveler::class); + $this->cache->evictEntityRegion(TravelerProfile::class); $entity1 = $this->travelersWithProfile[0]; $entity2 = $this->travelersWithProfile[1]; - $this->assertFalse($this->cache->containsEntity(Traveler::CLASSNAME, $entity1->getId())); - $this->assertFalse($this->cache->containsEntity(Traveler::CLASSNAME, $entity2->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getProfile()->getId())); + $this->assertFalse($this->cache->containsEntity(Traveler::class, $entity1->getId())); + $this->assertFalse($this->cache->containsEntity(Traveler::class, $entity2->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity2->getProfile()->getId())); - $t1 = $this->_em->find(Traveler::CLASSNAME, $entity1->getId()); - $t2 = $this->_em->find(Traveler::CLASSNAME, $entity2->getId()); + $t1 = $this->_em->find(Traveler::class, $entity1->getId()); + $t2 = $this->_em->find(Traveler::class, $entity2->getId()); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity1->getId())); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity2->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity1->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity2->getId())); // The inverse side its not cached - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getProfile()->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity2->getProfile()->getId())); - $this->assertInstanceOf(Traveler::CLASSNAME, $t1); - $this->assertInstanceOf(Traveler::CLASSNAME, $t2); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $t1->getProfile()); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $t2->getProfile()); + $this->assertInstanceOf(Traveler::class, $t1); + $this->assertInstanceOf(Traveler::class, $t2); + $this->assertInstanceOf(TravelerProfile::class, $t1->getProfile()); + $this->assertInstanceOf(TravelerProfile::class, $t2->getProfile()); $this->assertEquals($entity1->getId(), $t1->getId()); $this->assertEquals($entity1->getName(), $t1->getName()); @@ -100,22 +101,22 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->assertEquals($entity2->getProfile()->getName(), $t2->getProfile()->getName()); // its all cached now - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity1->getId())); - $this->assertTrue($this->cache->containsEntity(Traveler::CLASSNAME, $entity2->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity1->getId())); + $this->assertTrue($this->cache->containsEntity(Traveler::class, $entity2->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity1->getProfile()->getId())); $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); // load from cache - $t3 = $this->_em->find(Traveler::CLASSNAME, $entity1->getId()); - $t4 = $this->_em->find(Traveler::CLASSNAME, $entity2->getId()); + $t3 = $this->_em->find(Traveler::class, $entity1->getId()); + $t4 = $this->_em->find(Traveler::class, $entity2->getId()); - $this->assertInstanceOf(Traveler::CLASSNAME, $t3); - $this->assertInstanceOf(Traveler::CLASSNAME, $t4); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $t3->getProfile()); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $t4->getProfile()); + $this->assertInstanceOf(Traveler::class, $t3); + $this->assertInstanceOf(Traveler::class, $t4); + $this->assertInstanceOf(TravelerProfile::class, $t3->getProfile()); + $this->assertInstanceOf(TravelerProfile::class, $t4->getProfile()); $this->assertEquals($entity1->getProfile()->getId(), $t3->getProfile()->getId()); $this->assertEquals($entity2->getProfile()->getId(), $t4->getProfile()->getId()); @@ -136,20 +137,20 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->cache->evictEntityRegion(Traveler::CLASSNAME); - $this->cache->evictEntityRegion(TravelerProfile::CLASSNAME); - $this->cache->evictEntityRegion(TravelerProfileInfo::CLASSNAME); + $this->cache->evictEntityRegion(Traveler::class); + $this->cache->evictEntityRegion(TravelerProfile::class); + $this->cache->evictEntityRegion(TravelerProfileInfo::class); $entity1 = $this->travelersWithProfile[0]->getProfile(); $entity2 = $this->travelersWithProfile[1]->getProfile(); - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity1->getInfo()->getId())); - $this->assertFalse($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity2->getInfo()->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity1->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfile::class, $entity2->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfileInfo::class, $entity1->getInfo()->getId())); + $this->assertFalse($this->cache->containsEntity(TravelerProfileInfo::class, $entity2->getInfo()->getId())); - $p1 = $this->_em->find(TravelerProfile::CLASSNAME, $entity1->getId()); - $p2 = $this->_em->find(TravelerProfile::CLASSNAME, $entity2->getId()); + $p1 = $this->_em->find(TravelerProfile::class, $entity1->getId()); + $p2 = $this->_em->find(TravelerProfile::class, $entity2->getId()); $this->assertEquals($entity1->getId(), $p1->getId()); $this->assertEquals($entity1->getName(), $p1->getName()); @@ -161,22 +162,22 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->assertEquals($entity2->getInfo()->getId(), $p2->getInfo()->getId()); $this->assertEquals($entity2->getInfo()->getDescription(), $p2->getInfo()->getDescription()); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity1->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfile::CLASSNAME, $entity2->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity1->getInfo()->getId())); - $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::CLASSNAME, $entity2->getInfo()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity1->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfile::class, $entity2->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::class, $entity1->getInfo()->getId())); + $this->assertTrue($this->cache->containsEntity(TravelerProfileInfo::class, $entity2->getInfo()->getId())); $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $p3 = $this->_em->find(TravelerProfile::CLASSNAME, $entity1->getId()); - $p4 = $this->_em->find(TravelerProfile::CLASSNAME, $entity2->getId()); + $p3 = $this->_em->find(TravelerProfile::class, $entity1->getId()); + $p4 = $this->_em->find(TravelerProfile::class, $entity2->getId()); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $p3); - $this->assertInstanceOf(TravelerProfile::CLASSNAME, $p4); - $this->assertInstanceOf(TravelerProfileInfo::CLASSNAME, $p3->getInfo()); - $this->assertInstanceOf(TravelerProfileInfo::CLASSNAME, $p4->getInfo()); + $this->assertInstanceOf(TravelerProfile::class, $p3); + $this->assertInstanceOf(TravelerProfile::class, $p4); + $this->assertInstanceOf(TravelerProfileInfo::class, $p3->getInfo()); + $this->assertInstanceOf(TravelerProfileInfo::class, $p4->getInfo()); $this->assertEquals($entity1->getId(), $p3->getId()); $this->assertEquals($entity1->getName(), $p3->getName()); @@ -197,19 +198,19 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->cache->evictEntityRegion(Person::CLASSNAME); - $this->cache->evictEntityRegion(Address::CLASSNAME); + $this->cache->evictEntityRegion(Person::class); + $this->cache->evictEntityRegion(Address::class); $entity1 = $this->addresses[0]->person; $entity2 = $this->addresses[1]->person; - $this->assertFalse($this->cache->containsEntity(Person::CLASSNAME, $entity1->id)); - $this->assertFalse($this->cache->containsEntity(Person::CLASSNAME, $entity2->id)); - $this->assertFalse($this->cache->containsEntity(Address::CLASSNAME, $entity1->address->id)); - $this->assertFalse($this->cache->containsEntity(Address::CLASSNAME, $entity2->address->id)); + $this->assertFalse($this->cache->containsEntity(Person::class, $entity1->id)); + $this->assertFalse($this->cache->containsEntity(Person::class, $entity2->id)); + $this->assertFalse($this->cache->containsEntity(Address::class, $entity1->address->id)); + $this->assertFalse($this->cache->containsEntity(Address::class, $entity2->address->id)); - $p1 = $this->_em->find(Person::CLASSNAME, $entity1->id); - $p2 = $this->_em->find(Person::CLASSNAME, $entity2->id); + $p1 = $this->_em->find(Person::class, $entity1->id); + $p2 = $this->_em->find(Person::class, $entity2->id); $this->assertEquals($entity1->id, $p1->id); $this->assertEquals($entity1->name, $p1->name); @@ -221,23 +222,23 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $this->assertEquals($entity2->address->id, $p2->address->id); $this->assertEquals($entity2->address->location, $p2->address->location); - $this->assertTrue($this->cache->containsEntity(Person::CLASSNAME, $entity1->id)); - $this->assertTrue($this->cache->containsEntity(Person::CLASSNAME, $entity2->id)); + $this->assertTrue($this->cache->containsEntity(Person::class, $entity1->id)); + $this->assertTrue($this->cache->containsEntity(Person::class, $entity2->id)); // The inverse side its not cached - $this->assertFalse($this->cache->containsEntity(Address::CLASSNAME, $entity1->address->id)); - $this->assertFalse($this->cache->containsEntity(Address::CLASSNAME, $entity2->address->id)); + $this->assertFalse($this->cache->containsEntity(Address::class, $entity1->address->id)); + $this->assertFalse($this->cache->containsEntity(Address::class, $entity2->address->id)); $this->_em->clear(); $queryCount = $this->getCurrentQueryCount(); - $p3 = $this->_em->find(Person::CLASSNAME, $entity1->id); - $p4 = $this->_em->find(Person::CLASSNAME, $entity2->id); + $p3 = $this->_em->find(Person::class, $entity1->id); + $p4 = $this->_em->find(Person::class, $entity2->id); - $this->assertInstanceOf(Person::CLASSNAME, $p3); - $this->assertInstanceOf(Person::CLASSNAME, $p4); - $this->assertInstanceOf(Address::CLASSNAME, $p3->address); - $this->assertInstanceOf(Address::CLASSNAME, $p4->address); + $this->assertInstanceOf(Person::class, $p3); + $this->assertInstanceOf(Person::class, $p4); + $this->assertInstanceOf(Address::class, $p3->address); + $this->assertInstanceOf(Address::class, $p4->address); $this->assertEquals($entity1->id, $p3->id); $this->assertEquals($entity1->name, $p3->name); @@ -254,8 +255,8 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest public function testPutAndLoadNonCacheableOneToOne() { - $this->assertNull($this->cache->getEntityCacheRegion(Client::CLASSNAME)); - $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(Token::CLASSNAME)); + $this->assertNull($this->cache->getEntityCacheRegion(Client::class)); + $this->assertInstanceOf(Region::class, $this->cache->getEntityCacheRegion(Token::class)); $client = new Client('FabioBatSilva'); $token = new Token('token-hash', $client); @@ -267,17 +268,17 @@ class SecondLevelCacheOneToOneTest extends SecondLevelCacheAbstractTest $queryCount = $this->getCurrentQueryCount(); - $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token)); - $this->assertFalse($this->cache->containsEntity(Client::CLASSNAME, $client->id)); + $this->assertTrue($this->cache->containsEntity(Token::class, $token->token)); + $this->assertFalse($this->cache->containsEntity(Client::class, $client->id)); - $entity = $this->_em->find(Token::CLASSNAME, $token->token); + $entity = $this->_em->find(Token::class, $token->token); - $this->assertInstanceOf(Token::CLASSNAME, $entity); - $this->assertInstanceOf(Client::CLASSNAME, $entity->getClient()); + $this->assertInstanceOf(Token::class, $entity); + $this->assertInstanceOf(Client::class, $entity->getClient()); $this->assertEquals('token-hash', $entity->token); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertEquals('FabioBatSilva', $entity->getClient()->name); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); } -} \ 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 51a93417b..0a32886dd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php @@ -3,16 +3,17 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\AbstractQuery; -use Doctrine\ORM\Query\ResultSetMapping; -use Doctrine\Tests\Models\Cache\City; -use Doctrine\Tests\Models\Cache\State; -use Doctrine\Tests\Models\Cache\Country; -use Doctrine\Tests\Models\Cache\Attraction; -use Doctrine\ORM\Cache\QueryCacheKey; -use Doctrine\ORM\Cache\EntityCacheKey; -use Doctrine\ORM\Cache\EntityCacheEntry; -use Doctrine\ORM\Query; use Doctrine\ORM\Cache; +use Doctrine\ORM\Cache\EntityCacheEntry; +use Doctrine\ORM\Cache\EntityCacheKey; +use Doctrine\ORM\Cache\QueryCacheKey; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\ORM\Query; +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Models\Cache\Attraction; +use Doctrine\Tests\Models\Cache\City; +use Doctrine\Tests\Models\Cache\Country; +use Doctrine\Tests\Models\Cache\State; /** * @group DDC-2183 @@ -27,8 +28,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; @@ -63,8 +64,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[1]); + $this->assertInstanceOf(Country::class, $result2[0]); + $this->assertInstanceOf(Country::class, $result2[1]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[1]->getId(), $result2[1]->getId()); @@ -90,8 +91,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; @@ -113,8 +114,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertCount(2, $result); $this->assertEquals($queryCount + 3, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); // MODE_GET should read items if exists. $this->assertCount(2, $queryGet->getResult()); @@ -130,8 +131,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; @@ -139,8 +140,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->setCacheable(true) ->getResult(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->assertCount(2, $result); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); @@ -152,13 +153,13 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest // MODE_PUT should never read itens from cache. $this->assertCount(2, $queryPut->getResult()); $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->assertCount(2, $queryPut->getResult()); $this->assertEquals($queryCount + 3, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); } public function testQueryCacheModeRefresh() @@ -170,18 +171,18 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $region = $this->cache->getEntityCacheRegion(Country::CLASSNAME); + $region = $this->cache->getEntityCacheRegion(Country::class); $queryCount = $this->getCurrentQueryCount(); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; $result = $this->_em->createQuery($dql) ->setCacheable(true) ->getResult(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->assertCount(2, $result); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); @@ -191,10 +192,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $countryName1 = $this->countries[0]->getName(); $countryName2 = $this->countries[1]->getName(); - $key1 = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId1]); - $key2 = new EntityCacheKey(Country::CLASSNAME, ['id'=>$countryId2]); - $entry1 = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId1, 'name'=>'outdated']); - $entry2 = new EntityCacheEntry(Country::CLASSNAME, ['id'=>$countryId2, 'name'=>'outdated']); + $key1 = new EntityCacheKey(Country::class, ['id'=>$countryId1]); + $key2 = new EntityCacheKey(Country::class, ['id'=>$countryId2]); + $entry1 = new EntityCacheEntry(Country::class, ['id'=>$countryId1, 'name'=>'outdated']); + $entry2 = new EntityCacheEntry(Country::class, ['id'=>$countryId2, 'name'=>'outdated']); $region->put($key1, $entry1); $region->put($key2, $entry2); @@ -240,14 +241,14 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals($this->countries[0]->getName(), $result1[0]->getName()); $this->assertEquals($this->countries[1]->getName(), $result1[1]->getName()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->assertEquals(3, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); $this->_em->clear(); @@ -266,8 +267,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[1]); + $this->assertInstanceOf(Country::class, $result2[0]); + $this->assertInstanceOf(Country::class, $result2[1]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[1]->getId(), $result2[1]->getId()); @@ -295,9 +296,9 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesAttractions(); $queryRegionName = $this->getDefaultQueryRegionName(); - $cityRegionName = $this->getEntityRegion(City::CLASSNAME); - $stateRegionName = $this->getEntityRegion(State::CLASSNAME); - $attractionRegionName = $this->getEntityRegion(Attraction::CLASSNAME); + $cityRegionName = $this->getEntityRegion(City::class); + $stateRegionName = $this->getEntityRegion(State::class); + $attractionRegionName = $this->getEntityRegion(Attraction::class); $this->secondLevelCacheLogger->clearStats(); $this->evictRegions(); @@ -312,29 +313,29 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertCount(2, $result1); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[1]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[2]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $this->cities[3]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[1]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[2]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $this->cities[3]->getId())); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $this->attractions[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $this->attractions[1]->getId())); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $this->attractions[2]->getId())); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $this->attractions[3]->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $this->attractions[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $this->attractions[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $this->attractions[2]->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $this->attractions[3]->getId())); - $this->assertInstanceOf(State::CLASSNAME, $result1[0]); - $this->assertInstanceOf(State::CLASSNAME, $result1[1]); + $this->assertInstanceOf(State::class, $result1[0]); + $this->assertInstanceOf(State::class, $result1[1]); $this->assertCount(2, $result1[0]->getCities()); $this->assertCount(2, $result1[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(1)); $this->assertCount(2, $result1[0]->getCities()->get(0)->getAttractions()); $this->assertCount(2, $result1[0]->getCities()->get(1)->getAttractions()); @@ -350,16 +351,16 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertCount(2, $result2); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $result2[0]); - $this->assertInstanceOf(State::CLASSNAME, $result2[1]); + $this->assertInstanceOf(State::class, $result2[0]); + $this->assertInstanceOf(State::class, $result2[1]); $this->assertCount(2, $result2[0]->getCities()); $this->assertCount(2, $result2[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(1)); $this->assertCount(2, $result2[0]->getCities()->get(0)->getAttractions()); $this->assertCount(2, $result2[0]->getCities()->get(1)->getAttractions()); @@ -374,8 +375,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesCountries(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); $name = $this->countries[0]->getName(); @@ -398,7 +399,7 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->assertCount(1, $result2); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); + $this->assertInstanceOf(Country::class, $result2[0]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[0]->getName(), $result2[0]->getName()); @@ -411,8 +412,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesCountries(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; @@ -430,8 +431,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->cache->evictEntity(Country::CLASSNAME, $result1[0]->getId()); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $result1[0]->getId())); + $this->cache->evictEntity(Country::class, $result1[0]->getId()); + $this->assertFalse($this->cache->containsEntity(Country::class, $result1[0]->getId())); $this->_em->clear(); @@ -447,8 +448,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getDefaultQueryRegionName())); $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[1]); + $this->assertInstanceOf(Country::class, $result2[0]); + $this->assertInstanceOf(Country::class, $result2[1]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[1]->getId(), $result2[1]->getId()); @@ -475,15 +476,15 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getResult(); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $result1[0]); - $this->assertInstanceOf(State::CLASSNAME, $result1[1]); + $this->assertInstanceOf(State::class, $result1[0]); + $this->assertInstanceOf(State::class, $result1[1]); $this->assertCount(2, $result1[0]->getCities()); $this->assertCount(2, $result1[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(1)); $this->assertNotNull($result1[0]->getCities()->get(0)->getId()); $this->assertNotNull($result1[0]->getCities()->get(1)->getId()); @@ -501,15 +502,15 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->setCacheable(true) ->getResult(); - $this->assertInstanceOf(State::CLASSNAME, $result2[0]); - $this->assertInstanceOf(State::CLASSNAME, $result2[1]); + $this->assertInstanceOf(State::class, $result2[0]); + $this->assertInstanceOf(State::class, $result2[1]); $this->assertCount(2, $result2[0]->getCities()); $this->assertCount(2, $result2[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(1)); $this->assertNotNull($result2[0]->getCities()->get(0)->getId()); $this->assertNotNull($result2[0]->getCities()->get(1)->getId()); @@ -541,22 +542,22 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getResult(); $this->assertCount(4, $result1); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]); - $this->assertInstanceOf(State::CLASSNAME, $result1[0]->getState()); - $this->assertInstanceOf(State::CLASSNAME, $result1[1]->getState()); + $this->assertInstanceOf(City::class, $result1[0]); + $this->assertInstanceOf(City::class, $result1[1]); + $this->assertInstanceOf(State::class, $result1[0]->getState()); + $this->assertInstanceOf(State::class, $result1[1]->getState()); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $result1[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $result1[1]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $result1[0]->getState()->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $result1[1]->getState()->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $result1[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $result1[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $result1[0]->getState()->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $result1[1]->getState()->getId())); $this->assertEquals(7, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionPutCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); - $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(City::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); + $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(City::class))); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); @@ -568,10 +569,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getResult(); $this->assertCount(4, $result1); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]); - $this->assertInstanceOf(State::CLASSNAME, $result2[0]->getState()); - $this->assertInstanceOf(State::CLASSNAME, $result2[1]->getState()); + $this->assertInstanceOf(City::class, $result2[0]); + $this->assertInstanceOf(City::class, $result2[1]); + $this->assertInstanceOf(State::class, $result2[0]->getState()); + $this->assertInstanceOf(State::class, $result2[1]->getState()); $this->assertNotNull($result2[0]->getId()); $this->assertNotNull($result2[0]->getId()); @@ -608,30 +609,30 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getResult(); $this->assertCount(4, $result1); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]); - $this->assertInstanceOf(State::CLASSNAME, $result1[0]->getState()); - $this->assertInstanceOf(State::CLASSNAME, $result1[1]->getState()); + $this->assertInstanceOf(City::class, $result1[0]); + $this->assertInstanceOf(City::class, $result1[1]); + $this->assertInstanceOf(State::class, $result1[0]->getState()); + $this->assertInstanceOf(State::class, $result1[1]->getState()); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $result1[0]->getId())); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $result1[1]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $result1[0]->getState()->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $result1[1]->getState()->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $result1[0]->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $result1[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $result1[0]->getState()->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $result1[1]->getState()->getId())); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->_em->clear(); - $this->cache->evictEntityRegion(State::CLASSNAME); + $this->cache->evictEntityRegion(State::class); $result2 = $this->_em->createQuery($dql) ->setCacheable(true) ->getResult(); $this->assertCount(4, $result1); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]); - $this->assertInstanceOf(State::CLASSNAME, $result2[0]->getState()); - $this->assertInstanceOf(State::CLASSNAME, $result2[1]->getState()); + $this->assertInstanceOf(City::class, $result2[0]); + $this->assertInstanceOf(City::class, $result2[1]); + $this->assertInstanceOf(State::class, $result2[0]->getState()); + $this->assertInstanceOf(State::class, $result2[1]->getState()); $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); } @@ -652,33 +653,33 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getResult(); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $result1[0]); - $this->assertInstanceOf(State::CLASSNAME, $result1[1]); + $this->assertInstanceOf(State::class, $result1[0]); + $this->assertInstanceOf(State::class, $result1[1]); $this->assertCount(2, $result1[0]->getCities()); $this->assertCount(2, $result1[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result1[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result1[1]->getCities()->get(1)); $this->_em->clear(); - $this->cache->evictEntityRegion(City::CLASSNAME); + $this->cache->evictEntityRegion(City::class); $result2 = $this->_em->createQuery($dql) ->setCacheable(true) ->getResult(); - $this->assertInstanceOf(State::CLASSNAME, $result2[0]); - $this->assertInstanceOf(State::CLASSNAME, $result2[1]); + $this->assertInstanceOf(State::class, $result2[0]); + $this->assertInstanceOf(State::class, $result2[1]); $this->assertCount(2, $result2[0]->getCities()); $this->assertCount(2, $result2[1]->getCities()); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[0]->getCities()->get(1)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(0)); - $this->assertInstanceOf(City::CLASSNAME, $result2[1]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[0]->getCities()->get(1)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(0)); + $this->assertInstanceOf(City::class, $result2[1]->getCities()->get(1)); $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); } @@ -691,11 +692,11 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $rsm = new ResultSetMapping; - $rsm->addEntityResult(Country::CLASSNAME, 'c'); + $rsm->addEntityResult(Country::class, 'c'); $rsm->addFieldResult('c', 'name', 'name'); $rsm->addFieldResult('c', 'id', 'id'); @@ -732,8 +733,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionHitCount($this->getDefaultQueryRegionName())); $this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount($this->getDefaultQueryRegionName())); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\Country', $result2[1]); + $this->assertInstanceOf(Country::class, $result2[0]); + $this->assertInstanceOf(Country::class, $result2[1]); $this->assertEquals($result1[0]->getId(), $result2[0]->getId()); $this->assertEquals($result1[1]->getId(), $result2[1]->getId()); @@ -827,7 +828,7 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getRegion() ->get($key); - $this->assertInstanceOf('Doctrine\ORM\Cache\QueryCacheEntry', $entry); + $this->assertInstanceOf(Cache\QueryCacheEntry::class, $entry); $entry->time = $entry->time / 2; $this->cache->getQueryCache() @@ -936,8 +937,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertNotNull($state1); $this->assertNotNull($state1->getCountry()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state1); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state1->getCountry()); + $this->assertInstanceOf(State::class, $state1); + $this->assertInstanceOf(Proxy::class, $state1->getCountry()); $this->assertEquals($countryName, $state1->getCountry()->getName()); $this->assertEquals($stateId, $state1->getId()); @@ -954,8 +955,8 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertNotNull($state2); $this->assertNotNull($state2->getCountry()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state2); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state2->getCountry()); + $this->assertInstanceOf(State::class, $state2); + $this->assertInstanceOf(Proxy::class, $state2->getCountry()); $this->assertEquals($countryName, $state2->getCountry()->getName()); $this->assertEquals($stateId, $state2->getId()); } @@ -983,10 +984,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getSingleResult(); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $city1); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $city1->getState()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $city1->getState()->getCities()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $city1->getState()->getCities()->get(0)->getState()); + $this->assertInstanceOf(City::class, $city1); + $this->assertInstanceOf(State::class, $city1->getState()); + $this->assertInstanceOf(City::class, $city1->getState()->getCities()->get(0)); + $this->assertInstanceOf(State::class, $city1->getState()->getCities()->get(0)->getState()); $this->_em->clear(); @@ -999,10 +1000,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getSingleResult(); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $city2); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $city2->getState()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $city2->getState()->getCities()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $city2->getState()->getCities()->get(0)->getState()); + $this->assertInstanceOf(City::class, $city2); + $this->assertInstanceOf(State::class, $city2->getState()); + $this->assertInstanceOf(City::class, $city2->getState()->getCities()->get(0)); + $this->assertInstanceOf(State::class, $city2->getState()->getCities()->get(0)->getState()); } public function testResolveToManyAssociationCacheEntry() @@ -1028,10 +1029,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getSingleResult(); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state1); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state1->getCountry()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $state1->getCities()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state1->getCities()->get(0)->getState()); + $this->assertInstanceOf(State::class, $state1); + $this->assertInstanceOf(Proxy::class, $state1->getCountry()); + $this->assertInstanceOf(City::class, $state1->getCities()->get(0)); + $this->assertInstanceOf(State::class, $state1->getCities()->get(0)->getState()); $this->assertSame($state1, $state1->getCities()->get(0)->getState()); $this->_em->clear(); @@ -1045,10 +1046,10 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest ->getSingleResult(); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state2); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state2->getCountry()); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\City', $state2->getCities()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state2->getCities()->get(0)->getState()); + $this->assertInstanceOf(State::class, $state2); + $this->assertInstanceOf(Proxy::class, $state2->getCountry()); + $this->assertInstanceOf(City::class, $state2->getCities()->get(0)); + $this->assertInstanceOf(State::class, $state2->getCities()->get(0)->getState()); $this->assertSame($state2, $state2->getCities()->get(0)->getState()); } @@ -1057,15 +1058,15 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->evictRegions(); $this->loadFixturesCountries(); - $this->assertTrue($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->_em->createQuery('DELETE Doctrine\Tests\Models\Cache\Country u WHERE u.id = 4') ->setHint(Query::HINT_CACHE_EVICT, true) ->execute(); - $this->assertFalse($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); } public function testHintClearEntityRegionDeleteStatement() @@ -1073,15 +1074,15 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->evictRegions(); $this->loadFixturesCountries(); - $this->assertTrue($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->_em->createQuery("UPDATE Doctrine\Tests\Models\Cache\Country u SET u.name = 'foo' WHERE u.id = 1") ->setHint(Query::HINT_CACHE_EVICT, true) ->execute(); - $this->assertFalse($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity('Doctrine\Tests\Models\Cache\Country', $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); } /** @@ -1150,7 +1151,7 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); foreach ($result2 as $entity) { - $this->assertInstanceOf(Country::CLASSNAME, $entity); + $this->assertInstanceOf(Country::class, $entity); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php index 8e37dd960..c8c4303c4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheRepositoryTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\Cache\Country; use Doctrine\Tests\Models\Cache\State; @@ -18,22 +19,22 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $queryCount = $this->getCurrentQueryCount(); - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $country1 = $repository->find($this->countries[0]->getId()); $country2 = $repository->find($this->countries[1]->getId()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Country::CLASSNAME, $country1); - $this->assertInstanceOf(Country::CLASSNAME, $country2); + $this->assertInstanceOf(Country::class, $country1); + $this->assertInstanceOf(Country::class, $country2); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); $this->assertEquals(0, $this->secondLevelCacheLogger->getMissCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Country::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Country::class))); } @@ -44,10 +45,10 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $this->assertCount(2, $repository->findAll()); @@ -58,14 +59,14 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Country::CLASSNAME, $countries[0]); - $this->assertInstanceOf(Country::CLASSNAME, $countries[1]); + $this->assertInstanceOf(Country::class, $countries[0]); + $this->assertInstanceOf(Country::class, $countries[1]); $this->assertEquals(3, $this->secondLevelCacheLogger->getHitCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); } public function testRepositoryCacheFindAllInvalidation() @@ -75,10 +76,10 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $this->assertCount(2, $repository->findAll()); @@ -90,8 +91,8 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertCount(2, $countries); - $this->assertInstanceOf(Country::CLASSNAME, $countries[0]); - $this->assertInstanceOf(Country::CLASSNAME, $countries[1]); + $this->assertInstanceOf(Country::class, $countries[0]); + $this->assertInstanceOf(Country::class, $countries[1]); $country = new Country('foo'); @@ -123,10 +124,10 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); $criteria = ['name'=>$this->countries[0]->getName()]; - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $this->assertCount(1, $repository->findBy($criteria)); @@ -138,12 +139,12 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertCount(1, $countries); - $this->assertInstanceOf(Country::CLASSNAME, $countries[0]); + $this->assertInstanceOf(Country::class, $countries[0]); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); } public function testRepositoryCacheFindOneBy() @@ -153,10 +154,10 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->secondLevelCacheLogger->clearStats(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); $criteria = ['name'=>$this->countries[0]->getName()]; - $repository = $this->_em->getRepository(Country::CLASSNAME); + $repository = $this->_em->getRepository(Country::class); $queryCount = $this->getCurrentQueryCount(); $this->assertNotNull($repository->findOneBy($criteria)); @@ -167,12 +168,12 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Country::CLASSNAME, $country); + $this->assertInstanceOf(Country::class, $country); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); $this->assertEquals(1, $this->secondLevelCacheLogger->getMissCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); } public function testRepositoryCacheFindAllToOneAssociation() @@ -186,19 +187,19 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->_em->clear(); // load from database - $repository = $this->_em->getRepository(State::CLASSNAME); + $repository = $this->_em->getRepository(State::class); $queryCount = $this->getCurrentQueryCount(); $entities = $repository->findAll(); $this->assertCount(4, $entities); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $entities[0]); - $this->assertInstanceOf(State::CLASSNAME, $entities[1]); - $this->assertInstanceOf(Country::CLASSNAME, $entities[0]->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $entities[0]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry()); + $this->assertInstanceOf(State::class, $entities[0]); + $this->assertInstanceOf(State::class, $entities[1]); + $this->assertInstanceOf(Country::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Country::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[1]->getCountry()); // load from cache $queryCount = $this->getCurrentQueryCount(); @@ -207,15 +208,15 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertCount(4, $entities); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $entities[0]); - $this->assertInstanceOf(State::CLASSNAME, $entities[1]); - $this->assertInstanceOf(Country::CLASSNAME, $entities[0]->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $entities[1]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry()); + $this->assertInstanceOf(State::class, $entities[0]); + $this->assertInstanceOf(State::class, $entities[1]); + $this->assertInstanceOf(Country::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Country::class, $entities[1]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[1]->getCountry()); // invalidate cache - $this->_em->persist(new State('foo', $this->_em->find(Country::CLASSNAME, $this->countries[0]->getId()))); + $this->_em->persist(new State('foo', $this->_em->find(Country::class, $this->countries[0]->getId()))); $this->_em->flush(); $this->_em->clear(); @@ -226,12 +227,12 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertCount(5, $entities); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $entities[0]); - $this->assertInstanceOf(State::CLASSNAME, $entities[1]); - $this->assertInstanceOf(Country::CLASSNAME, $entities[0]->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $entities[1]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry()); + $this->assertInstanceOf(State::class, $entities[0]); + $this->assertInstanceOf(State::class, $entities[1]); + $this->assertInstanceOf(Country::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Country::class, $entities[1]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[1]->getCountry()); // load from cache $queryCount = $this->getCurrentQueryCount(); @@ -240,11 +241,11 @@ class SecondLevelCacheRepositoryTest extends SecondLevelCacheAbstractTest $this->assertCount(5, $entities); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(State::CLASSNAME, $entities[0]); - $this->assertInstanceOf(State::CLASSNAME, $entities[1]); - $this->assertInstanceOf(Country::CLASSNAME, $entities[0]->getCountry()); - $this->assertInstanceOf(Country::CLASSNAME, $entities[1]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[0]->getCountry()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $entities[1]->getCountry()); + $this->assertInstanceOf(State::class, $entities[0]); + $this->assertInstanceOf(State::class, $entities[1]); + $this->assertInstanceOf(Country::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Country::class, $entities[1]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[0]->getCountry()); + $this->assertInstanceOf(Proxy::class, $entities[1]->getCountry()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php index 0ee1df176..858adb3a1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php @@ -2,11 +2,12 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\Models\Cache\Attraction; -use Doctrine\Tests\Models\Cache\Restaurant; +use Doctrine\Tests\Models\Cache\Bar; use Doctrine\Tests\Models\Cache\Beach; use Doctrine\Tests\Models\Cache\City; -use Doctrine\Tests\Models\Cache\Bar; +use Doctrine\Tests\Models\Cache\Restaurant; /** * @group DDC-2183 @@ -15,10 +16,10 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac { public function testUseSameRegion() { - $attractionRegion = $this->cache->getEntityCacheRegion(Attraction::CLASSNAME); - $restaurantRegion = $this->cache->getEntityCacheRegion(Restaurant::CLASSNAME); - $beachRegion = $this->cache->getEntityCacheRegion(Beach::CLASSNAME); - $barRegion = $this->cache->getEntityCacheRegion(Bar::CLASSNAME); + $attractionRegion = $this->cache->getEntityCacheRegion(Attraction::class); + $restaurantRegion = $this->cache->getEntityCacheRegion(Restaurant::class); + $beachRegion = $this->cache->getEntityCacheRegion(Beach::class); + $barRegion = $this->cache->getEntityCacheRegion(Bar::class); $this->assertEquals($attractionRegion->getName(), $restaurantRegion->getName()); $this->assertEquals($attractionRegion->getName(), $beachRegion->getName()); @@ -34,8 +35,8 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Bar::CLASSNAME, $this->attractions[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Bar::CLASSNAME, $this->attractions[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Bar::class, $this->attractions[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Bar::class, $this->attractions[1]->getId())); } public function testCountaisRootClass() @@ -48,7 +49,7 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->_em->clear(); foreach ($this->attractions as $attraction) { - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $attraction->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $attraction->getId())); $this->assertTrue($this->cache->containsEntity(get_class($attraction), $attraction->getId())); } } @@ -62,28 +63,28 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->_em->clear(); - $this->cache->evictEntityRegion(Attraction::CLASSNAME); + $this->cache->evictEntityRegion(Attraction::class); $entityId1 = $this->attractions[0]->getId(); $entityId2 = $this->attractions[1]->getId(); - $this->assertFalse($this->cache->containsEntity(Attraction::CLASSNAME, $entityId1)); - $this->assertFalse($this->cache->containsEntity(Attraction::CLASSNAME, $entityId2)); - $this->assertFalse($this->cache->containsEntity(Bar::CLASSNAME, $entityId1)); - $this->assertFalse($this->cache->containsEntity(Bar::CLASSNAME, $entityId2)); + $this->assertFalse($this->cache->containsEntity(Attraction::class, $entityId1)); + $this->assertFalse($this->cache->containsEntity(Attraction::class, $entityId2)); + $this->assertFalse($this->cache->containsEntity(Bar::class, $entityId1)); + $this->assertFalse($this->cache->containsEntity(Bar::class, $entityId2)); - $entity1 = $this->_em->find(Attraction::CLASSNAME, $entityId1); - $entity2 = $this->_em->find(Attraction::CLASSNAME, $entityId2); + $entity1 = $this->_em->find(Attraction::class, $entityId1); + $entity2 = $this->_em->find(Attraction::class, $entityId2); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $entityId1)); - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $entityId2)); - $this->assertTrue($this->cache->containsEntity(Bar::CLASSNAME, $entityId1)); - $this->assertTrue($this->cache->containsEntity(Bar::CLASSNAME, $entityId2)); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $entityId1)); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $entityId2)); + $this->assertTrue($this->cache->containsEntity(Bar::class, $entityId1)); + $this->assertTrue($this->cache->containsEntity(Bar::class, $entityId2)); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity1); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity2); - $this->assertInstanceOf(Bar::CLASSNAME, $entity1); - $this->assertInstanceOf(Bar::CLASSNAME, $entity2); + $this->assertInstanceOf(Attraction::class, $entity1); + $this->assertInstanceOf(Attraction::class, $entity2); + $this->assertInstanceOf(Bar::class, $entity1); + $this->assertInstanceOf(Bar::class, $entity2); $this->assertEquals($this->attractions[0]->getId(), $entity1->getId()); $this->assertEquals($this->attractions[0]->getName(), $entity1->getName()); @@ -95,15 +96,15 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $queryCount = $this->getCurrentQueryCount(); - $entity3 = $this->_em->find(Attraction::CLASSNAME, $entityId1); - $entity4 = $this->_em->find(Attraction::CLASSNAME, $entityId2); + $entity3 = $this->_em->find(Attraction::class, $entityId1); + $entity4 = $this->_em->find(Attraction::class, $entityId2); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity3); - $this->assertInstanceOf(Attraction::CLASSNAME, $entity4); - $this->assertInstanceOf(Bar::CLASSNAME, $entity3); - $this->assertInstanceOf(Bar::CLASSNAME, $entity4); + $this->assertInstanceOf(Attraction::class, $entity3); + $this->assertInstanceOf(Attraction::class, $entity4); + $this->assertInstanceOf(Bar::class, $entity3); + $this->assertInstanceOf(Bar::class, $entity4); $this->assertNotSame($entity1, $entity3); $this->assertEquals($entity1->getId(), $entity3->getId()); @@ -142,7 +143,7 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); foreach ($result2 as $entity) { - $this->assertInstanceOf(Attraction::CLASSNAME, $entity); + $this->assertInstanceOf(Attraction::class, $entity); } } @@ -156,12 +157,12 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->_em->clear(); foreach ($this->cities as $city) { - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $city->getId())); - $this->assertFalse($this->cache->containsCollection(City::CLASSNAME, 'attractions', $city->getId())); + $this->assertTrue($this->cache->containsEntity(City::class, $city->getId())); + $this->assertFalse($this->cache->containsCollection(City::class, 'attractions', $city->getId())); } foreach ($this->attractions as $attraction) { - $this->assertTrue($this->cache->containsEntity(Attraction::CLASSNAME, $attraction->getId())); + $this->assertTrue($this->cache->containsEntity(Attraction::class, $attraction->getId())); } } @@ -172,41 +173,41 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->loadFixturesCities(); $this->loadFixturesAttractions(); - $this->cache->evictEntityRegion(City::CLASSNAME); - $this->cache->evictEntityRegion(Attraction::CLASSNAME); - $this->cache->evictCollectionRegion(City::CLASSNAME, 'attractions'); + $this->cache->evictEntityRegion(City::class); + $this->cache->evictEntityRegion(Attraction::class); + $this->cache->evictCollectionRegion(City::class, 'attractions'); $this->_em->clear(); - $entity = $this->_em->find(City::CLASSNAME, $this->cities[0]->getId()); + $entity = $this->_em->find(City::class, $this->cities[0]->getId()); - $this->assertInstanceOf(City::CLASSNAME, $entity); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $entity->getAttractions()); + $this->assertInstanceOf(City::class, $entity); + $this->assertInstanceOf(PersistentCollection::class, $entity->getAttractions()); $this->assertCount(2, $entity->getAttractions()); $ownerId = $this->cities[0]->getId(); $queryCount = $this->getCurrentQueryCount(); - $this->assertTrue($this->cache->containsEntity(City::CLASSNAME, $ownerId)); - $this->assertTrue($this->cache->containsCollection(City::CLASSNAME, 'attractions', $ownerId)); + $this->assertTrue($this->cache->containsEntity(City::class, $ownerId)); + $this->assertTrue($this->cache->containsCollection(City::class, 'attractions', $ownerId)); - $this->assertInstanceOf(Bar::CLASSNAME, $entity->getAttractions()->get(0)); - $this->assertInstanceOf(Bar::CLASSNAME, $entity->getAttractions()->get(1)); + $this->assertInstanceOf(Bar::class, $entity->getAttractions()->get(0)); + $this->assertInstanceOf(Bar::class, $entity->getAttractions()->get(1)); $this->assertEquals($this->attractions[0]->getName(), $entity->getAttractions()->get(0)->getName()); $this->assertEquals($this->attractions[1]->getName(), $entity->getAttractions()->get(1)->getName()); $this->_em->clear(); - $entity = $this->_em->find(City::CLASSNAME, $ownerId); + $entity = $this->_em->find(City::class, $ownerId); - $this->assertInstanceOf(City::CLASSNAME, $entity); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $entity->getAttractions()); + $this->assertInstanceOf(City::class, $entity); + $this->assertInstanceOf(PersistentCollection::class, $entity->getAttractions()); $this->assertCount(2, $entity->getAttractions()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(Bar::CLASSNAME, $entity->getAttractions()->get(0)); - $this->assertInstanceOf(Bar::CLASSNAME, $entity->getAttractions()->get(1)); + $this->assertInstanceOf(Bar::class, $entity->getAttractions()->get(0)); + $this->assertInstanceOf(Bar::class, $entity->getAttractions()->get(1)); $this->assertEquals($this->attractions[0]->getName(), $entity->getAttractions()->get(0)->getName()); $this->assertEquals($this->attractions[1]->getName(), $entity->getAttractions()->get(1)->getName()); } @@ -248,7 +249,7 @@ class SecondLevelCacheSingleTableInheritanceTest extends SecondLevelCacheAbstrac $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); foreach ($result2 as $entity) { - $this->assertInstanceOf(Attraction::CLASSNAME, $entity); + $this->assertInstanceOf(Attraction::class, $entity); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php index 79044395a..32047dda3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php @@ -16,10 +16,10 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->loadFixturesCountries(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); } public function testPutAndLoadEntities() @@ -28,21 +28,21 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(Country::class); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $c1 = $this->_em->find(Country::CLASSNAME, $this->countries[0]->getId()); - $c2 = $this->_em->find(Country::CLASSNAME, $this->countries[1]->getId()); + $c1 = $this->_em->find(Country::class, $this->countries[0]->getId()); + $c2 = $this->_em->find(Country::class, $this->countries[1]->getId()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $this->assertInstanceOf(Country::CLASSNAME, $c1); - $this->assertInstanceOf(Country::CLASSNAME, $c2); + $this->assertInstanceOf(Country::class, $c1); + $this->assertInstanceOf(Country::class, $c2); $this->assertEquals($this->countries[0]->getId(), $c1->getId()); $this->assertEquals($this->countries[0]->getName(), $c1->getName()); @@ -54,15 +54,15 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $queryCount = $this->getCurrentQueryCount(); - $c3 = $this->_em->find(Country::CLASSNAME, $this->countries[0]->getId()); - $c4 = $this->_em->find(Country::CLASSNAME, $this->countries[1]->getId()); + $c3 = $this->_em->find(Country::class, $this->countries[0]->getId()); + $c4 = $this->_em->find(Country::class, $this->countries[1]->getId()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Country::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(Country::class))); - $this->assertInstanceOf(Country::CLASSNAME, $c3); - $this->assertInstanceOf(Country::CLASSNAME, $c4); + $this->assertInstanceOf(Country::class, $c3); + $this->assertInstanceOf(Country::class, $c4); $this->assertEquals($c1->getId(), $c3->getId()); $this->assertEquals($c1->getName(), $c3->getName()); @@ -78,23 +78,23 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); - $this->cache->evictEntityRegion(Country::CLASSNAME); - $this->secondLevelCacheLogger->clearRegionStats($this->getEntityRegion(Country::CLASSNAME)); + $this->cache->evictEntityRegion(Country::class); + $this->secondLevelCacheLogger->clearRegionStats($this->getEntityRegion(Country::class)); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $c1 = $this->_em->find(Country::CLASSNAME, $this->countries[0]->getId()); - $c2 = $this->_em->find(Country::CLASSNAME, $this->countries[1]->getId()); + $c1 = $this->_em->find(Country::class, $this->countries[0]->getId()); + $c2 = $this->_em->find(Country::class, $this->countries[1]->getId()); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getMissCount()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $this->assertInstanceOf(Country::CLASSNAME, $c1); - $this->assertInstanceOf(Country::CLASSNAME, $c2); + $this->assertInstanceOf(Country::class, $c1); + $this->assertInstanceOf(Country::class, $c2); $this->assertEquals($this->countries[0]->getId(), $c1->getId()); $this->assertEquals($this->countries[0]->getName(), $c1->getName()); @@ -107,11 +107,11 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertFalse($this->cache->containsEntity(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[0]->getId())); + $this->assertFalse($this->cache->containsEntity(Country::class, $this->countries[1]->getId())); - $this->assertNull($this->_em->find(Country::CLASSNAME, $this->countries[0]->getId())); - $this->assertNull($this->_em->find(Country::CLASSNAME, $this->countries[1]->getId())); + $this->assertNull($this->_em->find(Country::class, $this->countries[0]->getId())); + $this->assertNull($this->_em->find(Country::class, $this->countries[1]->getId())); $this->assertEquals(2, $this->secondLevelCacheLogger->getPutCount()); $this->assertEquals(2, $this->secondLevelCacheLogger->getMissCount()); @@ -124,27 +124,27 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->assertEquals(6, $this->secondLevelCacheLogger->getPutCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); - $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); + $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); - $this->cache->evictEntityRegion(State::CLASSNAME); - $this->secondLevelCacheLogger->clearRegionStats($this->getEntityRegion(State::CLASSNAME)); + $this->cache->evictEntityRegion(State::class); + $this->secondLevelCacheLogger->clearRegionStats($this->getEntityRegion(State::class)); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertFalse($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertFalse($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $s1 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $s2 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $s1 = $this->_em->find(State::class, $this->states[0]->getId()); + $s2 = $this->_em->find(State::class, $this->states[1]->getId()); $this->assertEquals(4, $this->secondLevelCacheLogger->getPutCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertInstanceOf(State::CLASSNAME, $s1); - $this->assertInstanceOf(State::CLASSNAME, $s2); + $this->assertInstanceOf(State::class, $s1); + $this->assertInstanceOf(State::class, $s2); $this->assertEquals($this->states[0]->getId(), $s1->getId()); $this->assertEquals($this->states[0]->getName(), $s1->getName()); @@ -160,28 +160,28 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); $this->assertEquals(6, $this->secondLevelCacheLogger->getPutCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::CLASSNAME))); - $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(Country::class))); + $this->assertEquals(4, $this->secondLevelCacheLogger->getRegionPutCount($this->getEntityRegion(State::class))); $queryCount = $this->getCurrentQueryCount(); - $c3 = $this->_em->find(State::CLASSNAME, $this->states[0]->getId()); - $c4 = $this->_em->find(State::CLASSNAME, $this->states[1]->getId()); + $c3 = $this->_em->find(State::class, $this->states[0]->getId()); + $c4 = $this->_em->find(State::class, $this->states[1]->getId()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[0]->getId())); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $this->states[1]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[0]->getId())); + $this->assertTrue($this->cache->containsEntity(State::class, $this->states[1]->getId())); - $this->assertInstanceOf(State::CLASSNAME, $c3); - $this->assertInstanceOf(State::CLASSNAME, $c4); + $this->assertInstanceOf(State::class, $c3); + $this->assertInstanceOf(State::class, $c4); $this->assertEquals($s1->getId(), $c3->getId()); $this->assertEquals("NEW NAME 1", $c3->getName()); @@ -190,7 +190,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->assertEquals("NEW NAME 2", $c4->getName()); $this->assertEquals(2, $this->secondLevelCacheLogger->getHitCount()); - $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::CLASSNAME))); + $this->assertEquals(2, $this->secondLevelCacheLogger->getRegionHitCount($this->getEntityRegion(State::class))); } public function testPostFlushFailure() @@ -208,7 +208,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $country = new Country("Brazil"); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(Country::class); try { @@ -219,7 +219,7 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest } catch (\RuntimeException $exc) { $this->assertNotNull($country->getId()); $this->assertEquals('post flush failure', $exc->getMessage()); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $country->getId())); + $this->assertTrue($this->cache->containsEntity(Country::class, $country->getId())); } } @@ -240,14 +240,14 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->getEventManager() ->addEventListener(Events::postUpdate, $listener); - $this->cache->evictEntityRegion(State::CLASSNAME); + $this->cache->evictEntityRegion(State::class); $stateId = $this->states[0]->getId(); $stateName = $this->states[0]->getName(); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId)); - $this->assertInstanceOf(State::CLASSNAME, $state); + $this->assertTrue($this->cache->containsEntity(State::class, $stateId)); + $this->assertInstanceOf(State::class, $state); $this->assertEquals($stateName, $state->getName()); $state->setName($stateName . uniqid()); @@ -264,11 +264,11 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(State::CLASSNAME, $stateId)); + $this->assertTrue($this->cache->containsEntity(State::class, $stateId)); - $state = $this->_em->find(State::CLASSNAME, $stateId); + $state = $this->_em->find(State::class, $stateId); - $this->assertInstanceOf(State::CLASSNAME, $state); + $this->assertInstanceOf(State::class, $state); $this->assertEquals($stateName, $state->getName()); } @@ -288,13 +288,13 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->getEventManager() ->addEventListener(Events::postRemove, $listener); - $this->cache->evictEntityRegion(Country::CLASSNAME); + $this->cache->evictEntityRegion(Country::class); $countryId = $this->countries[0]->getId(); - $country = $this->_em->find(Country::CLASSNAME, $countryId); + $country = $this->_em->find(Country::class, $countryId); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId)); - $this->assertInstanceOf(Country::CLASSNAME, $country); + $this->assertTrue($this->cache->containsEntity(Country::class, $countryId)); + $this->assertInstanceOf(Country::class, $country); $this->_em->remove($country); @@ -309,18 +309,18 @@ class SecondLevelCacheTest extends SecondLevelCacheAbstractTest $this->_em->clear(); $this->assertFalse( - $this->cache->containsEntity(Country::CLASSNAME, $countryId), + $this->cache->containsEntity(Country::class, $countryId), 'Removal attempts should clear the cache entry corresponding to the entity' ); - $this->assertInstanceOf(Country::CLASSNAME, $this->_em->find(Country::CLASSNAME, $countryId)); + $this->assertInstanceOf(Country::class, $this->_em->find(Country::class, $countryId)); } public function testCachedNewEntityExists() { $this->loadFixturesCountries(); - $persister = $this->_em->getUnitOfWork()->getEntityPersister(Country::CLASSNAME); + $persister = $this->_em->getUnitOfWork()->getEntityPersister(Country::class); $queryCount = $this->getCurrentQueryCount(); $this->assertTrue($persister->exists($this->countries[0])); diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php index 812d56d31..d425936f5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php @@ -21,7 +21,7 @@ class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase } else { try { $this->_schemaTool->createSchema( - [$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\SequenceEmulatedIdentityEntity')] + [$this->_em->getClassMetadata(SequenceEmulatedIdentityEntity::class)] ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index f77e1b0da..13091c5e5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -21,7 +21,7 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\SequenceEntity'), + $this->_em->getClassMetadata(SequenceEntity::class), ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php index 80cf1596f..091c79f54 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableCompositeKeyTest.php @@ -1,8 +1,9 @@ _em->find( - 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass', - ['keyPart1' => 'part-1', 'keyPart2' => 'part-2'] - ); + return $this->_em->find(SingleRootClass::class, ['keyPart1' => 'part-1', 'keyPart2' => 'part-2']); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php index 380f84b8b..5bafffd79 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php @@ -2,9 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Persisters\PersisterException; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\Tests\Models\Company\CompanyContract; use Doctrine\Tests\Models\Company\CompanyEmployee; use Doctrine\Tests\Models\Company\CompanyFixContract; use Doctrine\Tests\Models\Company\CompanyFlexContract; @@ -110,9 +112,9 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFixContract', $fixContract->getId()); + $contract = $this->_em->find(CompanyFixContract::class, $fixContract->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyFixContract', $contract); + $this->assertInstanceOf(CompanyFixContract::class, $contract); $this->assertEquals(1000, $contract->getFixPrice()); $this->assertEquals($this->salesPerson->getId(), $contract->getSalesPerson()->getId()); } @@ -131,9 +133,9 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $ultraContract->getId()); + $contract = $this->_em->find(CompanyFlexUltraContract::class, $ultraContract->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyFlexUltraContract', $contract); + $this->assertInstanceOf(CompanyFlexUltraContract::class, $contract); $this->assertEquals(7000, $contract->getMaxPrice()); $this->assertEquals(100, $contract->getHoursWorked()); $this->assertEquals(50, $contract->getPricePerHour()); @@ -143,13 +145,13 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $fix = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId()); + $fix = $this->_em->find(CompanyContract::class, $this->fix->getId()); $fix->setFixPrice(2500); $this->_em->flush(); $this->_em->clear(); - $newFix = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId()); + $newFix = $this->_em->find(CompanyContract::class, $this->fix->getId()); $this->assertEquals(2500, $newFix->getFixPrice()); } @@ -157,38 +159,38 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $fix = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId()); + $fix = $this->_em->find(CompanyContract::class, $this->fix->getId()); $this->_em->remove($fix); $this->_em->flush(); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId())); + $this->assertNull($this->_em->find(CompanyContract::class, $this->fix->getId())); } public function testFindAllForAbstractBaseClass() { $this->loadFullFixture(); - $contracts = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyContract')->findAll(); + $contracts = $this->_em->getRepository(CompanyContract::class)->findAll(); $this->assertEquals(3, count($contracts)); - $this->assertContainsOnly('Doctrine\Tests\Models\Company\CompanyContract', $contracts); + $this->assertContainsOnly(CompanyContract::class, $contracts); } public function testFindAllForChildClass() { $this->loadFullFixture(); - $this->assertEquals(1, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFixContract')->findAll())); - $this->assertEquals(2, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexContract')->findAll())); - $this->assertEquals(1, count($this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyFlexUltraContract')->findAll())); + $this->assertEquals(1, count($this->_em->getRepository(CompanyFixContract::class)->findAll())); + $this->assertEquals(2, count($this->_em->getRepository(CompanyFlexContract::class)->findAll())); + $this->assertEquals(1, count($this->_em->getRepository(CompanyFlexUltraContract::class)->findAll())); } public function testFindForAbstractBaseClass() { $this->loadFullFixture(); - $contract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId()); + $contract = $this->_em->find(CompanyContract::class, $this->fix->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyFixContract', $contract); + $this->assertInstanceOf(CompanyFixContract::class, $contract); $this->assertEquals(1000, $contract->getFixPrice()); } @@ -199,7 +201,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $contracts = $this->_em->createQuery('SELECT c FROM Doctrine\Tests\Models\Company\CompanyContract c')->getResult(); $this->assertEquals(3, count($contracts)); - $this->assertContainsOnly('Doctrine\Tests\Models\Company\CompanyContract', $contracts); + $this->assertContainsOnly(CompanyContract::class, $contracts); } public function testQueryForChildClass() @@ -217,7 +219,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $contracts = $this->_em->createQuery('SELECT c, p FROM Doctrine\Tests\Models\Company\CompanyContract c JOIN c.salesPerson p')->getResult(); $this->assertEquals(3, count($contracts)); - $this->assertContainsOnly('Doctrine\Tests\Models\Company\CompanyContract', $contracts); + $this->assertContainsOnly(CompanyContract::class, $contracts); } public function testQueryScalarWithDiscriminatorValue() @@ -242,7 +244,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $dql = 'SELECT c FROM Doctrine\Tests\Models\Company\CompanyFixContract c WHERE c.fixPrice = ?1'; $contract = $this->_em->createQuery($dql)->setParameter(1, 1000)->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyFixContract', $contract); + $this->assertInstanceOf(CompanyFixContract::class, $contract); $this->assertEquals(1000, $contract->getFixPrice()); } @@ -258,8 +260,8 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $this->assertEquals(1, $affected); - $flexContract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->flex->getId()); - $ultraContract = $this->_em->find('Doctrine\Tests\Models\Company\CompanyContract', $this->ultra->getId()); + $flexContract = $this->_em->find(CompanyContract::class, $this->flex->getId()); + $ultraContract = $this->_em->find(CompanyContract::class, $this->ultra->getId()); $this->assertEquals(300, $ultraContract->getHoursWorked()); $this->assertEquals(100, $flexContract->getHoursWorked()); @@ -326,19 +328,19 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyContract"); + $repos = $this->_em->getRepository(CompanyContract::class); $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(3, count($contracts), "There should be 3 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyContract'"); - $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFixContract"); + $repos = $this->_em->getRepository(CompanyFixContract::class); $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFixContract'"); - $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexContract"); + $repos = $this->_em->getRepository(CompanyFlexContract::class); $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(2, count($contracts), "There should be 2 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexContract'"); - $repos = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFlexUltraContract"); + $repos = $this->_em->getRepository(CompanyFlexUltraContract::class); $contracts = $repos->findBy(['salesPerson' => $this->salesPerson->getId()]); $this->assertEquals(1, count($contracts), "There should be 1 entities related to " . $this->salesPerson->getId() . " for 'Doctrine\Tests\Models\Company\CompanyFlexUltraContract'"); } @@ -350,13 +352,13 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $repository = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyContract"); + $repository = $this->_em->getRepository(CompanyContract::class); $contracts = $repository->matching(new Criteria( Criteria::expr()->eq('salesPerson', $this->salesPerson) )); $this->assertEquals(3, count($contracts)); - $repository = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyFixContract"); + $repository = $this->_em->getRepository(CompanyFixContract::class); $contracts = $repository->matching(new Criteria( Criteria::expr()->eq('salesPerson', $this->salesPerson) )); @@ -370,7 +372,7 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $repository = $this->_em->getRepository("Doctrine\Tests\Models\Company\CompanyContract"); + $repository = $this->_em->getRepository(CompanyContract::class); $this->expectException(PersisterException::class); $this->expectExceptionMessage('annot match on Doctrine\Tests\Models\Company\CompanyContract::salesPerson with a non-object value.'); @@ -390,14 +392,14 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase { $this->loadFullFixture(); - $ref = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyContract', $this->fix->getId()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $ref, "Cannot Request a proxy from a class that has subclasses."); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyContract', $ref); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyFixContract', $ref, "Direct fetch of the reference has to load the child class Employee directly."); + $ref = $this->_em->getReference(CompanyContract::class, $this->fix->getId()); + $this->assertNotInstanceOf(Proxy::class, $ref, "Cannot Request a proxy from a class that has subclasses."); + $this->assertInstanceOf(CompanyContract::class, $ref); + $this->assertInstanceOf(CompanyFixContract::class, $ref, "Direct fetch of the reference has to load the child class Employee directly."); $this->_em->clear(); - $ref = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyFixContract', $this->fix->getId()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $ref, "A proxy can be generated only if no subclasses exists for the requested reference."); + $ref = $this->_em->getReference(CompanyFixContract::class, $this->fix->getId()); + $this->assertInstanceOf(Proxy::class, $ref, "A proxy can be generated only if no subclasses exists for the requested reference."); } /** @@ -409,10 +411,10 @@ class SingleTableInheritanceTest extends OrmFunctionalTestCase $dql = 'SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1'; $contract = $this->_em->createQuery($dql) - ->setFetchMode('Doctrine\Tests\Models\Company\CompanyFixContract', 'salesPerson', ClassMetadata::FETCH_EAGER) + ->setFetchMode(CompanyFixContract::class, 'salesPerson', ClassMetadata::FETCH_EAGER) ->setParameter(1, $this->fix->getId()) ->getSingleResult(); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $contract->getSalesPerson()); + $this->assertNotInstanceOf(Proxy::class, $contract->getSalesPerson()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php index f7f651f1e..bef1f7682 100644 --- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php @@ -2,12 +2,11 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\Tests\Models\ECommerce\ECommerceCart, - Doctrine\Tests\Models\ECommerce\ECommerceFeature, - Doctrine\Tests\Models\ECommerce\ECommerceCustomer, - Doctrine\Tests\Models\ECommerce\ECommerceProduct; - -use Doctrine\ORM\Mapping\AssociationMapping; +use Doctrine\ORM\PersistentCollection; +use Doctrine\Tests\Models\ECommerce\ECommerceCart; +use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; +use Doctrine\Tests\Models\ECommerce\ECommerceFeature; +use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -35,9 +34,9 @@ class StandardEntityPersisterTest extends OrmFunctionalTestCase $cardId = $cart->getId(); unset($cart); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCart'); + $class = $this->_em->getClassMetadata(ECommerceCart::class); - $persister = $this->_em->getUnitOfWork()->getEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceCart'); + $persister = $this->_em->getUnitOfWork()->getEntityPersister(ECommerceCart::class); $newCart = new ECommerceCart(); $this->_em->getUnitOfWork()->registerManaged($newCart, ['id' => $cardId], []); $persister->load(['customer_id' => $customer->getId()], $newCart, $class->associationMappings['customer']); @@ -63,7 +62,7 @@ class StandardEntityPersisterTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertEquals(2, count($p->getFeatures())); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $p->getFeatures()); + $this->assertInstanceOf(PersistentCollection::class, $p->getFeatures()); $q = $this->_em->createQuery( 'SELECT p, f @@ -74,7 +73,7 @@ class StandardEntityPersisterTest extends OrmFunctionalTestCase $res = $q->getResult(); $this->assertEquals(2, count($p->getFeatures())); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $p->getFeatures()); + $this->assertInstanceOf(PersistentCollection::class, $p->getFeatures()); // Check that the features are the same instances still foreach ($p->getFeatures() as $feature) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php index ee1218187..ed27ed100 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php @@ -2,7 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\Models; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -18,7 +18,7 @@ class DDC1041Test extends OrmFunctionalTestCase public function testGrabWrongSubtypeReturnsNull() { - $fix = new CompanyFixContract(); + $fix = new Models\Company\CompanyFixContract(); $fix->setFixPrice(2000); $this->_em->persist($fix); @@ -26,8 +26,8 @@ class DDC1041Test extends OrmFunctionalTestCase $id = $fix->getId(); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Company\CompanyFlexContract', $id)); - $this->assertNull($this->_em->getReference('Doctrine\Tests\Models\Company\CompanyFlexContract', $id)); - $this->assertNull($this->_em->getPartialReference('Doctrine\Tests\Models\Company\CompanyFlexContract', $id)); + $this->assertNull($this->_em->find(Models\Company\CompanyFlexContract::class, $id)); + $this->assertNull($this->_em->getReference(Models\Company\CompanyFlexContract::class, $id)); + $this->assertNull($this->_em->getPartialReference(Models\Company\CompanyFlexContract::class, $id)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php index f3e255042..9b35eb006 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php @@ -30,7 +30,7 @@ class DDC1043Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find("Doctrine\Tests\Models\CMS\CmsUser", $user->id); + $user = $this->_em->find(CmsUser::class, $user->id); $this->assertSame("44", $user->status); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php index fccb0fd4c..12c3898d8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php @@ -32,7 +32,7 @@ class DDC1050Test extends OrmFunctionalTestCase $this->_em->clear(); $s = microtime(true); - $users = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findAll(); + $users = $this->_em->getRepository(CmsUser::class)->findAll(); $e = microtime(true); echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php index 637b42cdf..59ee4bb58 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php @@ -13,9 +13,9 @@ class DDC1080Test extends OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080Bar'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1080FooBar'), + $this->_em->getClassMetadata(DDC1080Foo::class), + $this->_em->getClassMetadata(DDC1080Bar::class), + $this->_em->getClassMetadata(DDC1080FooBar::class), ] ); @@ -59,7 +59,7 @@ class DDC1080Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $foo = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC1080Foo', $foo1->getFooID()); + $foo = $this->_em->find(DDC1080Foo::class, $foo1->getFooID()); $fooBars = $foo->getFooBars(); $this->assertEquals(3, count($fooBars), "Should return three foobars."); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php index 9ff8882b5..f3b399f98 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php @@ -15,10 +15,10 @@ class DDC1113Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Engine'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Vehicle'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Car'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1113Bus'), + $this->_em->getClassMetadata(DDC1113Engine::class), + $this->_em->getClassMetadata(DDC1113Vehicle::class), + $this->_em->getClassMetadata(DDC1113Car::class), + $this->_em->getClassMetadata(DDC1113Bus::class), ] ); } catch (\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php index 1f59d07ba..81c950102 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\Models\CMS\CmsArticle; + /** * @group DDC-1129 */ @@ -15,7 +17,7 @@ class DDC1129Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testVersionFieldIgnoredInChangesetComputation() { - $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); + $article = new CmsArticle(); $article->text = "I don't know."; $article->topic = "Who is John Galt?"; @@ -24,7 +26,7 @@ class DDC1129Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, $article->version); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'); + $class = $this->_em->getClassMetadata(CmsArticle::class); $uow = $this->_em->getUnitOfWork(); $uow->computeChangeSet($class, $article); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php index 053586bc9..5677801b4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php @@ -15,8 +15,8 @@ class DDC1151Test extends \Doctrine\Tests\OrmFunctionalTestCase $sql = $this->_schemaTool->getCreateSchemaSql( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1151Group'), + $this->_em->getClassMetadata(DDC1151User::class), + $this->_em->getClassMetadata(DDC1151Group::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php index 8e8fcdb8b..f28703492 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; + /** * @group DDC-1163 */ @@ -13,10 +15,10 @@ class DDC1163Test extends \Doctrine\Tests\OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Product'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163SpecialProduct'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163ProxyHolder'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Tag'), + $this->_em->getClassMetadata(DDC1163Product::class), + $this->_em->getClassMetadata(DDC1163SpecialProduct::class), + $this->_em->getClassMetadata(DDC1163ProxyHolder::class), + $this->_em->getClassMetadata(DDC1163Tag::class), ] ); } @@ -59,25 +61,25 @@ class DDC1163Test extends \Doctrine\Tests\OrmFunctionalTestCase */ private function createProxyForSpecialProduct() { - /* @var $proxyHolder ProxyHolder */ - $proxyHolder = $this->_em->find(__NAMESPACE__ . '\\DDC1163ProxyHolder', $this->proxyHolderId); + /* @var $proxyHolder DDC1163ProxyHolder */ + $proxyHolder = $this->_em->find(DDC1163ProxyHolder::class, $this->proxyHolderId); - $this->assertInstanceOf(__NAMESPACE__.'\\DDC1163SpecialProduct', $proxyHolder->getSpecialProduct()); + $this->assertInstanceOf(DDC1163SpecialProduct::class, $proxyHolder->getSpecialProduct()); } private function setPropertyAndAssignTagToSpecialProduct() { - /* @var $specialProduct SpecialProduct */ - $specialProduct = $this->_em->find(__NAMESPACE__ . '\\DDC1163SpecialProduct', $this->productId); + /* @var $specialProduct DDC1163SpecialProduct */ + $specialProduct = $this->_em->find(DDC1163SpecialProduct::class, $this->productId); - $this->assertInstanceOf(__NAMESPACE__.'\\DDC1163SpecialProduct', $specialProduct); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $specialProduct); + $this->assertInstanceOf(DDC1163SpecialProduct::class, $specialProduct); + $this->assertInstanceOf(Proxy::class, $specialProduct); $specialProduct->setSubclassProperty('foobar'); // this screams violation of law of demeter ;) $this->assertEquals( - __NAMESPACE__.'\\DDC1163SpecialProduct', + DDC1163SpecialProduct::class, $this->_em->getUnitOfWork()->getEntityPersister(get_class($specialProduct))->getClassMetadata()->name ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php index 51141b4e6..9c6740c33 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php @@ -55,33 +55,33 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $mapRef); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $mapRef->target()); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $mapRef->source()); - $this->assertSame($mapRef, $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria)); + $mapRef = $this->_em->find(DDC117Reference::class, $idCriteria); + $this->assertInstanceOf(DDC117Reference::class, $mapRef); + $this->assertInstanceOf(DDC117Article::class, $mapRef->target()); + $this->assertInstanceOf(DDC117Article::class, $mapRef->source()); + $this->assertSame($mapRef, $this->_em->find(DDC117Reference::class, $idCriteria)); $this->_em->clear(); - $dql = "SELECT r, s FROM "."Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE r.source = ?1"; + $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE r.source = ?1"; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 1)->getSingleResult(); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $mapRef); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $mapRef->target()); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $mapRef->source()); - $this->assertSame($dqlRef, $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria)); + $this->assertInstanceOf(DDC117Reference::class, $mapRef); + $this->assertInstanceOf(DDC117Article::class, $mapRef->target()); + $this->assertInstanceOf(DDC117Article::class, $mapRef->source()); + $this->assertSame($dqlRef, $this->_em->find(DDC117Reference::class, $idCriteria)); $this->_em->clear(); - $dql = "SELECT r, s FROM "."Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; + $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 'Foo')->getSingleResult(); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $dqlRef); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $dqlRef->target()); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Article", $dqlRef->source()); - $this->assertSame($dqlRef, $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria)); + $this->assertInstanceOf(DDC117Reference::class, $dqlRef); + $this->assertInstanceOf(DDC117Article::class, $dqlRef->target()); + $this->assertInstanceOf(DDC117Article::class, $dqlRef->source()); + $this->assertSame($dqlRef, $this->_em->find(DDC117Reference::class, $idCriteria)); - $dql = "SELECT r, s FROM "."Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; + $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 'Foo')->getSingleResult(); $this->_em->contains($dqlRef); @@ -94,13 +94,13 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $mapRef = $this->_em->find(DDC117Reference::class, $idCriteria); $this->assertNotNull($mapRef); $mapRef->setDescription("New Description!!"); $this->_em->flush(); $this->_em->clear(); - $mapRef = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $mapRef = $this->_em->find(DDC117Reference::class, $idCriteria); $this->assertEquals('New Description!!', $mapRef->getDescription()); } @@ -110,13 +110,13 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testFetchDql() { - $dql = "SELECT r, s FROM "."Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; + $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; $refs = $this->_em->createQuery($dql)->setParameter(1, 'Foo')->getResult(); $this->assertTrue(count($refs) > 0, "Has to contain at least one Reference."); foreach ($refs AS $ref) { - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $ref, "Contains only Reference instances."); + $this->assertInstanceOf(DDC117Reference::class, $ref, "Contains only Reference instances."); $this->assertTrue($this->_em->contains($ref), "Contains Reference in the IdentityMap."); } } @@ -128,13 +128,13 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $refRep = $this->_em->find(DDC117Reference::class, $idCriteria); $this->_em->remove($refRep); $this->_em->flush(); $this->_em->clear(); - $this->assertNull($this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria)); + $this->assertNull($this->_em->find(DDC117Reference::class, $idCriteria)); } /** @@ -145,13 +145,13 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $dql = "DELETE "."Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2"; + $dql = "DELETE Doctrine\Tests\Models\DDC117\DDC117Reference r WHERE r.source = ?1 AND r.target = ?2"; $this->_em->createQuery($dql) ->setParameter(1, $this->article1->id()) ->setParameter(2, $this->article2->id()) ->execute(); - $this->assertNull($this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria)); + $this->assertNull($this->_em->find(DDC117Reference::class, $idCriteria)); } /** @@ -159,18 +159,18 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testInverseSideAccess() { - $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id()); + $this->article1 = $this->_em->find(DDC117Article::class, $this->article1->id()); $this->assertEquals(1, count($this->article1->references())); foreach ($this->article1->references() AS $this->reference) { - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $this->reference); + $this->assertInstanceOf(DDC117Reference::class, $this->reference); $this->assertSame($this->article1, $this->reference->source()); } $this->_em->clear(); - $dql = 'SELECT a, r FROM '. 'Doctrine\Tests\Models\DDC117\DDC117Article a INNER JOIN a.references r WHERE a.id = ?1'; + $dql = 'SELECT a, r FROM Doctrine\Tests\Models\DDC117\DDC117Article a INNER JOIN a.references r WHERE a.id = ?1'; $articleDql = $this->_em->createQuery($dql) ->setParameter(1, $this->article1->id()) ->getSingleResult(); @@ -178,7 +178,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, count($this->article1->references())); foreach ($this->article1->references() AS $this->reference) { - $this->assertInstanceOf("Doctrine\Tests\Models\DDC117\DDC117Reference", $this->reference); + $this->assertInstanceOf(DDC117Reference::class, $this->reference); $this->assertSame($this->article1, $this->reference->source()); } } @@ -190,20 +190,20 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['article' => $this->article1->id(), 'language' => 'en']; - $this->translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $this->translation); + $this->translation = $this->_em->find(DDC117Translation::class, $idCriteria); + $this->assertInstanceOf(DDC117Translation::class, $this->translation); - $this->assertSame($this->translation, $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria)); + $this->assertSame($this->translation, $this->_em->find(DDC117Translation::class, $idCriteria)); $this->_em->clear(); - $dql = 'SELECT t, a FROM ' . 'Doctrine\Tests\Models\DDC117\DDC117Translation t JOIN t.article a WHERE t.article = ?1 AND t.language = ?2'; + $dql = 'SELECT t, a FROM Doctrine\Tests\Models\DDC117\DDC117Translation t JOIN t.article a WHERE t.article = ?1 AND t.language = ?2'; $dqlTrans = $this->_em->createQuery($dql) ->setParameter(1, $this->article1->id()) ->setParameter(2, 'en') ->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $this->translation); + $this->assertInstanceOf(DDC117Translation::class, $this->translation); } /** @@ -211,7 +211,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testMixedCompositeKeyViolateUniqueness() { - $this->article1 = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Article', $this->article1->id()); + $this->article1 = $this->_em->find(DDC117Article::class, $this->article1->id()); $this->article1->addTranslation('en', 'Bar'); $this->article1->addTranslation('en', 'Baz'); @@ -283,21 +283,21 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testReferencesToForeignKeyEntities() { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $reference = $this->_em->find(DDC117Reference::class, $idCriteria); $idCriteria = ['article' => $this->article1->id(), 'language' => 'en']; - $translation = $this->_em->find('Doctrine\Tests\Models\DDC117\DDC117Translation', $idCriteria); + $translation = $this->_em->find(DDC117Translation::class, $idCriteria); $approveChanges = new DDC117ApproveChanges($reference->source()->getDetails(), $reference, $translation); $this->_em->persist($approveChanges); $this->_em->flush(); $this->_em->clear(); - $approveChanges = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117ApproveChanges", $approveChanges->getId()); + $approveChanges = $this->_em->find(DDC117ApproveChanges::class, $approveChanges->getId()); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails', $approveChanges->getArticleDetails()); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Reference', $approveChanges->getReference()); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $approveChanges->getTranslation()); + $this->assertInstanceOf(DDC117ArticleDetails::class, $approveChanges->getArticleDetails()); + $this->assertInstanceOf(DDC117Reference::class, $approveChanges->getReference()); + $this->assertInstanceOf(DDC117Translation::class, $approveChanges->getTranslation()); } /** @@ -310,7 +310,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $translations = $article->getTranslations(); $this->assertFalse($translations->isInitialized()); - $this->assertContainsOnly('Doctrine\Tests\Models\DDC117\DDC117Translation', $translations); + $this->assertContainsOnly(DDC117Translation::class, $translations); $this->assertTrue($translations->isInitialized()); } @@ -322,7 +322,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $editor = $this->loadEditorFixture(); $this->assertFalse($editor->reviewingTranslations->isInitialized()); - $this->assertContainsOnly("Doctrine\Tests\Models\DDC117\DDC117Translation", $editor->reviewingTranslations); + $this->assertContainsOnly(DDC117Translation::class, $editor->reviewingTranslations); $this->assertTrue($editor->reviewingTranslations->isInitialized()); $this->_em->clear(); @@ -330,7 +330,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = "SELECT e, t FROM Doctrine\Tests\Models\DDC117\DDC117Editor e JOIN e.reviewingTranslations t WHERE e.id = ?1"; $editor = $this->_em->createQuery($dql)->setParameter(1, $editor->id)->getSingleResult(); $this->assertTrue($editor->reviewingTranslations->isInitialized()); - $this->assertContainsOnly("Doctrine\Tests\Models\DDC117\DDC117Translation", $editor->reviewingTranslations); + $this->assertContainsOnly(DDC117Translation::class, $editor->reviewingTranslations); } /** @@ -356,7 +356,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $editor = $this->loadEditorFixture(); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $editor->reviewingTranslations[0]); + $this->assertInstanceOf(DDC117Translation::class, $editor->reviewingTranslations[0]); $reviewedBy = $editor->reviewingTranslations[0]->getReviewedByEditors(); $this->assertEquals(1, count($reviewedBy)); @@ -371,8 +371,8 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter(2, $this->translation->getLanguage()) ->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Translation', $trans); - $this->assertContainsOnly('Doctrine\Tests\Models\DDC117\DDC117Editor', $trans->reviewedByEditors); + $this->assertInstanceOf(DDC117Translation::class, $trans); + $this->assertContainsOnly(DDC117Editor::class, $trans->reviewedByEditors); $this->assertEquals(1, count($trans->reviewedByEditors)); } @@ -431,7 +431,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase { $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $refRep = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $refRep = $this->_em->find(DDC117Reference::class, $idCriteria); $this->_em->detach($refRep); $refRep = $this->_em->merge($refRep); @@ -448,8 +448,8 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = "SELECT r,s,t FROM Doctrine\Tests\Models\DDC117\DDC117Reference r INNER JOIN r.source s INNER JOIN r.target t"; $before = count($this->_em->createQuery($dql)->getResult()); - $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id()); - $this->article2 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article2->id()); + $this->article1 = $this->_em->find(DDC117Article::class, $this->article1->id()); + $this->article2 = $this->_em->find(DDC117Article::class, $this->article2->id()); $this->reference = new DDC117Reference($this->article2, $this->article1, "Test-Description"); $this->_em->persist($this->reference); @@ -477,15 +477,15 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->markTestIncomplete('Second level cache - not supported yet'); } - $this->article1 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id()); - $this->article2 = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article2->id()); + $this->article1 = $this->_em->find(DDC117Article::class, $this->article1->id()); + $this->article2 = $this->_em->find(DDC117Article::class, $this->article2->id()); $this->reference = new DDC117Reference($this->article2, $this->article1, "Test-Description"); $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($this->reference)); $idCriteria = ['source' => $this->article1->id(), 'target' => $this->article2->id()]; - $reference = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Reference", $idCriteria); + $reference = $this->_em->find(DDC117Reference::class, $idCriteria); $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference)); } @@ -494,9 +494,9 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testIndexByOnCompositeKeyField() { - $article = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id()); + $article = $this->_em->find(DDC117Article::class, $this->article1->id()); - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Article', $article); + $this->assertInstanceOf(DDC117Article::class, $article); $this->assertEquals(1, count($article->getLinks())); $this->assertTrue($article->getLinks()->offsetExists($this->article2->id())); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php index 8cf1ebe15..d72a960f7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -11,9 +11,9 @@ class DDC1181Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Hotel'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Booking'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Room'), + $this->_em->getClassMetadata(DDC1181Hotel::class), + $this->_em->getClassMetadata(DDC1181Booking::class), + $this->_em->getClassMetadata(DDC1181Room::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php index 00d0a35a4..f4d98cb23 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php @@ -12,9 +12,9 @@ class DDC1193Test extends OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Company'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Person'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Account') + $this->_em->getClassMetadata(DDC1193Company::class), + $this->_em->getClassMetadata(DDC1193Person::class), + $this->_em->getClassMetadata(DDC1193Account::class) ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index 7700aa0a5..77cde3262 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -12,9 +12,9 @@ class DDC1209Test extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_2'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_3') + $this->_em->getClassMetadata(DDC1209_1::class), + $this->_em->getClassMetadata(DDC1209_2::class), + $this->_em->getClassMetadata(DDC1209_3::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php index 105ae9f90..1bfd6b91e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php @@ -13,8 +13,8 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity2'), + $this->_em->getClassMetadata(DDC1225_TestEntity1::class), + $this->_em->getClassMetadata(DDC1225_TestEntity2::class), ] ); } catch(\PDOException $e) { @@ -25,7 +25,7 @@ class DDC1225Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIssue() { $qb = $this->_em->createQueryBuilder(); - $qb->from('Doctrine\Tests\ORM\Functional\Ticket\DDC1225_TestEntity1', 'te1') + $qb->from(DDC1225_TestEntity1::class, 'te1') ->select('te1') ->where('te1.testEntity2 = ?1') ->setParameter(1, 0); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php index 8a9f252df..b4de087a3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php @@ -14,8 +14,8 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'), + $this->_em->getClassMetadata(DDC1228User::class), + $this->_em->getClassMetadata(DDC1228Profile::class), ] ); } catch(\Exception $e) { @@ -35,7 +35,7 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + $user = $this->_em->find(DDC1228User::class, $user->id); $this->assertFalse($user->getProfile()->__isInitialized__, "Proxy is not initialized"); $user->getProfile()->setName("Bar"); @@ -47,7 +47,7 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + $user = $this->_em->find(DDC1228User::class, $user->id); $this->assertEquals("Bar", $user->getProfile()->getName()); } @@ -63,14 +63,14 @@ class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1228User', $user->id); + $user = $this->_em->getReference(DDC1228User::class, $user->id); $this->_em->refresh($user); $user->name = "Baz"; $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + $user = $this->_em->find(DDC1228User::class, $user->id); $this->assertEquals("Baz", $user->name); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php index 6c24b2f55..00c621eee 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -13,7 +13,7 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'), + $this->_em->getClassMetadata(DDC1238User::class), ] ); } catch(\Exception $e) { @@ -33,7 +33,7 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase $userId = $user->getId(); $this->_em->clear(); - $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + $user = $this->_em->getReference(DDC1238User::class, $userId); $this->_em->clear(); $userId2 = $user->getId(); @@ -54,10 +54,10 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase $userId = $user->getId(); $this->_em->clear(); - $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + $user = $this->_em->getReference(DDC1238User::class, $userId); $this->_em->clear(); - $user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + $user2 = $this->_em->getReference(DDC1238User::class, $userId); // force proxy load, getId() doesn't work anymore $user->getName(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php index ed54ec681..a09b1761f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php @@ -13,7 +13,7 @@ class DDC1250Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1250ClientHistory'), + $this->_em->getClassMetadata(DDC1250ClientHistory::class), ] ); } catch(\PDOException $e) { @@ -38,7 +38,7 @@ class DDC1250Test extends \Doctrine\Tests\OrmFunctionalTestCase $history = $this->_em->createQuery('SELECT h FROM ' . __NAMESPACE__ . '\\DDC1250ClientHistory h WHERE h.id = ?1') ->setParameter(1, $c2->id)->getSingleResult(); - $this->assertInstanceOf(__NAMESPACE__ . '\\DDC1250ClientHistory', $history); + $this->assertInstanceOf(DDC1250ClientHistory::class, $history); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php index 197d3a2aa..eeaa870ae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php @@ -2,8 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsUser; /** * @group DDC-1276 @@ -33,7 +33,7 @@ class DDC1276Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->id); + $user = $this->_em->find(CmsUser::class, $user->id); $cloned = clone $user; $this->assertSame($user->groups, $cloned->groups); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php index 97fd33b2a..4f0038b1c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php @@ -12,8 +12,8 @@ class DDC1300Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1300FooLocale'), + $this->_em->getClassMetadata(DDC1300Foo::class), + $this->_em->getClassMetadata(DDC1300FooLocale::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php index f8ccc5a3e..785b22187 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Tests\Models; /** * @author asm89 @@ -19,7 +20,7 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->useModelSet('legacy'); parent::setUp(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class = $this->_em->getClassMetadata(Models\Legacy\LegacyUser::class); $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; @@ -31,7 +32,7 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::tearDown(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class = $this->_em->getClassMetadata(Models\Legacy\LegacyUser::class); $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; @@ -39,7 +40,7 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testCountNotInitializesLegacyCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $user = $this->_em->find(Models\Legacy\LegacyUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $this->assertFalse($user->_articles->isInitialized()); @@ -53,7 +54,7 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testCountNotInitializesLegacyCollectionWithForeignIdentifier() { - $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $user = $this->_em->find(Models\Legacy\LegacyUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $this->assertFalse($user->_references->isInitialized()); @@ -67,7 +68,7 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testCountNotInitializesLegacyManyToManyCollection() { - $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $user = $this->_em->find(Models\Legacy\LegacyUser::class, $this->userId); $queryCount = $this->getCurrentQueryCount(); $this->assertFalse($user->_cars->isInitialized()); @@ -81,17 +82,17 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function loadFixture() { - $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user1 = new Models\Legacy\LegacyUser(); $user1->_username = "beberlei"; $user1->_name = "Benjamin"; $user1->_status = "active"; - $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user2 = new Models\Legacy\LegacyUser(); $user2->_username = "jwage"; $user2->_name = "Jonathan"; $user2->_status = "active"; - $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user3 = new Models\Legacy\LegacyUser(); $user3->_username = "romanb"; $user3->_name = "Roman"; $user3->_status = "active"; @@ -100,12 +101,12 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($user2); $this->_em->persist($user3); - $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article1 = new Models\Legacy\LegacyArticle(); $article1->_topic = "Test"; $article1->_text = "Test"; $article1->setAuthor($user1); - $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article2 = new Models\Legacy\LegacyArticle(); $article2->_topic = "Test"; $article2->_text = "Test"; $article2->setAuthor($user1); @@ -113,13 +114,13 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($article1); $this->_em->persist($article2); - $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car1 = new Models\Legacy\LegacyCar(); $car1->_description = "Test1"; - $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car2 = new Models\Legacy\LegacyCar(); $car2->_description = "Test2"; - $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car3 = new Models\Legacy\LegacyCar(); $car3->_description = "Test3"; $user1->addCar($car1); @@ -135,8 +136,8 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); - $detail1 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user2, "foo"); - $detail2 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user3, "bar"); + $detail1 = new Models\Legacy\LegacyUserReference($user1, $user2, "foo"); + $detail2 = new Models\Legacy\LegacyUserReference($user1, $user3, "bar"); $this->_em->persist($detail1); $this->_em->persist($detail2); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php index d92a32781..dd4755594 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php @@ -13,8 +13,8 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1335Phone'), + $this->_em->getClassMetadata(DDC1335User::class), + $this->_em->getClassMetadata(DDC1335Phone::class), ] ); $this->loadFixture(); @@ -67,7 +67,7 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testTicket() { $builder = $this->_em->createQueryBuilder(); - $builder->select('u')->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.id'); + $builder->select('u')->from(DDC1335User::class, 'u', 'u.id'); $dql = $builder->getQuery()->getDQL(); $result = $builder->getQuery()->getResult(); @@ -82,7 +82,7 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIndexByUnique() { $builder = $this->_em->createQueryBuilder(); - $builder->select('u')->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.email'); + $builder->select('u')->from(DDC1335User::class, 'u', 'u.email'); $dql = $builder->getQuery()->getDQL(); $result = $builder->getQuery()->getResult(); @@ -98,7 +98,7 @@ class DDC1335Test extends \Doctrine\Tests\OrmFunctionalTestCase { $builder = $this->_em->createQueryBuilder(); $builder->select('u','p') - ->from(__NAMESPACE__ . '\DDC1335User', 'u', 'u.email') + ->from(DDC1335User::class, 'u', 'u.email') ->join('u.phones', 'p', null, null, 'p.id'); $dql = $builder->getQuery()->getDQL(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php index 05a99b7cb..6e71e6fc7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php @@ -17,7 +17,7 @@ class DDC1360Test extends OrmFunctionalTestCase $sql = $this->_schemaTool->getCreateSchemaSql( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote') + $this->_em->getClassMetadata(DDC1360DoubleQuote::class) ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php index a84fd7154..7a13d7ac9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php @@ -14,8 +14,8 @@ class DDC1383Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383AbstractEntity'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1383Entity'), + $this->_em->getClassMetadata(DDC1383AbstractEntity::class), + $this->_em->getClassMetadata(DDC1383Entity::class), ] ); } catch(\Exception $ignored) {} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php index 5fe34f6cc..806e61de4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php @@ -16,8 +16,8 @@ class DDC1392Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392File'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1392Picture'), + $this->_em->getClassMetadata(DDC1392File::class), + $this->_em->getClassMetadata(DDC1392Picture::class), ] ); } catch (\Exception $ignored) { @@ -41,7 +41,7 @@ class DDC1392Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($fileId > 0); - $picture = $em->find(__NAMESPACE__ . '\DDC1392Picture', $pictureId); + $picture = $em->find(DDC1392Picture::class, $pictureId); $this->assertEquals(UnitOfWork::STATE_MANAGED, $em->getUnitOfWork()->getEntityState($picture->getFile()), "Lazy Proxy should be marked MANAGED."); $file = $picture->getFile(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php index 22fd282ce..4ac78d9b7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php @@ -14,9 +14,9 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400Article'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1400UserState'), + $this->_em->getClassMetadata(DDC1400Article::class), + $this->_em->getClassMetadata(DDC1400User::class), + $this->_em->getClassMetadata(DDC1400UserState::class), ] ); } catch (\Exception $ignored) { @@ -52,7 +52,7 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user1 = $this->_em->getReference(__NAMESPACE__.'\DDC1400User', $user1->id); + $user1 = $this->_em->getReference(DDC1400User::class, $user1->id); $q = $this->_em->createQuery("SELECT a, s FROM ".__NAMESPACE__."\DDC1400Article a JOIN a.userStates s WITH s.user = :activeUser"); $q->setParameter('activeUser', $user1); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php index e4d0a47f2..b3a1a939d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php @@ -15,8 +15,8 @@ class DDC1404Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ParentEntity'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1404ChildEntity'), + $this->_em->getClassMetadata(DDC1404ParentEntity::class), + $this->_em->getClassMetadata(DDC1404ChildEntity::class), ] ); @@ -28,7 +28,7 @@ class DDC1404Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testTicket() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC1404ChildEntity'); + $repository = $this->_em->getRepository(DDC1404ChildEntity::class); $queryAll = $repository->createNamedQuery('all'); $queryFirst = $repository->createNamedQuery('first'); $querySecond = $repository->createNamedQuery('second'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php index 6f08cf80c..287b73dec 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\Models\Quote\Group; +use Doctrine\Tests\Models\Quote\Phone; use Doctrine\Tests\Models\Quote\User; use Doctrine\Tests\Models\Quote\Address; @@ -11,7 +13,6 @@ use Doctrine\Tests\Models\Quote\Address; */ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase { - protected function setUp() { parent::setUp(); @@ -19,10 +20,10 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), + $this->_em->getClassMetadata(User::class), + $this->_em->getClassMetadata(Group::class), + $this->_em->getClassMetadata(Phone::class), + $this->_em->getClassMetadata(Address::class), ] ); } catch(\Exception $e) { @@ -42,7 +43,7 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); - $addressRef = $this->_em->getReference('Doctrine\Tests\Models\Quote\Address', $address->getId()); + $addressRef = $this->_em->getReference(Address::class, $address->getId()); $user->setAddress($addressRef); @@ -53,11 +54,11 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotNull($id); - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $id); + $user = $this->_em->find(User::class, $id); $address = $user->getAddress(); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Address', $user->getAddress()); + $this->assertInstanceOf(User::class, $user); + $this->assertInstanceOf(Address::class, $user->getAddress()); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals('12345', $address->zip); @@ -72,8 +73,8 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $user = $this->_em->find(User::class, $id); + $this->assertInstanceOf(User::class, $user); $this->assertNull($user->getAddress()); $this->assertEquals('FabioBatSilva1', $user->name); @@ -83,7 +84,7 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Quote\User', $id)); + $this->assertNull($this->_em->find(User::class, $id)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php index 3356d4268..6b08a8326 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php @@ -15,8 +15,8 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430Order'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1430OrderProduct'), + $this->_em->getClassMetadata(DDC1430Order::class), + $this->_em->getClassMetadata(DDC1430OrderProduct::class), ] ); $this->loadFixtures(); @@ -27,7 +27,7 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testOrderByFields() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC1430Order'); + $repository = $this->_em->getRepository(DDC1430Order::class); $builder = $repository->createQueryBuilder('o'); $query = $builder->select('o.id, o.date, COUNT(p.id) AS p_count') ->leftJoin('o.products', 'p') @@ -58,7 +58,7 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testOrderByAllObjectFields() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC1430Order'); + $repository = $this->_em->getRepository(DDC1430Order::class); $builder = $repository->createQueryBuilder('o'); $query = $builder->select('o, COUNT(p.id) AS p_count') ->leftJoin('o.products', 'p') @@ -87,7 +87,7 @@ class DDC1430Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testTicket() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC1430Order'); + $repository = $this->_em->getRepository(DDC1430Order::class); $builder = $repository->createQueryBuilder('o'); $query = $builder->select('o, COUNT(p.id) AS p_count') ->leftJoin('o.products', 'p') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php index cd9ff6b32..9ffa497cd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1436Test.php @@ -14,7 +14,7 @@ class DDC1436Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1436Page'), + $this->_em->getClassMetadata(DDC1436Page::class), ] ); } catch (\Exception $ignored) { @@ -42,13 +42,13 @@ class DDC1436Test extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter('id', $id) ->getOneOrNullResult(); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC1436Page', $page); + $this->assertInstanceOf(DDC1436Page::class, $page); // step 2 - $page = $this->_em->find(__NAMESPACE__ . '\DDC1436Page', $id); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC1436Page', $page); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC1436Page', $page->getParent()); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC1436Page', $page->getParent()->getParent()); + $page = $this->_em->find(DDC1436Page::class, $id); + $this->assertInstanceOf(DDC1436Page::class, $page); + $this->assertInstanceOf(DDC1436Page::class, $page->getParent()); + $this->assertInstanceOf(DDC1436Page::class, $page->getParent()->getParent()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index d7b280f00..78276f0dd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -12,9 +12,9 @@ class DDC144Test extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144FlowElement'), + $this->_em->getClassMetadata(DDC144FlowElement::class), // $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Expression'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Operand'), + $this->_em->getClassMetadata(DDC144Operand::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php index 4dd486c1e..7e7ecc4f8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php @@ -3,6 +3,9 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Proxy\Proxy; +use Doctrine\Tests\Models\CMS\CmsUser; /** * @group DDC-1452 @@ -17,8 +20,8 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityA'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1452EntityB'), + $this->_em->getClassMetadata(DDC1452EntityA::class), + $this->_em->getClassMetadata(DDC1452EntityB::class), ] ); } catch (\Exception $ignored) { @@ -47,8 +50,8 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase $results = $this->_em->createQuery($dql)->setMaxResults(1)->getResult(); $this->assertSame($results[0], $results[0]->entitiesB[0]->entityAFrom); - $this->assertFalse( $results[0]->entitiesB[0]->entityATo instanceof \Doctrine\ORM\Proxy\Proxy ); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $results[0]->entitiesB[0]->entityATo->getEntitiesB()); + $this->assertFalse( $results[0]->entitiesB[0]->entityATo instanceof Proxy); + $this->assertInstanceOf(Collection::class, $results[0]->entitiesB[0]->entityATo->getEntitiesB()); } public function testFetchJoinOneToOneFromInverse() @@ -59,7 +62,7 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase $address->street = "Somestreet"; $address->zip = 12345; - $user = new \Doctrine\Tests\Models\CMS\CmsUser(); + $user = new CmsUser(); $user->name = "beberlei"; $user->username = "beberlei"; $user->status = "active"; @@ -75,12 +78,12 @@ class DDC1452Test extends \Doctrine\Tests\OrmFunctionalTestCase $data = $this->_em->createQuery($dql)->getResult(); $this->_em->clear(); - $this->assertFalse($data[0]->user instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertFalse($data[0]->user instanceof Proxy); $dql = "SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.address a"; $data = $this->_em->createQuery($dql)->getResult(); - $this->assertFalse($data[0]->address instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertFalse($data[0]->address instanceof Proxy); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php index f4b456e65..54d5dbd20 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php @@ -14,8 +14,8 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454File'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1454Picture'), + $this->_em->getClassMetadata(DDC1454File::class), + $this->_em->getClassMetadata(DDC1454Picture::class), ] ); } catch (\Exception $ignored) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php index 6f2d80afb..72d79cd43 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php @@ -11,8 +11,8 @@ class DDC1258Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\TestEntity'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\TestAdditionalEntity') + $this->_em->getClassMetadata(TestEntity::class), + $this->_em->getClassMetadata(TestAdditionalEntity::class) ] ); } @@ -29,7 +29,7 @@ class DDC1258Test extends OrmFunctionalTestCase // So here the value is 3 $this->assertEquals(3, $testEntity->getValue()); - $test = $this->_em->getRepository(__NAMESPACE__ . '\TestEntity')->find(1); + $test = $this->_em->getRepository(TestEntity::class)->find(1); // New value is set $test->setValue(5); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php index fd419d743..da7100d68 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php @@ -14,8 +14,8 @@ class DDC1461Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461TwitterAccount'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1461User') + $this->_em->getClassMetadata(DDC1461TwitterAccount::class), + $this->_em->getClassMetadata(DDC1461User::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php index 351a963c4..17cfdf78d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1509Test.php @@ -15,9 +15,9 @@ class DDC1509Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509AbstractFile'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'), + $this->_em->getClassMetadata(DDC1509AbstractFile::class), + $this->_em->getClassMetadata(DDC1509File::class), + $this->_em->getClassMetadata(DDC1509Picture::class), ] ); } catch (\Exception $ignored) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php index 36dd46748..1fc8a06ef 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php @@ -16,9 +16,9 @@ class DDC1514Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityA'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityB'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1514EntityC'), + $this->_em->getClassMetadata(DDC1514EntityA::class), + $this->_em->getClassMetadata(DDC1514EntityB::class), + $this->_em->getClassMetadata(DDC1514EntityC::class), ] ); } catch (\Exception $ignored) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php index 2ceaaa104..294ae8738 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php @@ -13,8 +13,8 @@ class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1515Bar'), + $this->_em->getClassMetadata(DDC1515Foo::class), + $this->_em->getClassMetadata(DDC1515Bar::class), ] ); } @@ -31,8 +31,8 @@ class DDC1515Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $bar = $this->_em->find(__NAMESPACE__ . '\DDC1515Bar', $bar->id); - $this->assertInstanceOf(__NAMESPACE__.'\DDC1515Foo', $bar->foo); + $bar = $this->_em->find(DDC1515Bar::class, $bar->id); + $this->assertInstanceOf(DDC1515Foo::class, $bar->foo); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php index c33549afb..7a76e3fb9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php @@ -12,7 +12,7 @@ class DDC1526Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1526Menu'), + $this->_em->getClassMetadata(DDC1526Menu::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php index 7f79ac96e..20ebe424c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php @@ -58,9 +58,9 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->initDb(false); // don't join association - $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId); + $article = $this->_em->find(CmsArticle::class, $this->articleId); - $user = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $article->user = $user; @@ -86,7 +86,7 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter('id', $this->articleId) ->getOneOrNullResult(); - $user = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->userId); + $user = $this->_em->find(CmsUser::class, $this->userId); $article->user = $user; @@ -107,7 +107,7 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->initDb(true); // don't join association - $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId); + $article = $this->_em->find(CmsArticle::class, $this->articleId); $article->user = null; @@ -150,9 +150,9 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->initDb(false); // don't join association - $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId); + $article = $this->_em->find(CmsArticle::class, $this->articleId); - $user2 = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->user2Id); + $user2 = $this->_em->find(CmsUser::class, $this->user2Id); $article->user = $user2; @@ -178,7 +178,7 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter('id', $this->articleId) ->getOneOrNullResult(); - $user2 = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->user2Id); + $user2 = $this->_em->find(CmsUser::class, $this->user2Id); $article->user = $user2; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php index 179d4914c..6628586cc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php @@ -12,9 +12,9 @@ class DDC1548Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548E2'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1548Rel'), + $this->_em->getClassMetadata(DDC1548E1::class), + $this->_em->getClassMetadata(DDC1548E2::class), + $this->_em->getClassMetadata(DDC1548Rel::class), ] ); } @@ -31,7 +31,7 @@ class DDC1548Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $obt = $this->_em->find(__NAMESPACE__ . '\DDC1548Rel', $rel->id); + $obt = $this->_em->find(DDC1548Rel::class, $rel->id); $this->assertNull($obt->e2); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php index c44896b85..5f0e128b5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php @@ -17,9 +17,9 @@ class DDC1595Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595BaseInheritance'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1595InheritedEntity2'), + $this->_em->getClassMetadata(DDC1595BaseInheritance::class), + $this->_em->getClassMetadata(DDC1595InheritedEntity1::class), + $this->_em->getClassMetadata(DDC1595InheritedEntity2::class), ] ); } @@ -33,7 +33,7 @@ class DDC1595Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $sqlLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); - $repository = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1595InheritedEntity1'); + $repository = $this->_em->getRepository(DDC1595InheritedEntity1::class); $entity1 = $repository->find($e1->id); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php index aad2902d9..a5a620f63 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php @@ -12,8 +12,8 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->setUpEntitySchema( [ - __NAMESPACE__ . '\\DDC1654Post', - __NAMESPACE__ . '\\DDC1654Comment', + DDC1654Post::class, + DDC1654Comment::class, ] ); } @@ -41,7 +41,7 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $comments = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1654Comment')->findAll(); + $comments = $this->_em->getRepository(DDC1654Comment::class)->findAll(); $this->assertEquals(0, count($comments)); } @@ -60,7 +60,7 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $comments = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1654Comment')->findAll(); + $comments = $this->_em->getRepository(DDC1654Comment::class)->findAll(); $this->assertEquals(0, count($comments)); } @@ -83,7 +83,7 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $comments = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1654Comment')->findAll(); + $comments = $this->_em->getRepository(DDC1654Comment::class)->findAll(); $this->assertEquals(2, count($comments)); } @@ -101,7 +101,7 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $comments = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1654Comment')->findAll(); + $comments = $this->_em->getRepository(DDC1654Comment::class)->findAll(); $this->assertEquals(0, count($comments)); } @@ -125,7 +125,7 @@ class DDC1654Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $comments = $this->_em->getRepository(__NAMESPACE__ . '\\DDC1654Comment')->findAll(); + $comments = $this->_em->getRepository(DDC1654Comment::class)->findAll(); $this->assertEquals(1, count($comments)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php index 3b24b4d91..a63d3635f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1655Test.php @@ -16,9 +16,9 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Bar'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1655Baz'), + $this->_em->getClassMetadata(DDC1655Foo::class), + $this->_em->getClassMetadata(DDC1655Bar::class), + $this->_em->getClassMetadata(DDC1655Baz::class), ] ); } catch(\Exception $e) { @@ -27,10 +27,10 @@ class DDC1655Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testPostLoadOneToManyInheritance() { - $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Foo'); + $cm = $this->_em->getClassMetadata(DDC1655Foo::class); $this->assertEquals(["postLoad" => ["postLoad"]], $cm->lifecycleCallbacks); - $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1655Bar'); + $cm = $this->_em->getClassMetadata(DDC1655Bar::class); $this->assertEquals(["postLoad" => ["postLoad", "postSubLoaded"]], $cm->lifecycleCallbacks); $baz = new DDC1655Baz(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php index 52e028394..576b4e286 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php @@ -41,7 +41,7 @@ class DDC1685Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testPaginateIterate() { foreach ($this->paginator as $ad) { - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails', $ad); + $this->assertInstanceOf(DDC117ArticleDetails::class, $ad); } } @@ -59,7 +59,7 @@ class DDC1685Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->expectExceptionMessage('Paginating an entity with foreign key as identifier only works when using the Output Walkers. Call Paginator#setUseOutputWalkers(true) before iterating the paginator.'); foreach ($this->paginator as $ad) { - $this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails', $ad); + $this->assertInstanceOf(DDC117ArticleDetails::class, $ad); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php index 75924f135..ddaa83d80 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php @@ -12,16 +12,16 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->useModelSet('company'); parent::setUp(); - $this->oldMetadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'); + $this->oldMetadata = $this->_em->getClassMetadata(CompanyEmployee::class); $metadata = clone $this->oldMetadata; ksort($metadata->reflFields); - $this->_em->getMetadataFactory()->setMetadataFor('Doctrine\Tests\Models\Company\CompanyEmployee', $metadata); + $this->_em->getMetadataFactory()->setMetadataFor(CompanyEmployee::class, $metadata); } public function tearDown() { - $this->_em->getMetadataFactory()->setMetadataFor('Doctrine\Tests\Models\Company\CompanyEmployee', $this->oldMetadata); + $this->_em->getMetadataFactory()->setMetadataFor(CompanyEmployee::class, $this->oldMetadata); parent::tearDown(); } @@ -56,7 +56,7 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals("bar", $theEmployee->getDepartment()); $this->assertEquals("Foo", $theEmployee->getName()); $this->assertEquals(1000, $theEmployee->getSalary()); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee->getSpouse()); + $this->assertInstanceOf(CompanyEmployee::class, $theEmployee); + $this->assertInstanceOf(CompanyEmployee::class, $theEmployee->getSpouse()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php index a108f81b8..47e79ed7a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php @@ -2,8 +2,9 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Common\NotifyPropertyChanged, - Doctrine\Common\PropertyChangedListener; +use Doctrine\Common\NotifyPropertyChanged; +use Doctrine\Common\PropertyChangedListener; +use Doctrine\ORM\Proxy\Proxy; class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase { @@ -12,8 +13,8 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Parent'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1690Child') + $this->_em->getClassMetadata(DDC1690Parent::class), + $this->_em->getClassMetadata(DDC1690Child::class) ] ); } catch (\Exception $e) { @@ -47,28 +48,24 @@ class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase $childId = $child->getId(); unset($parent, $child); - $parent = $this->_em->find(__NAMESPACE__.'\DDC1690Parent', $parentId); - $child = $this->_em->find(__NAMESPACE__.'\DDC1690Child', $childId); + $parent = $this->_em->find(DDC1690Parent::class, $parentId); + $child = $this->_em->find(DDC1690Child::class, $childId); $this->assertEquals(1, count($parent->listeners)); - $this->assertInstanceOf( - 'Doctrine\\ORM\\Proxy\\Proxy', - $child, - 'Verifying that $child is a proxy before using proxy API' - ); + $this->assertInstanceOf(Proxy::class, $child, 'Verifying that $child is a proxy before using proxy API'); $this->assertCount(0, $child->listeners); $child->__load(); $this->assertCount(1, $child->listeners); unset($parent, $child); - $parent = $this->_em->find(__NAMESPACE__.'\DDC1690Parent', $parentId); + $parent = $this->_em->find(DDC1690Parent::class, $parentId); $child = $parent->getChild(); $this->assertEquals(1, count($parent->listeners)); $this->assertEquals(1, count($child->listeners)); unset($parent, $child); - $child = $this->_em->find(__NAMESPACE__.'\DDC1690Child', $childId); + $child = $this->_em->find(DDC1690Child::class, $childId); $parent = $child->getParent(); $this->assertEquals(1, count($parent->listeners)); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php index dd6dcaeeb..54b52a57b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php @@ -17,8 +17,8 @@ class DDC1707Test extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509File'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1509Picture'), + $this->_em->getClassMetadata(DDC1509File::class), + $this->_em->getClassMetadata(DDC1509Picture::class), ] ); } catch (\Exception $ignored) { @@ -28,7 +28,7 @@ class DDC1707Test extends OrmFunctionalTestCase public function testPostLoadOnChild() { - $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1707Child'); + $class = $this->_em->getClassMetadata(DDC1707Child::class); $entity = new DDC1707Child(); $class->invokeLifecycleCallbacks(Events::postLoad, $entity); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php index fe5a0de65..b3784ff8a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php @@ -2,22 +2,18 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\Quote\SimpleEntity; - /** * @group DDC-1719 */ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase { - const CLASS_NAME = 'Doctrine\Tests\ORM\Functional\Ticket\DDC1719SimpleEntity'; - protected function setUp() { parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(self::CLASS_NAME), + $this->_em->getClassMetadata(DDC1719SimpleEntity::class), ] ); } @@ -28,7 +24,7 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->dropSchema( [ - $this->_em->getClassMetadata(self::CLASS_NAME), + $this->_em->getClassMetadata(DDC1719SimpleEntity::class), ] ); } @@ -48,11 +44,11 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase $e2Id = $e2->id; // Retrieve - $e1 = $this->_em->find(self::CLASS_NAME, $e1Id); - $e2 = $this->_em->find(self::CLASS_NAME, $e2Id); + $e1 = $this->_em->find(DDC1719SimpleEntity::class, $e1Id); + $e2 = $this->_em->find(DDC1719SimpleEntity::class, $e2Id); - $this->assertInstanceOf(self::CLASS_NAME, $e1); - $this->assertInstanceOf(self::CLASS_NAME, $e2); + $this->assertInstanceOf(DDC1719SimpleEntity::class, $e1); + $this->assertInstanceOf(DDC1719SimpleEntity::class, $e2); $this->assertEquals($e1Id, $e1->id); $this->assertEquals($e2Id, $e2->id); @@ -71,8 +67,8 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals('Bar 2', $e1->value); $this->assertEquals('Foo 2', $e2->value); - $this->assertInstanceOf(self::CLASS_NAME, $e1); - $this->assertInstanceOf(self::CLASS_NAME, $e2); + $this->assertInstanceOf(DDC1719SimpleEntity::class, $e1); + $this->assertInstanceOf(DDC1719SimpleEntity::class, $e2); $this->assertEquals($e1Id, $e1->id); $this->assertEquals($e2Id, $e2->id); @@ -86,8 +82,8 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); - $e1 = $this->_em->find(self::CLASS_NAME, $e1Id); - $e2 = $this->_em->find(self::CLASS_NAME, $e2Id); + $e1 = $this->_em->find(DDC1719SimpleEntity::class, $e1Id); + $e2 = $this->_em->find(DDC1719SimpleEntity::class, $e2Id); $this->assertNull($e1); $this->assertNull($e2); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1734Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1734Test.php index f0abda67d..cfca544ae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1734Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1734Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\CMS\CmsGroup; class DDC1734Test extends \Doctrine\Tests\OrmFunctionalTestCase @@ -31,7 +32,7 @@ class DDC1734Test extends \Doctrine\Tests\OrmFunctionalTestCase $proxy = $this->getProxy($group); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $proxy); + $this->assertInstanceOf(Proxy::class, $proxy); $this->assertFalse($proxy->__isInitialized()); $this->_em->detach($proxy); @@ -61,7 +62,7 @@ class DDC1734Test extends \Doctrine\Tests\OrmFunctionalTestCase $proxy = $this->getProxy($group); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $proxy); + $this->assertInstanceOf(Proxy::class, $proxy); $this->assertFalse($proxy->__isInitialized()); $this->_em->detach($proxy); @@ -86,4 +87,4 @@ class DDC1734Test extends \Doctrine\Tests\OrmFunctionalTestCase return $this->_em->getProxyFactory()->getProxy($className, $identifier); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php index 13b1868d5..54245368a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php @@ -12,8 +12,8 @@ class DDC1757Test extends OrmFunctionalTestCase /* @var $qb \Doctrine\ORM\QueryBuilder */ $qb->select('_a') - ->from(__NAMESPACE__ . '\DDC1757A', '_a') - ->from(__NAMESPACE__ . '\DDC1757B', '_b') + ->from(DDC1757A::class, '_a') + ->from(DDC1757B::class, '_b') ->join('_b.c', '_c') ->join('_c.d', '_d'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php index b2e02c26b..09623f135 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php @@ -32,8 +32,8 @@ class DDC1778Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->user = $this->_em->find('Doctrine\\Tests\\Models\\CMS\\CmsUser', $this->user->getId()); - $this->phone = $this->_em->find('Doctrine\\Tests\\Models\\CMS\\CmsPhonenumber', $this->phone->phonenumber); + $this->user = $this->_em->find(CmsUser::class, $this->user->getId()); + $this->phone = $this->_em->find(CmsPhonenumber::class, $this->phone->phonenumber); } public function testClear() @@ -43,7 +43,7 @@ class DDC1778Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->user = $this->_em->find('Doctrine\\Tests\\Models\\CMS\\CmsUser', $this->user->getId()); + $this->user = $this->_em->find(CmsUser::class, $this->user->getId()); $this->assertCount(1, $this->user->getPhonenumbers()); } @@ -55,7 +55,7 @@ class DDC1778Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->user = $this->_em->find('Doctrine\\Tests\\Models\\CMS\\CmsUser', $this->user->getId()); + $this->user = $this->_em->find(CmsUser::class, $this->user->getId()); $this->assertCount(1, $this->user->getPhonenumbers()); } @@ -67,7 +67,7 @@ class DDC1778Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->user = $this->_em->find('Doctrine\\Tests\\Models\\CMS\\CmsUser', $this->user->getId()); + $this->user = $this->_em->find(CmsUser::class, $this->user->getId()); $this->assertCount(1, $this->user->getPhonenumbers()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php index 134108030..17f28658a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php @@ -12,8 +12,8 @@ class DDC1787Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1787Bar'), + $this->_em->getClassMetadata(DDC1787Foo::class), + $this->_em->getClassMetadata(DDC1787Bar::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php index 6cf8c68c4..4273a36b6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php @@ -2,7 +2,10 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\Models\Quote\Address; use Doctrine\Tests\Models\Quote\Group; +use Doctrine\Tests\Models\Quote\Phone; +use Doctrine\Tests\Models\Quote\User; /** * @group DDC-1845 @@ -18,10 +21,10 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Phone'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), + $this->_em->getClassMetadata(User::class), + $this->_em->getClassMetadata(Group::class), + $this->_em->getClassMetadata(Phone::class), + $this->_em->getClassMetadata(Address::class), ] ); } catch(\Exception $e) { @@ -53,15 +56,15 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase $e4Id = $e4->id; // Retrieve - $e1 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e1Id); - $e2 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e2Id); - $e3 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e3Id); - $e4 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e4Id); + $e1 = $this->_em->find(Group::class, $e1Id); + $e2 = $this->_em->find(Group::class, $e2Id); + $e3 = $this->_em->find(Group::class, $e3Id); + $e4 = $this->_em->find(Group::class, $e4Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e1); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e2); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e3); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e4); + $this->assertInstanceOf(Group::class, $e1); + $this->assertInstanceOf(Group::class, $e2); + $this->assertInstanceOf(Group::class, $e3); + $this->assertInstanceOf(Group::class, $e4); $this->assertEquals($e1Id, $e1->id); $this->assertEquals($e2Id, $e2->id); @@ -91,10 +94,10 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals('Bar 33', $e3->name); $this->assertEquals('Foo 44', $e4->name); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e1); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e2); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e3); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e4); + $this->assertInstanceOf(Group::class, $e1); + $this->assertInstanceOf(Group::class, $e2); + $this->assertInstanceOf(Group::class, $e3); + $this->assertInstanceOf(Group::class, $e4); $this->assertEquals($e1Id, $e1->id); $this->assertEquals($e2Id, $e2->id); @@ -116,16 +119,16 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e1); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e2); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e3); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $e4); + $this->assertInstanceOf(Group::class, $e1); + $this->assertInstanceOf(Group::class, $e2); + $this->assertInstanceOf(Group::class, $e3); + $this->assertInstanceOf(Group::class, $e4); // Retrieve - $e1 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e1Id); - $e2 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e2Id); - $e3 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e3Id); - $e4 = $this->_em->find('Doctrine\Tests\Models\Quote\Group', $e4Id); + $e1 = $this->_em->find(Group::class, $e1Id); + $e2 = $this->_em->find(Group::class, $e2Id); + $e3 = $this->_em->find(Group::class, $e3Id); + $e4 = $this->_em->find(Group::class, $e4Id); $this->assertNull($e1); $this->assertNull($e2); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php index 2e638278d..938459ad4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php @@ -1,8 +1,10 @@ useModelSet('taxi'); parent::setUp(); - list($bimmer, $crysler, $merc, $volvo) = $this->createCars('Doctrine\Tests\Models\Taxi\Car'); - list($john, $foo) = $this->createDrivers('Doctrine\Tests\Models\Taxi\Driver'); + list($bimmer, $crysler, $merc, $volvo) = $this->createCars(Car::class); + list($john, $foo) = $this->createDrivers(Driver::class); $this->_em->flush(); $ride1 = new Ride($john, $bimmer); @@ -98,7 +100,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase $qb = $this->_em->createQueryBuilder(); $result = $qb->select('d, dr, c') - ->from('Doctrine\Tests\Models\Taxi\Driver', 'd') + ->from(Driver::class, 'd') ->leftJoin('d.freeDriverRides', 'dr') ->leftJoin('dr.car', 'c') ->where('d.name = ?1') @@ -120,7 +122,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase $qb = $this->_em->createQueryBuilder(); $result = $qb->select('d, dr, c') - ->from('Doctrine\Tests\Models\Taxi\Driver', 'd') + ->from(Driver::class, 'd') ->leftJoin('d.driverRides', 'dr') ->leftJoin('dr.car', 'c') ->where('d.name = ?1') @@ -140,7 +142,7 @@ class DDC1884Test extends \Doctrine\Tests\OrmFunctionalTestCase $qb = $this->_em->createQueryBuilder(); $result = $qb->select('r, d, c') - ->from('Doctrine\Tests\Models\Taxi\PaidRide', 'r') + ->from(PaidRide::class, 'r') ->leftJoin('r.driver', 'd') ->leftJoin('r.car', 'c') ->where('d.name = ?1') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php index 356a2c881..283340b82 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\Models\Quote\Address; use Doctrine\Tests\Models\Quote\Group; use Doctrine\Tests\Models\Quote\User; @@ -24,9 +25,9 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\User'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Group'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Quote\Address'), + $this->_em->getClassMetadata(User::class), + $this->_em->getClassMetadata(Group::class), + $this->_em->getClassMetadata(Address::class), ] ); } catch(\Exception $e) { @@ -57,9 +58,9 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $g2Id = $g2->id; // Retrieve - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); @@ -68,8 +69,8 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $g1 = $user->getGroups()->get(0); $g2 = $user->getGroups()->get(1); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $g1); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $g2); + $this->assertInstanceOf(Group::class, $g1); + $this->assertInstanceOf(Group::class, $g2); $g1->name = 'Bar 11'; $g2->name = 'Foo 22'; @@ -79,9 +80,9 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); @@ -91,24 +92,24 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id)); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Quote\Group', $g1Id)); - $this->assertNull($this->_em->find('Doctrine\Tests\Models\Quote\Group', $g2Id)); + $this->assertNull($this->_em->find(User::class, $u1Id)); + $this->assertNull($this->_em->find(Group::class, $g1Id)); + $this->assertNull($this->_em->find(Group::class, $g2Id)); } public function testRemoveItem() { $user = $this->user; $u1Id = $user->id; - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); $this->assertCount(2, $user->groups); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(1)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(0)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(1)); $user->getGroups()->remove(0); @@ -117,9 +118,9 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); @@ -130,15 +131,15 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase { $user = $this->user; $u1Id = $user->id; - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); $this->assertCount(2, $user->groups); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(1)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(0)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(1)); $user->getGroups()->clear(); @@ -147,9 +148,9 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); @@ -160,14 +161,14 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase { $user = $this->user; $u1Id = $user->id; - $user = $this->_em->find('Doctrine\Tests\Models\Quote\User', $u1Id); + $user = $this->_em->find(User::class, $u1Id); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\User', $user); + $this->assertInstanceOf(User::class, $user); $this->assertEquals('FabioBatSilva', $user->name); $this->assertEquals($u1Id, $user->id); $this->assertCount(2, $user->groups); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(0)); - $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(1)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(0)); + $this->assertInstanceOf(Group::class, $user->getGroups()->get(1)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php index f42a3655f..c61fae9c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -14,8 +14,8 @@ class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925Product'), + $this->_em->getClassMetadata(DDC1925User::class), + $this->_em->getClassMetadata(DDC1925Product::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php index 2627a17d8..f6f0f173d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -10,8 +10,8 @@ class DDC192Test extends OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC192Phonenumber') + $this->_em->getClassMetadata(DDC192User::class), + $this->_em->getClassMetadata(DDC192Phonenumber::class) ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php index 0bfd73960..fb32b99fe 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php @@ -15,7 +15,7 @@ class DDC1995Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->useModelSet('company'); parent::setUp(); } - + public function testIssue() { $person = new CompanyPerson; @@ -32,14 +32,14 @@ class DDC1995Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $dql = 'SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1'; - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'); + $class = $this->_em->getClassMetadata(CompanyEmployee::class); $result = $this->_em->createQuery($dql) ->setParameter(1, $class) ->getResult(); $this->assertCount(1, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result[0]); + $this->assertInstanceOf(CompanyEmployee::class, $result[0]); } public function testQueryCache() @@ -58,8 +58,8 @@ class DDC1995Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $dql = 'SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF :type'; - $class1 = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee'); - $class2 = $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyPerson'); + $class1 = $this->_em->getClassMetadata(CompanyEmployee::class); + $class2 = $this->_em->getClassMetadata(CompanyPerson::class); $result1 = $this->_em->createQuery($dql) ->setParameter('type', $class1) @@ -74,8 +74,8 @@ class DDC1995Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertCount(1, $result1); $this->assertCount(1, $result2); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result1[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $result2[0]); - $this->assertNotInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result2[0]); + $this->assertInstanceOf(CompanyEmployee::class, $result1[0]); + $this->assertInstanceOf(CompanyPerson::class, $result2[0]); + $this->assertNotInstanceOf(CompanyEmployee::class, $result2[0]); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php index bc2fe26cf..74ea2fd88 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php @@ -13,11 +13,11 @@ class DDC1998Test extends \Doctrine\Tests\OrmFunctionalTestCase { public function testSqlConversionAsIdentifier() { - Type::addType('ddc1998', __NAMESPACE__ . '\\DDC1998Type'); + Type::addType('ddc1998', DDC1998Type::class); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1998Entity'), + $this->_em->getClassMetadata(DDC1998Entity::class), ] ); @@ -36,13 +36,13 @@ class DDC1998Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $found = $this->_em->find(__NAMESPACE__ . '\\DDC1998Entity', $entity->id); + $found = $this->_em->find(DDC1998Entity::class, $entity->id); $this->assertNull($found); - $found = $this->_em->find(__NAMESPACE__ . '\\DDC1998Entity', "foo"); + $found = $this->_em->find(DDC1998Entity::class, "foo"); $this->assertNull($found); - $this->assertEquals(0, count($this->_em->getRepository(__NAMESPACE__ . '\\DDC1998Entity')->findAll())); + $this->assertEquals(0, count($this->_em->getRepository(DDC1998Entity::class)->findAll())); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php index 9db6dad96..2fb3acd33 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php @@ -11,9 +11,9 @@ class DDC199Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ParentClass'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199ChildClass'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC199RelatedClass') + $this->_em->getClassMetadata(DDC199ParentClass::class), + $this->_em->getClassMetadata(DDC199ChildClass::class), + $this->_em->getClassMetadata(DDC199RelatedClass::class) ] ); } @@ -42,11 +42,11 @@ class DDC199Test extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199ParentClass', $result[0]); + $this->assertInstanceOf(DDC199ParentClass::class, $result[0]); $this->assertTrue($result[0]->relatedEntities->isInitialized()); $this->assertEquals(2, $result[0]->relatedEntities->count()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199RelatedClass', $result[0]->relatedEntities[0]); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199RelatedClass', $result[0]->relatedEntities[1]); + $this->assertInstanceOf(DDC199RelatedClass::class, $result[0]->relatedEntities[0]); + $this->assertInstanceOf(DDC199RelatedClass::class, $result[0]->relatedEntities[1]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php index 5d2be3bbc..388240808 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php @@ -15,14 +15,14 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - Type::addType(DDC2012TsVectorType::MYTYPE, __NAMESPACE__ . '\DDC2012TsVectorType'); + Type::addType(DDC2012TsVectorType::MYTYPE, DDC2012TsVectorType::class); DDC2012TsVectorType::$calls = []; $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012Item'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2012ItemPerson'), + $this->_em->getClassMetadata(DDC2012Item::class), + $this->_em->getClassMetadata(DDC2012ItemPerson::class), ] ); } @@ -46,7 +46,7 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertCount(1, DDC2012TsVectorType::$calls['convertToDatabaseValue']); $this->assertCount(1, DDC2012TsVectorType::$calls['convertToPHPValue']); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item); + $this->assertInstanceOf(DDC2012Item::class, $item); $this->assertEquals(['word1', 'word2', 'word3'], $item->tsv); @@ -62,7 +62,7 @@ class DDC2012Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertCount(2, DDC2012TsVectorType::$calls['convertToDatabaseValue']); $this->assertCount(2, DDC2012TsVectorType::$calls['convertToPHPValue']); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC2012Item', $item); + $this->assertInstanceOf(DDC2012Item::class, $item); $this->assertEquals(['word1', 'word2'], $item->tsv); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php index b0ae37e0e..ed77ba134 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php @@ -20,7 +20,7 @@ class DDC2074Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testShouldNotScheduleDeletionOnClonedInstances() { - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $class = $this->_em->getClassMetadata(ECommerceProduct::class); $product = new ECommerceProduct(); $category = new ECommerceCategory(); $collection = new PersistentCollection($this->_em, $class, new ArrayCollection([$category])); @@ -50,8 +50,8 @@ class DDC2074Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $product1 = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $product->getId()); - $product2 = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $newProduct->getId()); + $product1 = $this->_em->find(ECommerceProduct::class, $product->getId()); + $product2 = $this->_em->find(ECommerceProduct::class, $newProduct->getId()); $this->assertCount(1, $product1->getCategories()); $this->assertCount(1, $product2->getCategories()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php index dc7563c66..174fee2b2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2090Test.php @@ -18,7 +18,6 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIssue() { - $className = 'Doctrine\Tests\Models\Company\CompanyEmployee'; $date1 = new \DateTime('2011-11-11 11:11:11'); $date2 = new \DateTime('2012-12-12 12:12:12'); $employee1 = new CompanyEmployee; @@ -40,7 +39,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $this->_em->createQueryBuilder() - ->update($className, 'e') + ->update(CompanyEmployee::class, 'e') ->set('e.startDate', ':date') ->set('e.salary', ':salary') ->where('e = :e') @@ -56,7 +55,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->execute(); $this->_em->createQueryBuilder() - ->update($className, 'e') + ->update(CompanyEmployee::class, 'e') ->set('e.startDate', ':date') ->set('e.salary', ':salary') ->where('e = :e') @@ -73,8 +72,8 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $e1 = $this->_em->find($className, $employee1->getId()); - $e2 = $this->_em->find($className, $employee2->getId()); + $e1 = $this->_em->find(CompanyEmployee::class, $employee1->getId()); + $e2 = $this->_em->find(CompanyEmployee::class, $employee2->getId()); $this->assertEquals(101, $e1->getSalary()); $this->assertEquals(102, $e2->getSalary()); @@ -82,7 +81,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals($date2, $e2->getStartDate()); $this->_em->createQueryBuilder() - ->update($className, 'e') + ->update(CompanyEmployee::class, 'e') ->set('e.startDate', '?1') ->set('e.salary', '?2') ->where('e = ?0') @@ -92,7 +91,7 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase ->execute(); $this->_em->createQueryBuilder() - ->update($className, 'e') + ->update(CompanyEmployee::class, 'e') ->set('e.startDate', '?1') ->set('e.salary', '?2') ->where('e = ?0') @@ -104,8 +103,8 @@ class DDC2090Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $e1 = $this->_em->find($className, $employee1->getId()); - $e2 = $this->_em->find($className, $employee2->getId()); + $e1 = $this->_em->find(CompanyEmployee::class, $employee1->getId()); + $e2 = $this->_em->find(CompanyEmployee::class, $employee2->getId()); $this->assertEquals(101, $e1->getSalary()); $this->assertEquals(102, $e2->getSalary()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php index 3e3e8670f..0fdc7f84d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php @@ -14,7 +14,7 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2106Entity'), + $this->_em->getClassMetadata(DDC2106Entity::class), ] ); } @@ -26,7 +26,7 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($entity); $this->_em->flush(); $this->_em->detach($entity); - $entity = $this->_em->getRepository(__NAMESPACE__ . '\DDC2106Entity')->findOneBy([]); + $entity = $this->_em->getRepository(DDC2106Entity::class)->findOneBy([]); // ... and a managed entity without id $entityWithoutId = new DDC2106Entity(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php index cd94f75a5..9ac27f3cf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php @@ -11,8 +11,8 @@ class DDC211Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC211Group') + $this->_em->getClassMetadata(DDC211User::class), + $this->_em->getClassMetadata(DDC211Group::class) ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php index a0abb6754..960395e9c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2138Test.php @@ -17,11 +17,11 @@ class DDC2138Test extends OrmFunctionalTestCase $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata(__NAMESPACE__ . '\DDC2138User'), - $em->getClassMetadata(__NAMESPACE__ . '\DDC2138Structure'), - $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedObject'), - $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedStructure'), - $em->getClassMetadata(__NAMESPACE__ . '\DDC2138UserFollowedUser') + $em->getClassMetadata(DDC2138User::class), + $em->getClassMetadata(DDC2138Structure::class), + $em->getClassMetadata(DDC2138UserFollowedObject::class), + $em->getClassMetadata(DDC2138UserFollowedStructure::class), + $em->getClassMetadata(DDC2138UserFollowedUser::class) ]; $schema = $schemaTool->getSchemaFromMetadata($classes); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php index d1a2e27a9..d6b3c603b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php @@ -12,7 +12,7 @@ class DDC2175Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2175Entity'), + $this->_em->getClassMetadata(DDC2175Entity::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php index 47e6671e8..590b7cd5f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php @@ -12,8 +12,8 @@ class DDC2182Test extends \Doctrine\Tests\OrmFunctionalTestCase $sql = $this->_schemaTool->getCreateSchemaSql( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionParent'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2182OptionChild'), + $this->_em->getClassMetadata(DDC2182OptionParent::class), + $this->_em->getClassMetadata(DDC2182OptionChild::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php index 03d9b8f5d..87101fff1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2214Test.php @@ -19,8 +19,8 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2214Bar'), + $this->_em->getClassMetadata(DDC2214Foo::class), + $this->_em->getClassMetadata(DDC2214Bar::class), ] ); } @@ -38,7 +38,7 @@ class DDC2214Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); /* @var $foo \Doctrine\Tests\ORM\Functional\Ticket\DDC2214Foo */ - $foo = $this->_em->find(__NAMESPACE__ . '\\DDC2214Foo', $foo->id); + $foo = $this->_em->find(DDC2214Foo::class, $foo->id); $bar = $foo->bar; $logger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2224Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2224Test.php index 781d644ff..3529fa356 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2224Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2224Test.php @@ -14,7 +14,7 @@ class DDC2224Test extends \Doctrine\Tests\OrmFunctionalTestCase { public static function setUpBeforeClass() { - \Doctrine\DBAL\Types\Type::addType('DDC2224Type', __NAMESPACE__ . '\DDC2224Type'); + \Doctrine\DBAL\Types\Type::addType('DDC2224Type', DDC2224Type::class); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php index accb24a7a..4ced4df4d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2230Test.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Common\NotifyPropertyChanged; use Doctrine\Common\PropertyChangedListener; +use Doctrine\Common\Proxy\Proxy; use Doctrine\ORM\Tools\ToolsException; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,8 +20,8 @@ class DDC2230Test extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2230Address'), + $this->_em->getClassMetadata(DDC2230User::class), + $this->_em->getClassMetadata(DDC2230Address::class), ] ); } catch (ToolsException $e) {} @@ -36,16 +37,16 @@ class DDC2230Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find(__NAMESPACE__ . '\\DDC2230User', $insertedUser->id); + $user = $this->_em->find(DDC2230User::class, $insertedUser->id); $this->_em->clear(); $mergedUser = $this->_em->merge($user); - /* @var $address \Doctrine\Common\Proxy\Proxy */ + /* @var $address Proxy */ $address = $mergedUser->address; - $this->assertInstanceOf('Doctrine\\ORM\\Proxy\\Proxy', $address); + $this->assertInstanceOf(Proxy::class, $address); $this->assertFalse($address->__isInitialized()); } @@ -57,9 +58,9 @@ class DDC2230Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $addressProxy = $this->_em->getReference(__NAMESPACE__ . '\\DDC2230Address', $insertedAddress->id); + $addressProxy = $this->_em->getReference(DDC2230Address::class, $insertedAddress->id); - /* @var $addressProxy \Doctrine\Common\Proxy\Proxy|\Doctrine\Tests\ORM\Functional\Ticket\DDC2230Address */ + /* @var $addressProxy Proxy|\Doctrine\Tests\ORM\Functional\Ticket\DDC2230Address */ $this->assertFalse($addressProxy->__isInitialized()); $this->assertNull($addressProxy->listener); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php index 1caeffcc7..6bfd8d823 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Persistence\ObjectManagerAware; +use Doctrine\ORM\Proxy\Proxy; /** * @group DDC-2231 @@ -16,7 +17,7 @@ class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2231EntityY'), + $this->_em->getClassMetadata(DDC2231EntityY::class), ] ); } @@ -32,7 +33,7 @@ class DDC2231Test extends \Doctrine\Tests\OrmFunctionalTestCase $y1ref = $this->_em->getReference(get_class($y1), $y1->id); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $y1ref); + $this->assertInstanceOf(Proxy::class, $y1ref); $this->assertFalse($y1ref->__isInitialized__); $id = $y1ref->doSomething(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php index 643c054ab..e4b601966 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2252Test.php @@ -20,10 +20,10 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252User'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Privilege'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC2252MerchantAccount'), + $this->_em->getClassMetadata(DDC2252User::class), + $this->_em->getClassMetadata(DDC2252Privilege::class), + $this->_em->getClassMetadata(DDC2252Membership::class), + $this->_em->getClassMetadata(DDC2252MerchantAccount::class), ] ); @@ -63,10 +63,9 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase 'userAccount' => $this->user->getUid(), ]; - $class = 'Doctrine\Tests\ORM\Functional\Ticket\DDC2252Membership'; - $membership = $this->_em->find($class, $identifier); + $membership = $this->_em->find(DDC2252Membership::class, $identifier); - $this->assertInstanceOf($class, $membership); + $this->assertInstanceOf(DDC2252Membership::class, $membership); $this->assertCount(3, $membership->getPrivileges()); $membership->getPrivileges()->remove(2); @@ -74,9 +73,9 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $membership = $this->_em->find($class, $identifier); + $membership = $this->_em->find(DDC2252Membership::class, $identifier); - $this->assertInstanceOf($class, $membership); + $this->assertInstanceOf(DDC2252Membership::class, $membership); $this->assertCount(2, $membership->getPrivileges()); $membership->getPrivileges()->clear(); @@ -84,9 +83,9 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $membership = $this->_em->find($class, $identifier); + $membership = $this->_em->find(DDC2252Membership::class, $identifier); - $this->assertInstanceOf($class, $membership); + $this->assertInstanceOf(DDC2252Membership::class, $membership); $this->assertCount(0, $membership->getPrivileges()); $membership->addPrivilege($privilege3 = new DDC2252Privilege); @@ -95,9 +94,9 @@ class DDC2252Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $membership = $this->_em->find($class, $identifier); + $membership = $this->_em->find(DDC2252Membership::class, $identifier); - $this->assertInstanceOf($class, $membership); + $this->assertInstanceOf(DDC2252Membership::class, $membership); $this->assertCount(1, $membership->getPrivileges()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php index 2ec88f9f3..681210159 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php @@ -15,8 +15,8 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2256Group') + $this->_em->getClassMetadata(DDC2256User::class), + $this->_em->getClassMetadata(DDC2256Group::class) ] ); } @@ -24,7 +24,7 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testIssue() { $config = $this->_em->getConfiguration(); - $config->addEntityNamespace('MyNamespace', 'Doctrine\Tests\ORM\Functional\Ticket'); + $config->addEntityNamespace('MyNamespace', __NAMESPACE__); $user = new DDC2256User(); $user->name = 'user'; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php index 818443698..24807db02 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Proxy\Proxy; /** * @group DDC-2306 @@ -18,10 +19,10 @@ class DDC2306Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Zone'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306Address'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2306UserAddress'), + $this->_em->getClassMetadata(DDC2306Zone::class), + $this->_em->getClassMetadata(DDC2306User::class), + $this->_em->getClassMetadata(DDC2306Address::class), + $this->_em->getClassMetadata(DDC2306UserAddress::class), ] ); } @@ -55,12 +56,12 @@ class DDC2306Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); /* @var $address DDC2306Address */ - $address = $this->_em->find(__NAMESPACE__ . '\\DDC2306Address', $address->id); - /* @var $user DDC2306User|\Doctrine\ORM\Proxy\Proxy */ + $address = $this->_em->find(DDC2306Address::class, $address->id); + /* @var $user DDC2306User|Proxy */ $user = $address->users->first()->user; - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $user); - $this->assertInstanceOf(__NAMESPACE__ . '\\DDC2306User', $user); + $this->assertInstanceOf(Proxy::class, $user); + $this->assertInstanceOf(DDC2306User::class, $user); $userId = $user->id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php index 9172904c8..a1cac08ea 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2346Test.php @@ -24,9 +24,9 @@ class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Bar'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2346Baz'), + $this->_em->getClassMetadata(DDC2346Foo::class), + $this->_em->getClassMetadata(DDC2346Bar::class), + $this->_em->getClassMetadata(DDC2346Baz::class), ] ); @@ -60,7 +60,7 @@ class DDC2346Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getConnection()->getConfiguration()->setSQLLogger($this->logger); - $fetchedBazs = $this->_em->getRepository(__NAMESPACE__ . '\\DDC2346Baz')->findAll(); + $fetchedBazs = $this->_em->getRepository(DDC2346Baz::class)->findAll(); $this->assertCount(2, $fetchedBazs); $this->assertCount(2, $this->logger->queries, 'The total number of executed queries is 2, and not n+1'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php index 919f74cf7..1d3a4117a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php @@ -16,8 +16,8 @@ class DDC2350Test extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2350Bug'), + $this->_em->getClassMetadata(DDC2350User::class), + $this->_em->getClassMetadata(DDC2350Bug::class), ] ); } @@ -38,7 +38,7 @@ class DDC2350Test extends OrmFunctionalTestCase $this->_em->clear(); $cnt = $this->getCurrentQueryCount(); - $user = $this->_em->find(__NAMESPACE__ . '\DDC2350User', $user->id); + $user = $this->_em->find(DDC2350User::class, $user->id); $this->assertEquals($cnt + 1, $this->getCurrentQueryCount()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php index af51a2d7c..ba8a621d5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php @@ -53,7 +53,7 @@ class DDC2359Test extends \PHPUnit_Framework_TestCase $metadataFactory->setEntityManager($entityManager); - $this->assertSame($mockMetadata, $metadataFactory->getMetadataFor(__NAMESPACE__ . '\\DDC2359Foo')); + $this->assertSame($mockMetadata, $metadataFactory->getMetadataFor(DDC2359Foo::class)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php index 225369739..eac219c72 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; + class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() @@ -9,9 +11,9 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityX'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityY'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC237EntityZ') + $this->_em->getClassMetadata(DDC237EntityX::class), + $this->_em->getClassMetadata(DDC237EntityY::class), + $this->_em->getClassMetadata(DDC237EntityZ::class) ] ); } @@ -37,7 +39,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $x2 = $this->_em->find(get_class($x), $x->id); // proxy injected for Y - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); + $this->assertInstanceOf(Proxy::class, $x2->y); $this->assertFalse($x2->y->__isInitialized__); // proxy for Y is in identity map @@ -45,7 +47,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $z2 = $this->_em->createQuery('select z,y from ' . get_class($z) . ' z join z.y y where z.id = ?1') ->setParameter(1, $z->id) ->getSingleResult(); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $z2->y); + $this->assertInstanceOf(Proxy::class, $z2->y); $this->assertTrue($z2->y->__isInitialized__); $this->assertEquals('Y', $z2->y->data); $this->assertEquals($y->id, $z2->y->id); @@ -56,7 +58,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotSame($x, $x2); $this->assertNotSame($z, $z2); $this->assertSame($z2->y, $x2->y); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $z2->y); + $this->assertInstanceOf(Proxy::class, $z2->y); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2409Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2409Test.php index c8b85f24f..94d39b994 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2409Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2409Test.php @@ -21,7 +21,7 @@ class DDC2409Test extends \Doctrine\Tests\OrmFunctionalTestCase { $em = $this->_em; $uow = $em->getUnitOfWork(); - + $originalArticle = new CmsArticle(); $originalUser = new CmsUser(); @@ -39,7 +39,7 @@ class DDC2409Test extends \Doctrine\Tests\OrmFunctionalTestCase $em->flush(); $em->clear(); - $article = $em->find('Doctrine\Tests\Models\CMS\CmsArticle', $originalArticle->id); + $article = $em->find(CmsArticle::class, $originalArticle->id); $user = new CmsUser(); $user->name = 'Doctrine Bot 2.0'; @@ -69,4 +69,4 @@ class DDC2409Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotSame($userMerged, $articleMerged->user); $this->assertSame($user, $articleMerged->user); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php index aa29b9fea..fb1f0ec27 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php @@ -20,20 +20,20 @@ class DDC2415Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ParentEntity'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ChildEntity'), + $this->_em->getClassMetadata(DDC2415ParentEntity::class), + $this->_em->getClassMetadata(DDC2415ChildEntity::class), ] ); } public function testTicket() { - $parentMetadata = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ParentEntity'); - $childMetadata = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2415ChildEntity'); + $parentMetadata = $this->_em->getClassMetadata(DDC2415ParentEntity::class); + $childMetadata = $this->_em->getClassMetadata(DDC2415ChildEntity::class); $this->assertEquals($parentMetadata->generatorType, $childMetadata->generatorType); $this->assertEquals($parentMetadata->customGeneratorDefinition, $childMetadata->customGeneratorDefinition); - $this->assertEquals('Doctrine\Tests\ORM\Functional\Ticket\DDC2415Generator', $parentMetadata->customGeneratorDefinition['class']); + $this->assertEquals(DDC2415Generator::class, $parentMetadata->customGeneratorDefinition['class']); $e1 = new DDC2415ChildEntity("ChildEntity 1"); $e2 = new DDC2415ChildEntity("ChildEntity 2"); @@ -68,11 +68,7 @@ class DDC2415ParentEntity ); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM); - $metadata->setCustomGeneratorDefinition( - [ - 'class' => 'Doctrine\Tests\ORM\Functional\Ticket\DDC2415Generator' - ] - ); + $metadata->setCustomGeneratorDefinition(['class' => DDC2415Generator::class]); $metadata->isMappedSuperclass = true; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php index 7590a14f1..33109ddd7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php @@ -17,12 +17,12 @@ class DDC2494Test extends \Doctrine\Tests\OrmFunctionalTestCase DDC2494TinyIntType::$calls = []; - Type::addType('ddc2494_tinyint', __NAMESPACE__ . '\DDC2494TinyIntType'); + Type::addType('ddc2494_tinyint', DDC2494TinyIntType::class); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC2494Currency::CLASSNAME), - $this->_em->getClassMetadata(DDC2494Campaign::CLASSNAME), + $this->_em->getClassMetadata(DDC2494Currency::class), + $this->_em->getClassMetadata(DDC2494Campaign::class), ] ); } @@ -43,10 +43,10 @@ class DDC2494Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertArrayHasKey('convertToDatabaseValue', DDC2494TinyIntType::$calls); $this->assertCount(3, DDC2494TinyIntType::$calls['convertToDatabaseValue']); - $item = $this->_em->find(DDC2494Campaign::CLASSNAME, $campaign->getId()); + $item = $this->_em->find(DDC2494Campaign::class, $campaign->getId()); - $this->assertInstanceOf(DDC2494Campaign::CLASSNAME, $item); - $this->assertInstanceOf(DDC2494Currency::CLASSNAME, $item->getCurrency()); + $this->assertInstanceOf(DDC2494Campaign::class, $item); + $this->assertInstanceOf(DDC2494Currency::class, $item->getCurrency()); $queryCount = $this->getCurrentQueryCount(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php index d6ea115b5..cc12d044d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2519Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\Legacy\LegacyUser; use Doctrine\Tests\Models\Legacy\LegacyUserReference; @@ -29,18 +30,18 @@ class DDC2519Test extends \Doctrine\Tests\OrmFunctionalTestCase $result = $this->_em->createQuery($dql)->getResult(); $this->assertCount(2, $result); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUserReference', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUserReference', $result[1]); + $this->assertInstanceOf(LegacyUserReference::class, $result[0]); + $this->assertInstanceOf(LegacyUserReference::class, $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[0]->source()); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[0]->target()); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[1]->source()); - $this->assertInstanceOf('Doctrine\Tests\Models\Legacy\LegacyUser', $result[1]->target()); + $this->assertInstanceOf(LegacyUser::class, $result[0]->source()); + $this->assertInstanceOf(LegacyUser::class, $result[0]->target()); + $this->assertInstanceOf(LegacyUser::class, $result[1]->source()); + $this->assertInstanceOf(LegacyUser::class, $result[1]->target()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->source()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->target()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[1]->source()); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[1]->target()); + $this->assertInstanceOf(Proxy::class, $result[0]->source()); + $this->assertInstanceOf(Proxy::class, $result[0]->target()); + $this->assertInstanceOf(Proxy::class, $result[1]->source()); + $this->assertInstanceOf(Proxy::class, $result[1]->target()); $this->assertFalse($result[0]->target()->__isInitialized()); $this->assertFalse($result[0]->source()->__isInitialized()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php index 771b8b801..e3652e55c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2575Test.php @@ -17,9 +17,9 @@ class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575Root'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575A'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2575B'), + $this->_em->getClassMetadata(DDC2575Root::class), + $this->_em->getClassMetadata(DDC2575A::class), + $this->_em->getClassMetadata(DDC2575B::class), ] ); @@ -55,7 +55,7 @@ class DDC2575Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testHydrationIssue() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC2575Root'); + $repository = $this->_em->getRepository(DDC2575Root::class); $qb = $repository->createQueryBuilder('r') ->select('r, a, b') ->leftJoin('r.aRelation', 'a') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php index f80eba96c..53ab6550b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php @@ -15,13 +15,13 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - Type::addType(DDC2579Type::NAME, DDC2579Type::CLASSNAME); + Type::addType(DDC2579Type::NAME, DDC2579Type::class); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC2579Entity::CLASSNAME), - $this->_em->getClassMetadata(DDC2579EntityAssoc::CLASSNAME), - $this->_em->getClassMetadata(DDC2579AssocAssoc::CLASSNAME), + $this->_em->getClassMetadata(DDC2579Entity::class), + $this->_em->getClassMetadata(DDC2579EntityAssoc::class), + $this->_em->getClassMetadata(DDC2579AssocAssoc::class), ] ); } @@ -32,7 +32,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase $assoc = new DDC2579AssocAssoc($id); $assocAssoc = new DDC2579EntityAssoc($assoc); $entity = new DDC2579Entity($assocAssoc); - $repository = $this->_em->getRepository(DDC2579Entity::CLASSNAME); + $repository = $this->_em->getRepository(DDC2579Entity::class); $this->_em->persist($assoc); $this->_em->persist($assocAssoc); @@ -50,7 +50,7 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase $criteria = ['assoc' => $assoc, 'id' => $id]; $entity = $repository->findOneBy($criteria); - $this->assertInstanceOf(DDC2579Entity::CLASSNAME, $entity); + $this->assertInstanceOf(DDC2579Entity::class, $entity); $this->assertEquals($value, $entity->value); $this->_em->remove($entity); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index e0cd3257b..fb7ce673e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -11,10 +11,10 @@ class DDC258Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Super'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class2'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC258Class3'), + $this->_em->getClassMetadata(DDC258Super::class), + $this->_em->getClassMetadata(DDC258Class1::class), + $this->_em->getClassMetadata(DDC258Class2::class), + $this->_em->getClassMetadata(DDC258Class3::class), ] ); } @@ -45,14 +45,14 @@ class DDC258Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $e2 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC258Super', $c2->id); + $e2 = $this->_em->find(DDC258Super::class, $c2->id); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC258Class2', $e2); + $this->assertInstanceOf(DDC258Class2::class, $e2); $this->assertEquals('Bar', $e2->title); $this->assertEquals('Bar', $e2->description); $this->assertEquals('Bar', $e2->text); - $all = $this->_em->getRepository(__NAMESPACE__.'\DDC258Super')->findAll(); + $all = $this->_em->getRepository(DDC258Super::class)->findAll(); foreach ($all as $obj) { if ($obj instanceof DDC258Class1) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php index 0a542b1af..18854bcb8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php @@ -19,9 +19,9 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Product'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660Customer'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder') + $this->_em->getClassMetadata(DDC2660Product::class), + $this->_em->getClassMetadata(DDC2660Customer::class), + $this->_em->getClassMetadata(DDC2660CustomerOrder::class) ] ); } catch(\Exception $e) { @@ -49,7 +49,7 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase $sql = "SELECT o.product_id, o.customer_id, o.name FROM ddc_2660_customer_order o"; $rsm = new ResultSetMappingBuilder($this->_getEntityManager()); - $rsm->addRootEntityFromClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder', 'c'); + $rsm->addRootEntityFromClassMetadata(DDC2660CustomerOrder::class, 'c'); $query = $this->_em->createNativeQuery($sql, $rsm); $result = $query->getResult(); @@ -58,7 +58,7 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase foreach ($result as $order) { $this->assertNotNull($order); - $this->assertInstanceOf(__NAMESPACE__ . '\\DDC2660CustomerOrder', $order); + $this->assertInstanceOf(DDC2660CustomerOrder::class, $order); } } @@ -67,7 +67,7 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase $sql = "SELECT o.product_id, o.customer_id FROM ddc_2660_customer_order o"; $rsm = new ResultSetMappingBuilder($this->_getEntityManager()); - $rsm->addRootEntityFromClassMetadata(__NAMESPACE__ . '\DDC2660CustomerOrder', 'c'); + $rsm->addRootEntityFromClassMetadata(DDC2660CustomerOrder::class, 'c'); $query = $this->_em->createNativeQuery($sql, $rsm); $result = $query->getResult(); @@ -76,7 +76,7 @@ class DDC2660Test extends \Doctrine\Tests\OrmFunctionalTestCase foreach ($result as $order) { $this->assertNotNull($order); - $this->assertInstanceOf(__NAMESPACE__ . '\\DDC2660CustomerOrder', $order); + $this->assertInstanceOf(DDC2660CustomerOrder::class, $order); } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php index ff4739e48..1e9f05e47 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php @@ -20,7 +20,7 @@ class DDC2692Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2692Foo'), + $this->_em->getClassMetadata(DDC2692Foo::class), ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php index 1ebb4e9c1..10d3e68ae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php @@ -17,10 +17,10 @@ class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Qualification'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759Category'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759QualificationMetadata'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2759MetadataCategory'), + $this->_em->getClassMetadata(DDC2759Qualification::class), + $this->_em->getClassMetadata(DDC2759Category::class), + $this->_em->getClassMetadata(DDC2759QualificationMetadata::class), + $this->_em->getClassMetadata(DDC2759MetadataCategory::class), ] ); } catch(\Exception $e) { @@ -51,7 +51,7 @@ class DDC2759Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testCorrectNumberOfAssociationsIsReturned() { - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC2759Qualification'); + $repository = $this->_em->getRepository(DDC2759Qualification::class); $builder = $repository->createQueryBuilder('q') ->select('q, qm, qmc') diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php index efc7a6286..025ee7633 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php @@ -17,10 +17,10 @@ class DDC2775Test extends OrmFunctionalTestCase $this->setUpEntitySchema( [ - 'Doctrine\Tests\ORM\Functional\Ticket\User', - 'Doctrine\Tests\ORM\Functional\Ticket\Role', - 'Doctrine\Tests\ORM\Functional\Ticket\AdminRole', - 'Doctrine\Tests\ORM\Functional\Ticket\Authorization', + User::class, + Role::class, + AdminRole::class, + Authorization::class, ] ); } @@ -45,7 +45,7 @@ class DDC2775Test extends OrmFunctionalTestCase // Need to clear so that associations are lazy-loaded $this->_em->clear(); - $user = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\User', $user->id); + $user = $this->_em->find(User::class, $user->id); $this->_em->remove($user); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php index 499b85b68..f09e2e68c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php @@ -9,10 +9,10 @@ class DDC279Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityXAbstract'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityX'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityY'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC279EntityZ'), + $this->_em->getClassMetadata(DDC279EntityXAbstract::class), + $this->_em->getClassMetadata(DDC279EntityX::class), + $this->_em->getClassMetadata(DDC279EntityY::class), + $this->_em->getClassMetadata(DDC279EntityZ::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php index d5b287a73..179fff8d0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php @@ -87,9 +87,9 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase public function getTestedClasses() { return [ - [ExplicitSchemaAndTable::CLASSNAME, 'explicit_schema', 'explicit_table'], - [SchemaAndTableInTableName::CLASSNAME, 'implicit_schema', 'implicit_table'], - [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::CLASSNAME, 'myschema', 'order'], + [ExplicitSchemaAndTable::class, 'explicit_schema', 'explicit_table'], + [SchemaAndTableInTableName::class, 'implicit_schema', 'implicit_table'], + [DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName::class, 'myschema', 'order'], ]; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php index d772e441c..9a5bccd58 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php @@ -18,8 +18,8 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC2862User::CLASSNAME), - $this->_em->getClassMetadata(DDC2862Driver::CLASSNAME), + $this->_em->getClassMetadata(DDC2862User::class), + $this->_em->getClassMetadata(DDC2862Driver::class), ] ); } catch (ToolsException $exc) { @@ -36,30 +36,30 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::class, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::class, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); - $driver2 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); + $driver2 = $this->_em->find(DDC2862Driver::class, $driver1->getId()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(DDC2862Driver::CLASSNAME, $driver2); - $this->assertInstanceOf(DDC2862User::CLASSNAME, $driver2->getUserProfile()); + $this->assertInstanceOf(DDC2862Driver::class, $driver2); + $this->assertInstanceOf(DDC2862User::class, $driver2->getUserProfile()); $driver2->setName('Franta'); $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862User::class, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::class, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); - $driver3 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); + $driver3 = $this->_em->find(DDC2862Driver::class, $driver1->getId()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); - $this->assertInstanceOf(DDC2862Driver::CLASSNAME, $driver3); - $this->assertInstanceOf(DDC2862User::CLASSNAME, $driver3->getUserProfile()); + $this->assertInstanceOf(DDC2862Driver::class, $driver3); + $this->assertInstanceOf(DDC2862User::class, $driver3->getUserProfile()); $this->assertEquals('Franta', $driver3->getName()); $this->assertEquals('Foo', $driver3->getUserProfile()->getName()); } @@ -74,38 +74,38 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->_em->getCache()->evictEntityRegion(DDC2862User::CLASSNAME); - $this->_em->getCache()->evictEntityRegion(DDC2862Driver::CLASSNAME); + $this->_em->getCache()->evictEntityRegion(DDC2862User::class); + $this->_em->getCache()->evictEntityRegion(DDC2862Driver::class); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::class, ['id' => $user1->getId()])); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862Driver::class, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); - $driver2 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); + $driver2 = $this->_em->find(DDC2862Driver::class, $driver1->getId()); - $this->assertInstanceOf(DDC2862Driver::CLASSNAME, $driver2); - $this->assertInstanceOf(DDC2862User::CLASSNAME, $driver2->getUserProfile()); + $this->assertInstanceOf(DDC2862Driver::class, $driver2); + $this->assertInstanceOf(DDC2862User::class, $driver2->getUserProfile()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $this->_em->clear(); - $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::CLASSNAME, ['id' => $user1->getId()])); - $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::CLASSNAME, ['id' => $driver1->getId()])); + $this->assertFalse($this->_em->getCache()->containsEntity(DDC2862User::class, ['id' => $user1->getId()])); + $this->assertTrue($this->_em->getCache()->containsEntity(DDC2862Driver::class, ['id' => $driver1->getId()])); $queryCount = $this->getCurrentQueryCount(); - $driver3 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); + $driver3 = $this->_em->find(DDC2862Driver::class, $driver1->getId()); - $this->assertInstanceOf(DDC2862Driver::CLASSNAME, $driver3); - $this->assertInstanceOf(DDC2862User::CLASSNAME, $driver3->getUserProfile()); + $this->assertInstanceOf(DDC2862Driver::class, $driver3); + $this->assertInstanceOf(DDC2862User::class, $driver3->getUserProfile()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertEquals('Foo', $driver3->getUserProfile()->getName()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); $queryCount = $this->getCurrentQueryCount(); - $driver4 = $this->_em->find(DDC2862Driver::CLASSNAME, $driver1->getId()); + $driver4 = $this->_em->find(DDC2862Driver::class, $driver1->getId()); - $this->assertInstanceOf(DDC2862Driver::CLASSNAME, $driver4); - $this->assertInstanceOf(DDC2862User::CLASSNAME, $driver4->getUserProfile()); + $this->assertInstanceOf(DDC2862Driver::class, $driver4); + $this->assertInstanceOf(DDC2862User::class, $driver4->getUserProfile()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertEquals('Foo', $driver4->getUserProfile()->getName()); $this->assertEquals($queryCount, $this->getCurrentQueryCount()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php index 7f8451a29..397c7acd3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php @@ -15,7 +15,7 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895'), + $this->_em->getClassMetadata(DDC2895::class), ] ); } catch(\Exception $e) { @@ -25,7 +25,7 @@ class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testPostLoadOneToManyInheritance() { - $cm = $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2895'); + $cm = $this->_em->getClassMetadata(DDC2895::class); $this->assertEquals( [ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php index ff494225f..927856a1c 100755 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php @@ -16,7 +16,7 @@ class DDC2931Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2931User'), + $this->_em->getClassMetadata(DDC2931User::class), ] ); } catch (\Exception $e) { @@ -40,7 +40,7 @@ class DDC2931Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $second = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC2931User', $second->id); + $second = $this->_em->find(DDC2931User::class, $second->id); $this->assertSame(2, $second->getRank()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2943Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2943Test.php index 7ae6ef5f3..553bc98f5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2943Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2943Test.php @@ -33,7 +33,7 @@ class DDC2943Test extends OrmFunctionalTestCase { $this->loadFixtures(); - $region = $this->_em->getCache()->getEntityCacheRegion(Country::CLASSNAME); + $region = $this->_em->getCache()->getEntityCacheRegion(Country::class); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; $query = $this->_em->createQuery($dql) ->setCacheable(true) @@ -52,7 +52,7 @@ class DDC2943Test extends OrmFunctionalTestCase { $this->loadFixtures(); - $region = $this->_em->getCache()->getEntityCacheRegion(Country::CLASSNAME); + $region = $this->_em->getCache()->getEntityCacheRegion(Country::class); $dql = 'SELECT c FROM Doctrine\Tests\Models\Cache\Country c'; $query = $this->_em->createQuery($dql) ->setCacheable(true) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php index bf685328f..69f4d01c0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php @@ -19,14 +19,14 @@ class DDC2984Test extends \Doctrine\Tests\OrmFunctionalTestCase if ( ! Type::hasType('ddc2984_domain_user_id')) { Type::addType( 'ddc2984_domain_user_id', - __NAMESPACE__ . '\DDC2984UserIdCustomDbalType' + DDC2984UserIdCustomDbalType::class ); } try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2984User'), + $this->_em->getClassMetadata(DDC2984User::class), ] ); } catch (\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php index 897d3bfdf..4a2436330 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php @@ -11,8 +11,8 @@ class DDC2996Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC2996UserPreference'), + $this->_em->getClassMetadata(DDC2996User::class), + $this->_em->getClassMetadata(DDC2996UserPreference::class), ] ); @@ -31,7 +31,7 @@ class DDC2996Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $pref = $this->_em->find(__NAMESPACE__ . '\\DDC2996UserPreference', $pref->id); + $pref = $this->_em->find(DDC2996UserPreference::class, $pref->id); $this->assertEquals(1, $pref->user->counter); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php index 153457805..b25686dce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php @@ -14,8 +14,8 @@ class DDC3033Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3033Product'), + $this->_em->getClassMetadata(DDC3033User::class), + $this->_em->getClassMetadata(DDC3033Product::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php index 222b30fc0..940989bb7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3042Test.php @@ -15,8 +15,8 @@ class DDC3042Test extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Foo'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3042Bar'), + $this->_em->getClassMetadata(DDC3042Foo::class), + $this->_em->getClassMetadata(DDC3042Bar::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php index 83eb50aa9..90a3f3ed8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3068Test.php @@ -40,21 +40,21 @@ class DDC3068Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindUsingAnArrayOfObjectAsPrimaryKey() { - $ride1 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [ + $ride1 = $this->_em->find(Ride::class, [ 'driver' => $this->foo->getId(), 'car' => $this->merc->getBrand() ] ); - $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride1); + $this->assertInstanceOf(Ride::class, $ride1); - $ride2 = $this->_em->find('Doctrine\Tests\Models\Taxi\Ride', [ + $ride2 = $this->_em->find(Ride::class, [ 'driver' => $this->foo, 'car' => $this->merc ] ); - $this->assertInstanceOf('Doctrine\Tests\Models\Taxi\Ride', $ride2); + $this->assertInstanceOf(Ride::class, $ride2); $this->assertSame($ride1, $ride2); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php index 4d5583c75..15454b482 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php @@ -11,8 +11,8 @@ class DDC309Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309Country'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC309User'), + $this->_em->getClassMetadata(DDC309Country::class), + $this->_em->getClassMetadata(DDC309User::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3103Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3103Test.php index bb9ccde17..fe8329345 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3103Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3103Test.php @@ -14,10 +14,9 @@ class DDC3103Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testIssue() { - $className = __NAMESPACE__ . '\\DDC3103ArticleId'; - $classMetadata = new ClassMetadata($className); + $classMetadata = new ClassMetadata(DDC3103ArticleId::class); - $this->createAnnotationDriver()->loadMetadataForClass($className, $classMetadata); + $this->createAnnotationDriver()->loadMetadataForClass(DDC3103ArticleId::class, $classMetadata); $this->assertTrue( $classMetadata->isEmbeddedClass, diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php index 92f2c1b27..ac3f10be6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -19,10 +19,10 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntityJoined'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductJoined'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntitySingleTable'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductSingleTable'), + $this->_em->getClassMetadata(DDC3170AbstractEntityJoined::class), + $this->_em->getClassMetadata(DDC3170ProductJoined::class), + $this->_em->getClassMetadata(DDC3170AbstractEntitySingleTable::class), + $this->_em->getClassMetadata(DDC3170ProductSingleTable::class), ] ); } @@ -50,7 +50,7 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_em->createQueryBuilder() ->select('p') - ->from(__NAMESPACE__ . '\\DDC3170ProductJoined', 'p') + ->from(DDC3170ProductJoined::class, 'p') ->getQuery() ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); } catch (HydrationException $e) // Thrown by SimpleObjectHydrator @@ -61,7 +61,7 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_em->createQueryBuilder() ->select('p') - ->from(__NAMESPACE__ . '\\DDC3170ProductSingleTable', 'p') + ->from(DDC3170ProductSingleTable::class, 'p') ->getQuery() ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); } catch (HydrationException $e) // Thrown by SimpleObjectHydrator diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php index 79dd4267e..0c4def045 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php @@ -23,12 +23,12 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase ); } - Type::addType('ddc3192_currency_code', __NAMESPACE__ . '\DDC3192CurrencyCode'); + Type::addType('ddc3192_currency_code', DDC3192CurrencyCode::class); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC3192Currency::CLASSNAME), - $this->_em->getClassMetadata(DDC3192Transaction::CLASSNAME), + $this->_em->getClassMetadata(DDC3192Currency::class), + $this->_em->getClassMetadata(DDC3192Transaction::class), ] ); } @@ -47,7 +47,7 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->close(); - $resultByPersister = $this->_em->find(DDC3192Transaction::CLASSNAME, $transaction->id); + $resultByPersister = $this->_em->find(DDC3192Transaction::class, $transaction->id); // This works: DDC2494 makes persister set type mapping info to ResultSetMapping $this->assertEquals('BYR', $resultByPersister->currency->code); @@ -55,7 +55,7 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->close(); $query = $this->_em->createQuery(); - $query->setDQL('SELECT t FROM ' . DDC3192Transaction::CLASSNAME . ' t WHERE t.id = ?1'); + $query->setDQL('SELECT t FROM ' . DDC3192Transaction::class . ' t WHERE t.id = ?1'); $query->setParameter(1, $transaction->id); $resultByQuery = $query->getSingleResult(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php index be2c58617..0f98adca1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php @@ -17,10 +17,10 @@ class DDC3223Test extends OrmFunctionalTestCase $this->setUpEntitySchema( [ - 'Doctrine\Tests\ORM\Functional\Ticket\Journalist', - 'Doctrine\Tests\ORM\Functional\Ticket\Participant', - 'Doctrine\Tests\ORM\Functional\Ticket\Status', - 'Doctrine\Tests\ORM\Functional\Ticket\ProfileStatus', + Journalist::class, + Participant::class, + Status::class, + ProfileStatus::class, ] ); } @@ -37,7 +37,7 @@ class DDC3223Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $participant = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\Participant', $participant->id); + $participant = $this->_em->find(Participant::class, $participant->id); $profileStatus = clone $participant->profileStatus; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php index 8014ae6f8..0f31ecedf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php @@ -14,14 +14,14 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase $resolveTargetEntity = new ResolveTargetEntityListener(); $resolveTargetEntity->addResolveTargetEntity( - DDC3300BossInterface::INTERFACENAME, - DDC3300Boss::CLASSNAME, + DDC3300BossInterface::class, + DDC3300Boss::class, [] ); $resolveTargetEntity->addResolveTargetEntity( - DDC3300EmployeeInterface::INTERFACENAME, - DDC3300Employee::CLASSNAME, + DDC3300EmployeeInterface::class, + DDC3300Employee::class, [] ); @@ -29,7 +29,7 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC3300Person::CLASSNAME), + $this->_em->getClassMetadata(DDC3300Person::class), ] ); @@ -42,8 +42,8 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->assertEquals($boss, $this->_em->find(DDC3300BossInterface::INTERFACENAME, $boss->id)); - $this->assertEquals($employee, $this->_em->find(DDC3300EmployeeInterface::INTERFACENAME, $employee->id)); + $this->assertEquals($boss, $this->_em->find(DDC3300BossInterface::class, $boss->id)); + $this->assertEquals($employee, $this->_em->find(DDC3300EmployeeInterface::class, $employee->id)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php index 9edf58170..c6a2f4ab1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php @@ -18,8 +18,8 @@ class DDC3330Test extends OrmFunctionalTestCase $this->setUpEntitySchema( [ - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Building', - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3330_Hall', + DDC3330_Building::class, + DDC3330_Hall::class, ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php index 85b2086c7..386576760 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php @@ -22,7 +22,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindOneWithEagerFetchWillNotHydrateLimitedCollection() { /* @var DDC3346Author $author */ - $author = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findOneBy( + $author = $this->_em->getRepository(DDC3346Author::class)->findOneBy( ['username' => 'bwoogy'] ); @@ -32,7 +32,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindLimitedWithEagerFetchWillNotHydrateLimitedCollection() { /* @var DDC3346Author[] $authors */ - $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy( + $authors = $this->_em->getRepository(DDC3346Author::class)->findBy( ['username' => 'bwoogy'], null, 1 @@ -45,7 +45,7 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFindWithEagerFetchAndOffsetWillNotHydrateLimitedCollection() { /* @var DDC3346Author[] $authors */ - $authors = $this->_em->getRepository(DDC3346Author::CLASSNAME)->findBy( + $authors = $this->_em->getRepository(DDC3346Author::class)->findBy( ['username' => 'bwoogy'], null, null, diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php index ea4c37722..20b4236c3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php @@ -10,9 +10,9 @@ class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Group'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC345Membership'), + $this->_em->getClassMetadata(DDC345User::class), + $this->_em->getClassMetadata(DDC345Group::class), + $this->_em->getClassMetadata(DDC345Membership::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php index 5d9e8a014..dcb782bd4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php @@ -12,8 +12,8 @@ class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353File'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC353Picture'), + $this->_em->getClassMetadata(DDC353File::class), + $this->_em->getClassMetadata(DDC353Picture::class), ] ); } catch(\Exception $ignored) {} @@ -34,10 +34,10 @@ class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase $fileId = $file->getFileId(); $this->assertTrue($fileId > 0); - $file = $em->getReference('Doctrine\Tests\ORM\Functional\Ticket\DDC353File', $fileId); + $file = $em->getReference(DDC353File::class, $fileId); $this->assertEquals(UnitOfWork::STATE_MANAGED, $em->getUnitOfWork()->getEntityState($file), "Reference Proxy should be marked MANAGED."); - $picture = $em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC353Picture', $picture->getPictureId()); + $picture = $em->find(DDC353Picture::class, $picture->getPictureId()); $this->assertEquals(UnitOfWork::STATE_MANAGED, $em->getUnitOfWork()->getEntityState($picture->getFile()), "Lazy Proxy should be marked MANAGED."); $em->remove($picture); @@ -61,7 +61,7 @@ class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($fileId > 0); - $picture = $em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC353Picture', $pictureId); + $picture = $em->find(DDC353Picture::class, $pictureId); $this->assertEquals(UnitOfWork::STATE_MANAGED, $em->getUnitOfWork()->getEntityState($picture->getFile()), "Lazy Proxy should be marked MANAGED."); $em->remove($picture); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php index 4c07046f6..2f10adcee 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php @@ -6,17 +6,17 @@ class DDC3582Test extends \Doctrine\Tests\OrmFunctionalTestCase { function testNestedEmbeddablesAreHydratedWithProperClass() { - $this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC3582Entity::CLASSNAME)]); + $this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC3582Entity::class)]); $this->_em->persist(new DDC3582Entity('foo')); $this->_em->flush(); $this->_em->clear(); /** @var DDC3582Entity $entity */ - $entity = $this->_em->find(DDC3582Entity::CLASSNAME, 'foo'); + $entity = $this->_em->find(DDC3582Entity::class, 'foo'); - $this->assertInstanceOf(DDC3582Embeddable1::CLASSNAME, $entity->embeddable1); - $this->assertInstanceOf(DDC3582Embeddable2::CLASSNAME, $entity->embeddable1->embeddable2); - $this->assertInstanceOf(DDC3582Embeddable3::CLASSNAME, $entity->embeddable1->embeddable2->embeddable3); + $this->assertInstanceOf(DDC3582Embeddable1::class, $entity->embeddable1); + $this->assertInstanceOf(DDC3582Embeddable2::class, $entity->embeddable1->embeddable2); + $this->assertInstanceOf(DDC3582Embeddable3::class, $entity->embeddable1->embeddable2->embeddable3); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php index b4bb7891c..6d59fd6f7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php @@ -15,9 +15,9 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC3597Root::CLASSNAME), - $this->_em->getClassMetadata(DDC3597Media::CLASSNAME), - $this->_em->getClassMetadata(DDC3597Image::CLASSNAME) + $this->_em->getClassMetadata(DDC3597Root::class), + $this->_em->getClassMetadata(DDC3597Media::class), + $this->_em->getClassMetadata(DDC3597Image::class) ] ); } @@ -38,8 +38,8 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_em->clear(); //request entity - $imageEntity = $this->_em->find(DDC3597Image::CLASSNAME, $imageEntity->getId()); - $this->assertInstanceOf(DDC3597Image::CLASSNAME, $imageEntity); + $imageEntity = $this->_em->find(DDC3597Image::class, $imageEntity->getId()); + $this->assertInstanceOf(DDC3597Image::class, $imageEntity); //cleanup $this->_em->remove($imageEntity); @@ -47,7 +47,7 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_em->clear(); //check delete - $imageEntity = $this->_em->find(DDC3597Image::CLASSNAME, $imageEntity->getId()); + $imageEntity = $this->_em->find(DDC3597Image::class, $imageEntity->getId()); $this->assertNull($imageEntity); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php index 679ab559c..2f499f2d2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php @@ -16,7 +16,7 @@ class DDC3634Test extends OrmFunctionalTestCase { protected function setUp() { parent::setUp(); - $metadata = $this->_em->getClassMetadata(DDC3634Entity::CLASSNAME); + $metadata = $this->_em->getClassMetadata(DDC3634Entity::class); if ( ! $metadata->idGenerator->isPostInsertGenerator()) { $this->markTestSkipped('Need a post-insert ID generator in order to make this test work correctly'); @@ -25,8 +25,8 @@ class DDC3634Test extends OrmFunctionalTestCase { try { $this->_schemaTool->createSchema([ $metadata, - $this->_em->getClassMetadata(DDC3634JTIBaseEntity::CLASSNAME), - $this->_em->getClassMetadata(DDC3634JTIChildEntity::CLASSNAME), + $this->_em->getClassMetadata(DDC3634JTIBaseEntity::class), + $this->_em->getClassMetadata(DDC3634JTIChildEntity::class), ]); } catch (ToolsException $e) { // schema already in place @@ -425,4 +425,4 @@ class DDC3634LastInsertIdMockingConnection extends Connection { return $this->forwardCall(); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php index f4e338eac..968c44d72 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php @@ -18,10 +18,10 @@ class DDC3644Test extends OrmFunctionalTestCase $this->setUpEntitySchema( [ - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644User', - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Address', - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Animal', - 'Doctrine\Tests\ORM\Functional\Ticket\DDC3644Pet', + DDC3644User::class, + DDC3644Address::class, + DDC3644Animal::class, + DDC3644Pet::class, ] ); } @@ -56,7 +56,7 @@ class DDC3644Test extends OrmFunctionalTestCase // Replace entire collection (this should trigger OneToManyPersister::remove()) $current = new DDC3644Address('Toronto, ON, Canada'); $addresses = new ArrayCollection([$current]); - $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); + $user = $this->_em->find(DDC3644User::class, $userId); $user->setAddresses($addresses); @@ -67,12 +67,12 @@ class DDC3644Test extends OrmFunctionalTestCase $this->_em->clear(); // We should only have 1 item in the collection list now - $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); + $user = $this->_em->find(DDC3644User::class, $userId); $this->assertCount(1, $user->addresses); // We should only have 1 item in the addresses table too - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC3644Address'); + $repository = $this->_em->getRepository(DDC3644Address::class); $addresses = $repository->findAll(); $this->assertCount(1, $addresses); @@ -106,7 +106,7 @@ class DDC3644Test extends OrmFunctionalTestCase // Replace entire collection (this should trigger OneToManyPersister::remove()) $actual = new DDC3644Pet('Valentina'); $pets = new ArrayCollection([$actual]); - $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); + $user = $this->_em->find(DDC3644User::class, $userId); $user->setPets($pets); @@ -117,12 +117,12 @@ class DDC3644Test extends OrmFunctionalTestCase $this->_em->clear(); // We should only have 1 item in the collection list now - $user = $this->_em->find(__NAMESPACE__ . '\DDC3644User', $userId); + $user = $this->_em->find(DDC3644User::class, $userId); $this->assertCount(1, $user->pets); // We should only have 1 item in the pets table too - $repository = $this->_em->getRepository(__NAMESPACE__ . '\DDC3644Pet'); + $repository = $this->_em->getRepository(DDC3644Pet::class); $pets = $repository->findAll(); $this->assertCount(1, $pets); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php index b33f9a448..fd284e5b1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php @@ -42,12 +42,12 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase // fixtures loaded /* @var $unManagedChild DDC3699Child */ - $unManagedChild = $this->_em->find(DDC3699Child::CLASSNAME, $id); + $unManagedChild = $this->_em->find(DDC3699Child::class, $id); $this->_em->detach($unManagedChild); // make it managed again - $this->_em->find(DDC3699Child::CLASSNAME, $id); + $this->_em->find(DDC3699Child::class, $id); $unManagedChild->childField = 'modifiedChildValue'; $unManagedChild->parentField = 'modifiedParentValue'; @@ -84,11 +84,11 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); /* @var $unmanagedChild DDC3699Child */ - $unmanagedChild = $this->_em->find(DDC3699Child::CLASSNAME, $id); + $unmanagedChild = $this->_em->find(DDC3699Child::class, $id); $this->_em->detach($unmanagedChild); // make it managed again - $this->_em->find(DDC3699Child::CLASSNAME, $id); + $this->_em->find(DDC3699Child::class, $id); $unmanagedChild->childField = 'modifiedChildValue'; $unmanagedChild->parentField = 'modifiedParentValue'; @@ -99,4 +99,4 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertSame($mergedChild->childField, 'modifiedChildValue'); $this->assertSame($mergedChild->parentField, 'modifiedParentValue'); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php index 6a08b49bc..3fc4c856b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\Models\DDC3711\DDC3711EntityA; use Doctrine\Tests\ORM\Mapping\YamlMappingDriverTest; /** @@ -20,8 +21,8 @@ class DDC3711Test extends YamlMappingDriverTest $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); $factory->setEntityManager($em); - $entityA = new ClassMetadata('Doctrine\Tests\Models\DDC3711\DDC3711EntityA'); - $entityA = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3711\DDC3711EntityA'); + $entityA = new ClassMetadata(DDC3711EntityA::class); + $entityA = $factory->getMetadataFor(DDC3711EntityA::class); $this->assertEquals(['link_a_id1' => "id1", 'link_a_id2' => "id2"], $entityA->associationMappings['entityB']['relationToSourceKeyColumns']); $this->assertEquals(['link_b_id1' => "id1", 'link_b_id2' => "id2"], $entityA->associationMappings['entityB']['relationToTargetKeyColumns']); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php index f7013d6d8..3fe5c4b80 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php @@ -1,6 +1,7 @@ _em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Parent'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC371Child') + $this->_em->getClassMetadata(DDC371Parent::class), + $this->_em->getClassMetadata(DDC371Child::class) ] ); } @@ -44,7 +45,7 @@ class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase ->getResult(); $this->assertEquals(1, count($children)); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $children[0]->parent); + $this->assertNotInstanceOf(Proxy::class, $children[0]->parent); $this->assertFalse($children[0]->parent->children->isInitialized()); $this->assertEquals(0, $children[0]->parent->children->unwrap()->count()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php index f5b8cac01..05498db77 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php @@ -12,14 +12,14 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - Type::addType('ddc3785_asset_id', __NAMESPACE__ . '\\DDC3785_AssetIdType'); + Type::addType('ddc3785_asset_id', DDC3785_AssetIdType::class); try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Asset'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_AssetId'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC3785_Attribute') + $this->_em->getClassMetadata(DDC3785_Asset::class), + $this->_em->getClassMetadata(DDC3785_AssetId::class), + $this->_em->getClassMetadata(DDC3785_Attribute::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php index 2bf52eb34..bbfd6974e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php @@ -11,7 +11,7 @@ class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC381Entity'), + $this->_em->getClassMetadata(DDC381Entity::class), ] ); } catch(\Exception $e) { @@ -28,7 +28,7 @@ class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $persistedId = $entity->getId(); - $entity = $this->_em->getReference('Doctrine\Tests\ORM\Functional\Ticket\DDC381Entity', $persistedId); + $entity = $this->_em->getReference(DDC381Entity::class, $persistedId); // explicitly load proxy (getId() does not trigger reload of proxy) $id = $entity->getOtherMethod(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3967Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3967Test.php index d5c3dd554..72a9cfe16 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3967Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3967Test.php @@ -12,7 +12,7 @@ class DDC3967Test extends SecondLevelCacheAbstractTest parent::setUp(); $this->loadFixturesCountries(); - $this->_em->getCache()->evictEntityRegion(Country::CLASSNAME); + $this->_em->getCache()->evictEntityRegion(Country::class); $this->_em->clear(); } @@ -22,12 +22,12 @@ class DDC3967Test extends SecondLevelCacheAbstractTest $id = $country->getId(); // First time, loaded from database - $this->_em->find(Country::CLASSNAME, "$id"); + $this->_em->find(Country::class, "$id"); $this->_em->clear(); // Second time, loaded from cache /** @var Country $country */ - $country = $this->_em->find(Country::CLASSNAME, "$id"); + $country = $this->_em->find(Country::class, "$id"); // Identifier type should be integer $this->assertSame($country->getId(), $id); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4003Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4003Test.php index 1c286781a..6764bc9bf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4003Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4003Test.php @@ -17,7 +17,7 @@ class DDC4003Test extends SecondLevelCacheAbstractTest // Get the id of the first bar $id = $this->attractions[0]->getId(); - $repository = $this->_em->getRepository(Bar::CLASSNAME); + $repository = $this->_em->getRepository(Bar::class); /** * This instance is fresh new, no QueryCache, so the full entity gets loaded from DB. diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php index 0325e1175..6ace5e749 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\PersistentCollection; + class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() @@ -10,9 +12,9 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Guest'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Customer'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC422Contact') + $this->_em->getClassMetadata(DDC422Guest::class), + $this->_em->getClassMetadata(DDC422Customer::class), + $this->_em->getClassMetadata(DDC422Contact::class) ] ); } @@ -29,7 +31,7 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase $customer = $this->_em->find(get_class($customer), $customer->id); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $customer->contacts); + $this->assertInstanceOf(PersistentCollection::class, $customer->contacts); $this->assertFalse($customer->contacts->isInitialized()); $contact = new DDC422Contact; $customer->contacts->add($contact); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php index e6389ebf9..9c06160c7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php @@ -10,7 +10,7 @@ class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Entity'), + $this->_em->getClassMetadata(DDC425Entity::class), //$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Other') ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php index 7fa7b58bd..30d2ca6b9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php @@ -11,8 +11,8 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\DDC440Client') + $this->_em->getClassMetadata(DDC440Phone::class), + $this->_em->getClassMetadata(DDC440Client::class) ] ); } catch (\Exception $e) { @@ -58,7 +58,7 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $uw = $this->_em->getUnitOfWork(); - $client = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC440Client', $id); + $client = $this->_em->find(DDC440Client::class, $id); $clientPhones = $client->getPhones(); $p1 = $clientPhones[1]; @@ -67,13 +67,13 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase // Test the first phone. The assertion actually failed because original entity data is not set properly. // This was because it is also set as MainPhone and that one is created as a proxy, not the // original object when the find on Client is called. However loading proxies did not work correctly. - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p1); + $this->assertInstanceOf(DDC440Phone::class, $p1); $originalData = $uw->getOriginalEntityData($p1); $this->assertEquals($phone->getNumber(), $originalData['number']); //If you comment out previous test, this one should pass - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p2); + $this->assertInstanceOf(DDC440Phone::class, $p2); $originalData = $uw->getOriginalEntityData($p2); $this->assertEquals($phone2->getNumber(), $originalData['number']); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php index 2615e37c6..41d7e1270 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php @@ -10,14 +10,14 @@ class DDC444Test extends \Doctrine\Tests\OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC444User'), + $this->_em->getClassMetadata(DDC444User::class), ] ); } public function testExplicitPolicy() { - $classname = __NAMESPACE__ . "\DDC444User"; + $classname = DDC444User::class; $u = new $classname; $u->name = "Initial value"; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php index 41d1fdee6..31e03e337 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php @@ -11,9 +11,9 @@ class DDC448Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448MainTable'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448ConnectedClass'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC448SubTable'), + $this->_em->getClassMetadata(DDC448MainTable::class), + $this->_em->getClassMetadata(DDC448ConnectedClass::class), + $this->_em->getClassMetadata(DDC448SubTable::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php index 5aebed107..536a8b49b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php @@ -9,9 +9,9 @@ class DDC493Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Customer'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Distributor'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC493Contact') + $this->_em->getClassMetadata(DDC493Customer::class), + $this->_em->getClassMetadata(DDC493Distributor::class), + $this->_em->getClassMetadata(DDC493Contact::class) ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php index 3763b15d7..5b2996aab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php @@ -46,7 +46,7 @@ class DDC501Test extends OrmFunctionalTestCase // freeze and unfreeze $userClone = unserialize(serialize($userReloaded)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $userClone); + $this->assertInstanceOf(CmsUser::class, $userClone); // detached user can't know about his phonenumbers $this->assertEquals(0, count($userClone->getPhonenumbers())); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php index 4cc5aee8c..6f3c3cfb0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php @@ -11,9 +11,9 @@ class DDC512Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Customer'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512OfferItem'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC512Item'), + $this->_em->getClassMetadata(DDC512Customer::class), + $this->_em->getClassMetadata(DDC512OfferItem::class), + $this->_em->getClassMetadata(DDC512Item::class), ] ); } @@ -35,14 +35,14 @@ class DDC512Test extends OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(2, count($result)); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC512Customer', $result[0]); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC512Customer', $result[1]); + $this->assertInstanceOf(DDC512Customer::class, $result[0]); + $this->assertInstanceOf(DDC512Customer::class, $result[1]); if ($result[0]->id == $customer1->id) { - $this->assertInstanceOf(__NAMESPACE__ . '\DDC512OfferItem', $result[0]->item); + $this->assertInstanceOf(DDC512OfferItem::class, $result[0]->item); $this->assertEquals($item->id, $result[0]->item->id); $this->assertNull($result[1]->item); } else { - $this->assertInstanceOf(__NAMESPACE__ . '\DDC512OfferItem', $result[1]->item); + $this->assertInstanceOf(DDC512OfferItem::class, $result[1]->item); $this->assertNull($result[0]->item); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php index 11a7d2f6f..800c442a3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php @@ -9,9 +9,9 @@ class DDC513Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513OfferItem'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Item'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC513Price'), + $this->_em->getClassMetadata(DDC513OfferItem::class), + $this->_em->getClassMetadata(DDC513Item::class), + $this->_em->getClassMetadata(DDC513Price::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index d8592b482..91860e8b0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; + /** * Tests that join columns (foreign keys) can be named the same as the association * fields they're used on without causing issues. @@ -14,9 +16,9 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Customer'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522Cart'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC522ForeignKeyTest') + $this->_em->getClassMetadata(DDC522Customer::class), + $this->_em->getClassMetadata(DDC522Cart::class), + $this->_em->getClassMetadata(DDC522ForeignKeyTest::class) ] ); } catch(\Exception $e) { @@ -46,9 +48,9 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $r = $this->_em->createQuery("select ca,c from ".get_class($cart)." ca join ca.customer c") ->getResult(); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC522Cart', $r[0]); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC522Customer', $r[0]->customer); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $r[0]->customer); + $this->assertInstanceOf(DDC522Cart::class, $r[0]); + $this->assertInstanceOf(DDC522Customer::class, $r[0]->customer); + $this->assertNotInstanceOf(Proxy::class, $r[0]->customer); $this->assertEquals('name', $r[0]->customer->name); $fkt = new DDC522ForeignKeyTest(); @@ -60,7 +62,7 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $fkt2 = $this->_em->find(get_class($fkt), $fkt->id); $this->assertEquals($fkt->cart->id, $fkt2->cartId); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $fkt2->cart); + $this->assertInstanceOf(Proxy::class, $fkt2->cart); $this->assertFalse($fkt2->cart->__isInitialized__); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php index f205ae697..33d88c6be 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; + class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() @@ -9,8 +11,8 @@ class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531Item'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC531SubItem'), + $this->_em->getClassMetadata(DDC531Item::class), + $this->_em->getClassMetadata(DDC531SubItem::class), ] ); } @@ -26,12 +28,12 @@ class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $item3 = $this->_em->find(__NAMESPACE__ . '\DDC531Item', $item2->id); // Load child item first (id 2) + $item3 = $this->_em->find(DDC531Item::class, $item2->id); // Load child item first (id 2) // parent will already be loaded, cannot be lazy because it has mapped subclasses and we would not // know which proxy type to put in. - $this->assertInstanceOf(__NAMESPACE__ . '\DDC531Item', $item3->parent); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $item3->parent); - $item4 = $this->_em->find(__NAMESPACE__ . '\DDC531Item', $item1->id); // Load parent item (id 1) + $this->assertInstanceOf(DDC531Item::class, $item3->parent); + $this->assertNotInstanceOf(Proxy::class, $item3->parent); + $item4 = $this->_em->find(DDC531Item::class, $item1->id); // Load parent item (id 1) $this->assertNull($item4->parent); $this->assertNotNull($item4->getChildren()); $this->assertTrue($item4->getChildren()->contains($item3)); // lazy-loads children diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php index a25178de2..2e9fb8a8c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php @@ -18,18 +18,18 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - if (DBALTypes\Type::hasType(DDC5684ObjectIdType::CLASSNAME)) { - DBALTypes\Type::overrideType(DDC5684ObjectIdType::CLASSNAME, DDC5684ObjectIdType::CLASSNAME); + if (DBALTypes\Type::hasType(DDC5684ObjectIdType::class)) { + DBALTypes\Type::overrideType(DDC5684ObjectIdType::class, DDC5684ObjectIdType::class); } else { - DBALTypes\Type::addType(DDC5684ObjectIdType::CLASSNAME, DDC5684ObjectIdType::CLASSNAME); + DBALTypes\Type::addType(DDC5684ObjectIdType::class, DDC5684ObjectIdType::class); } - $this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC5684Object::CLASSNAME)]); + $this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC5684Object::class)]); } protected function tearDown() { - $this->_schemaTool->dropSchema([$this->_em->getClassMetadata(DDC5684Object::CLASSNAME)]); + $this->_schemaTool->dropSchema([$this->_em->getClassMetadata(DDC5684Object::class)]); parent::tearDown(); } @@ -40,7 +40,7 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($object); $this->_em->flush(); - $this->assertInstanceOf(DDC5684ObjectId::CLASSNAME, $object->id); + $this->assertInstanceOf(DDC5684ObjectId::class, $object->id); } public function testFetchObjectWithAutoIncrementedCustomType() @@ -51,9 +51,9 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $rawId = $object->id->value; - $object = $this->_em->find(DDC5684Object::CLASSNAME, new DDC5684ObjectId($rawId)); + $object = $this->_em->find(DDC5684Object::class, new DDC5684ObjectId($rawId)); - $this->assertInstanceOf(DDC5684ObjectId::CLASSNAME, $object->id); + $this->assertInstanceOf(DDC5684ObjectId::class, $object->id); $this->assertEquals($rawId, $object->id->value); } } @@ -74,7 +74,7 @@ class DDC5684ObjectIdType extends DBALTypes\IntegerType public function getName() { - return self::CLASSNAME; + return self::class; } public function requiresSQLCommentHint(AbstractPlatform $platform) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php index 055438359..021e582e6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php @@ -9,7 +9,7 @@ class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC588Site'), + $this->_em->getClassMetadata(DDC588Site::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php index fb596da52..842ccdd1a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php @@ -11,9 +11,9 @@ class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Item'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Subitem'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Child'), + $this->_em->getClassMetadata(DDC599Item::class), + $this->_em->getClassMetadata(DDC599Subitem::class), + $this->_em->getClassMetadata(DDC599Child::class), ] ); } catch (\Exception $ignored) {} @@ -31,7 +31,7 @@ class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $item = $this->_em->find(__NAMESPACE__ . '\DDC599Item', $item->id); + $item = $this->_em->find(DDC599Item::class, $item->id); $this->_em->remove($item); $this->_em->flush(); // Should not fail @@ -64,7 +64,7 @@ class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testCascadeRemoveOnChildren() { - $class = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC599Subitem'); + $class = $this->_em->getClassMetadata(DDC599Subitem::class); $this->assertArrayHasKey('children', $class->associationMappings); $this->assertTrue($class->associationMappings['children']['isCascadeRemove']); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php index 5d5a6ac1e..5e359863e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php @@ -13,8 +13,8 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Author'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC618Book') + $this->_em->getClassMetadata(DDC618Author::class), + $this->_em->getClassMetadata(DDC618Book::class) ] ); @@ -46,8 +46,8 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = 'SELECT A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A INDEX BY A.name ORDER BY A.name ASC'; $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT); - $joe = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', 10); - $alice = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', 11); + $joe = $this->_em->find(DDC618Author::class, 10); + $alice = $this->_em->find(DDC618Author::class, 11); $this->assertArrayHasKey('Joe', $result, "INDEX BY A.name should return an index by the name of 'Joe'."); $this->assertArrayHasKey('Alice', $result, "INDEX BY A.name should return an index by the name of 'Alice'."); @@ -58,8 +58,8 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = 'SELECT A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Author A INDEX BY A.name ORDER BY A.name ASC'; $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY); - $joe = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', 10); - $alice = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', 11); + $joe = $this->_em->find(DDC618Author::class, 10); + $alice = $this->_em->find(DDC618Author::class, 11); $this->assertArrayHasKey('Joe', $result, "INDEX BY A.name should return an index by the name of 'Joe'."); $this->assertArrayHasKey('Alice', $result, "INDEX BY A.name should return an index by the name of 'Alice'."); @@ -98,8 +98,8 @@ class DDC618Test extends \Doctrine\Tests\OrmFunctionalTestCase 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC'; $result = $this->_em->createQuery($dql)->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC618Book', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC618Author', $result[0]->author); + $this->assertInstanceOf(DDC618Book::class, $result[0]); + $this->assertInstanceOf(DDC618Author::class, $result[0]->author); $dql = 'SELECT B, A FROM Doctrine\Tests\ORM\Functional\Ticket\DDC618Book B '. 'INNER JOIN B.author A INDEX BY A.name ORDER BY A.name ASC'; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php index b88b1b154..2ed53ed35 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; + class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() @@ -10,8 +12,8 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Patient'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC633Appointment'), + $this->_em->getClassMetadata(DDC633Patient::class), + $this->_em->getClassMetadata(DDC633Appointment::class), ] ); } catch(\Exception $e) { @@ -36,10 +38,10 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $eagerAppointment = $this->_em->find(__NAMESPACE__ . '\DDC633Appointment', $app->id); + $eagerAppointment = $this->_em->find(DDC633Appointment::class, $app->id); // Eager loading of one to one leads to fetch-join - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $eagerAppointment->patient); + $this->assertNotInstanceOf(Proxy::class, $eagerAppointment->patient); $this->assertTrue($this->_em->contains($eagerAppointment->patient)); } @@ -64,7 +66,7 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase $appointments = $this->_em->createQuery("SELECT a FROM " . __NAMESPACE__ . "\DDC633Appointment a")->getResult(); foreach ($appointments AS $eagerAppointment) { - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $eagerAppointment->patient); + $this->assertInstanceOf(Proxy::class, $eagerAppointment->patient); $this->assertTrue($eagerAppointment->patient->__isInitialized__, "Proxy should already be initialized due to eager loading!"); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php index 2ebffe340..1f94a3953 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php @@ -10,7 +10,7 @@ class DDC656Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC656Entity') + $this->_em->getClassMetadata(DDC656Entity::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php index f2fe56f7b..759464a5f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php @@ -9,8 +9,6 @@ use Doctrine\Tests\Models\Generic\DateTimeModel; */ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase { - const NS = 'Doctrine\Tests\Models\Generic'; - protected function setUp() { $this->useModelSet('generic'); @@ -21,10 +19,10 @@ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testEntitySingleResult() { - $query = $this->_em->createQuery('SELECT d FROM ' . self::NS . '\DateTimeModel d'); + $query = $this->_em->createQuery('SELECT d FROM ' . DateTimeModel::class . ' d'); $datetime = $query->setMaxResults(1)->getSingleResult(); - $this->assertInstanceOf('Doctrine\Tests\Models\Generic\DateTimeModel', $datetime); + $this->assertInstanceOf(DateTimeModel::class, $datetime); $this->assertInstanceOf('DateTime', $datetime->datetime); $this->assertInstanceOf('DateTime', $datetime->time); @@ -33,7 +31,7 @@ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testScalarResult() { - $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . self::NS . '\DateTimeModel d ORDER BY d.date ASC'); + $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . DateTimeModel::class . ' d ORDER BY d.date ASC'); $result = $query->getScalarResult(); $this->assertCount(2,$result); @@ -49,7 +47,7 @@ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testaTicketEntityArrayResult() { - $query = $this->_em->createQuery('SELECT d FROM ' . self::NS . '\DateTimeModel d ORDER BY d.date ASC'); + $query = $this->_em->createQuery('SELECT d FROM ' . DateTimeModel::class . ' d ORDER BY d.date ASC'); $result = $query->getArrayResult(); $this->assertCount(2,$result); @@ -65,7 +63,7 @@ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testTicketSingleResult() { - $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . self::NS . '\DateTimeModel d ORDER BY d.date ASC'); + $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . DateTimeModel::class . ' d ORDER BY d.date ASC'); $datetime = $query->setMaxResults(1)->getSingleResult(); $this->assertTrue(is_array($datetime)); @@ -77,7 +75,7 @@ class DDC657Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testTicketResult() { - $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . self::NS . '\DateTimeModel d ORDER BY d.date ASC'); + $query = $this->_em->createQuery('SELECT d.id, d.time, d.date, d.datetime FROM ' . DateTimeModel::class . ' d ORDER BY d.date ASC'); $result = $query->getResult(); $this->assertCount(2,$result); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php index c9bb3f09e..f21d6de69 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php @@ -10,8 +10,8 @@ class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Role'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Privilege') + $this->_em->getClassMetadata(DDC698Role::class), + $this->_em->getClassMetadata(DDC698Privilege::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php index 1ae26394c..c6f1a2254 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php @@ -10,7 +10,7 @@ class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC719Group'), + $this->_em->getClassMetadata(DDC719Group::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php index 730eb99ee..af4c9634c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php @@ -2,6 +2,9 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\PersistentCollection; + class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase { public function setUp() @@ -12,8 +15,8 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em); $schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729A'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC729B'), + $this->_em->getClassMetadata(DDC729A::class), + $this->_em->getClassMetadata(DDC729B::class), ] ); } catch(\Exception $e) { @@ -36,11 +39,11 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $a = new DDC729A(); $a->id = $aId; - $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $a->related); + $this->assertInstanceOf(ArrayCollection::class, $a->related); $a = $this->_em->merge($a); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $a->related); + $this->assertInstanceOf(PersistentCollection::class, $a->related); $this->assertFalse($a->related->isInitialized(), "Collection should not be marked initialized."); $this->assertFalse($a->related->isDirty(), "Collection should not be marked as dirty."); @@ -48,7 +51,7 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $a = $this->_em->find(__NAMESPACE__ . '\DDC729A', $aId); + $a = $this->_em->find(DDC729A::class, $aId); $this->assertEquals(1, count($a->related)); } @@ -78,7 +81,7 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $a = $this->_em->find(__NAMESPACE__ . '\DDC729A', $aId); + $a = $this->_em->find(DDC729A::class, $aId); $this->assertEquals(2, count($a->related)); } @@ -110,7 +113,7 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $a = $this->_em->find(__NAMESPACE__ . '\DDC729A', $aId); + $a = $this->_em->find(DDC729A::class, $aId); $this->assertEquals(2, count($a->related)); } @@ -142,7 +145,7 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $a = $this->_em->find(__NAMESPACE__ . '\DDC729A', $aId); + $a = $this->_em->find(DDC729A::class, $aId); $this->assertEquals(2, count($a->related)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php index 61babe8e6..afae6973b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php @@ -12,8 +12,8 @@ class DDC735Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Product'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC735Review') + $this->_em->getClassMetadata(DDC735Product::class), + $this->_em->getClassMetadata(DDC735Review::class) ] ); } catch(\Exception $e) { @@ -49,7 +49,7 @@ class DDC735Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(0, count($product->getReviews()), 'count($reviews) should still be 0 after the refresh'); // Review should also not be available anymore - $this->assertNull($this->_em->find(__NAMESPACE__.'\DDC735Review', $reviewId)); + $this->assertNull($this->_em->find(DDC735Review::class, $reviewId)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php index 5141e9f3a..932731bf6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\ECommerce\ECommerceCart; use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\ORM\Query; @@ -38,9 +39,9 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase $cart2 = $result[0]; unset($result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $cart2); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer()); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart2->getCustomer()); + $this->assertInstanceOf(ECommerceCart::class, $cart2); + $this->assertNotInstanceOf(Proxy::class, $cart2->getCustomer()); + $this->assertInstanceOf(ECommerceCustomer::class, $cart2->getCustomer()); $this->assertEquals(['name' => 'roman', 'payment' => 'cash'], $result); } @@ -65,13 +66,12 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase $dql = "select c, c.name, ca, ca.payment from Doctrine\Tests\Models\ECommerce\ECommerceCart ca join ca.customer c"; $result = $this->_em->createQuery($dql) - ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Functional\Ticket\DisableFetchJoinTreeWalker'] - ) + ->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [DisableFetchJoinTreeWalker::class]) ->getResult(); - /* @var $cart2 Doctrine\Tests\Models\ECommerce\ECommerceCart */ + /* @var $cart2 ECommerceCart */ $cart2 = $result[0][0]; - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer()); + $this->assertInstanceOf(Proxy::class, $cart2->getCustomer()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index 773ad06a8..4d03bca2a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php @@ -27,16 +27,16 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742Comment') + $this->_em->getClassMetadata(DDC742User::class), + $this->_em->getClassMetadata(DDC742Comment::class) ] ); } catch(\Exception $e) { } // make sure classes will be deserialized from caches - $this->_em->getMetadataFactory()->setMetadataFor(__NAMESPACE__ . '\DDC742User', null); - $this->_em->getMetadataFactory()->setMetadataFor(__NAMESPACE__ . '\DDC742Comment', null); + $this->_em->getMetadataFactory()->setMetadataFor(DDC742User::class, null); + $this->_em->getMetadataFactory()->setMetadataFor(DDC742Comment::class, null); } public function testIssue() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php index b71ae5cde..cfafc66dd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php @@ -2,9 +2,10 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\CMS\CmsUser; -use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Common\Collections\Collection; use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsUser; class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase { @@ -30,10 +31,10 @@ class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($article); $this->_em->flush(); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $user->articles); + $this->assertInstanceOf(Collection::class, $user->articles); $this->_em->refresh($article); $this->assertTrue($article !== $user->articles, "The article should not be replaced on the inverse side of the relation."); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $user->articles); + $this->assertInstanceOf(Collection::class, $user->articles); } public function testRefreshOneToOne() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php index 295542aab..a5707f233 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php @@ -38,8 +38,8 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testManyToManyMergeAssociationAdds() { - $this->setCascadeMergeFor('Doctrine\Tests\Models\CMS\CmsUser'); - $this->setCascadeMergeFor('Doctrine\Tests\Models\CMS\CmsGroup'); + $this->setCascadeMergeFor(CmsUser::class); + $this->setCascadeMergeFor(CmsGroup::class); // Put entities in the database $cmsUser = new CmsUser(); @@ -91,8 +91,8 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $cmsUsers = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findAll(); - $cmsGroups = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll(); + $cmsUsers = $this->_em->getRepository(CmsUser::class)->findAll(); + $cmsGroups = $this->_em->getRepository(CmsGroup::class)->findAll(); // Check the entities are in the database $this->assertEquals(1, sizeof($cmsUsers)); @@ -115,8 +115,8 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testManyToManyMergeAssociationRemoves() { - $this->setCascadeMergeFor('Doctrine\Tests\Models\CMS\CmsUser'); - $this->setCascadeMergeFor('Doctrine\Tests\Models\CMS\CmsGroup'); + $this->setCascadeMergeFor(CmsUser::class); + $this->setCascadeMergeFor(CmsGroup::class); $cmsUser = new CmsUser(); $cmsUser->username = "dave"; @@ -167,8 +167,8 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $cmsUsers = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findAll(); - $cmsGroups = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll(); + $cmsUsers = $this->_em->getRepository(CmsUser::class)->findAll(); + $cmsGroups = $this->_em->getRepository(CmsGroup::class)->findAll(); // Check the entities are in the database $this->assertEquals(1, sizeof($cmsUsers)); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php index f6d7b95b9..4c6464a18 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php @@ -9,8 +9,8 @@ class DDC809Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809Variant'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC809SpecificationValue') + $this->_em->getClassMetadata(DDC809Variant::class), + $this->_em->getClassMetadata(DDC809SpecificationValue::class) ] ); @@ -43,7 +43,7 @@ class DDC809Test extends \Doctrine\Tests\OrmFunctionalTestCase { $result = $this->_em->createQueryBuilder() ->select('Variant, SpecificationValue') - ->from('Doctrine\Tests\ORM\Functional\Ticket\DDC809Variant', 'Variant') + ->from(DDC809Variant::class, 'Variant') ->leftJoin('Variant.SpecificationValues', 'SpecificationValue') ->getQuery() ->getResult(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php index 6e7d4ea2c..9e674e3ca 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php @@ -16,9 +16,9 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedIndex'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832JoinedTreeIndex'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC832Like'), + $this->_em->getClassMetadata(DDC832JoinedIndex::class), + $this->_em->getClassMetadata(DDC832JoinedTreeIndex::class), + $this->_em->getClassMetadata(DDC832Like::class), ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php index 5cb8f925a..4721a6b18 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php @@ -9,11 +9,11 @@ class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Super'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class1'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class2'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Class3'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC837Aggregate'), + $this->_em->getClassMetadata(DDC837Super::class), + $this->_em->getClassMetadata(DDC837Class1::class), + $this->_em->getClassMetadata(DDC837Class2::class), + $this->_em->getClassMetadata(DDC837Class3::class), + $this->_em->getClassMetadata(DDC837Aggregate::class), ] ); } @@ -51,25 +51,25 @@ class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); // Test Class1 - $e1 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC837Super', $c1->id); + $e1 = $this->_em->find(DDC837Super::class, $c1->id); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class1', $e1); + $this->assertInstanceOf(DDC837Class1::class, $e1); $this->assertEquals('Foo', $e1->title); $this->assertEquals('Foo', $e1->description); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC837Aggregate', $e1->aggregate); + $this->assertInstanceOf(DDC837Aggregate::class, $e1->aggregate); $this->assertEquals('test1', $e1->aggregate->getSysname()); // Test Class 2 - $e2 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC837Super', $c2->id); + $e2 = $this->_em->find(DDC837Super::class, $c2->id); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class2', $e2); + $this->assertInstanceOf(DDC837Class2::class, $e2); $this->assertEquals('Bar', $e2->title); $this->assertEquals('Bar', $e2->description); $this->assertEquals('Bar', $e2->text); - $this->assertInstanceOf(__NAMESPACE__ . '\DDC837Aggregate', $e2->aggregate); + $this->assertInstanceOf(DDC837Aggregate::class, $e2->aggregate); $this->assertEquals('test2', $e2->aggregate->getSysname()); - $all = $this->_em->getRepository(__NAMESPACE__.'\DDC837Super')->findAll(); + $all = $this->_em->getRepository(DDC837Super::class)->findAll(); foreach ($all as $obj) { if ($obj instanceof DDC837Class1) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php index bab38f0be..1844b316f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php @@ -36,7 +36,7 @@ class DDC849Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->user->getId()); + $this->user = $this->_em->find(CmsUser::class, $this->user->getId()); } public function testRemoveContains() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php index 5bbeca210..3df61f716 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php @@ -2,6 +2,9 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Proxy\Proxy; + class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase { @@ -12,9 +15,9 @@ class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonenumber'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC881Phonecall'), + $this->_em->getClassMetadata(DDC881User::class), + $this->_em->getClassMetadata(DDC881Phonenumber::class), + $this->_em->getClassMetadata(DDC881Phonecall::class), ] ); } catch (\Exception $e) { @@ -77,18 +80,18 @@ class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); // fetch-join that foreign-key/primary-key entity association - $dql = "SELECT c, p FROM " . __NAMESPACE__ . "\DDC881PhoneCall c JOIN c.phonenumber p"; + $dql = "SELECT c, p FROM " . DDC881PhoneCall::class . " c JOIN c.phonenumber p"; $calls = $this->_em->createQuery($dql)->getResult(); $this->assertEquals(2, count($calls)); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $calls[0]->getPhoneNumber()); - $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $calls[1]->getPhoneNumber()); + $this->assertNotInstanceOf(Proxy::class, $calls[0]->getPhoneNumber()); + $this->assertNotInstanceOf(Proxy::class, $calls[1]->getPhoneNumber()); - $dql = "SELECT p, c FROM " . __NAMESPACE__ . "\DDC881PhoneNumber p JOIN p.calls c"; + $dql = "SELECT p, c FROM " . DDC881PhoneNumber::class . " p JOIN p.calls c"; $numbers = $this->_em->createQuery($dql)->getResult(); $this->assertEquals(2, count($numbers)); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $numbers[0]->getCalls()); + $this->assertInstanceOf(PersistentCollection::class, $numbers[0]->getCalls()); $this->assertTrue($numbers[0]->getCalls()->isInitialized()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php index 7e10c2c2c..8c3162df3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php @@ -29,17 +29,13 @@ class DDC949Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy( - ['booleanField' => true] - ); - $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy( - ['booleanField' => false] - ); + $true = $this->_em->getRepository(BooleanModel::class)->findOneBy(['booleanField' => true]); + $false = $this->_em->getRepository(BooleanModel::class)->findOneBy(['booleanField' => false]); - $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true, "True model not found"); + $this->assertInstanceOf(BooleanModel::class, $true, "True model not found"); $this->assertTrue($true->booleanField, "True Boolean Model should be true."); - $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $false, "False model not found"); + $this->assertInstanceOf(BooleanModel::class, $false, "False model not found"); $this->assertFalse($false->booleanField, "False Boolean Model should be false."); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php index 7f9167601..730a70bce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php @@ -12,8 +12,8 @@ class DDC960Test extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Root'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC960Child') + $this->_em->getClassMetadata(DDC960Root::class), + $this->_em->getClassMetadata(DDC960Child::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php index e8849e10f..77780486b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php @@ -15,9 +15,9 @@ class DDC992Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Role'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Parent'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC992Child'), + $this->_em->getClassMetadata(DDC992Role::class), + $this->_em->getClassMetadata(DDC992Parent::class), + $this->_em->getClassMetadata(DDC992Child::class), ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php index 86a7d641f..ebedf0c86 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php @@ -11,7 +11,7 @@ class Ticket2481Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Ticket2481Product') + $this->_em->getClassMetadata(Ticket2481Product::class) ] ); } catch (\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php index d04ac2730..ccc8bce12 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php @@ -2,8 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\ORM\Query; - /** * Functional tests for the Single Table Inheritance mapping strategy. * @@ -16,9 +14,9 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase { try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Lemma'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\Relation'), - $this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Ticket\RelationType') + $this->_em->getClassMetadata(Lemma::class), + $this->_em->getClassMetadata(Relation::class), + $this->_em->getClassMetadata(RelationType::class) ] ); } catch (\Exception $e) { @@ -85,11 +83,11 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase { $lemma = $res[0]; $this->assertEquals('foo', $lemma->getLemma()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\Lemma', $lemma); + $this->assertInstanceOf(Lemma::class, $lemma); $relations = $lemma->getRelations(); foreach($relations as $relation) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\Relation', $relation); + $this->assertInstanceOf(Relation::class, $relation); $this->assertTrue($relation->getType()->getType() != ''); } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index a8afcf8ca..052002014 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -2,13 +2,12 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\ORM\Mapping\AssociationMapping; use Doctrine\Tests\Models\Generic\BooleanModel; use Doctrine\Tests\Models\Generic\DateTimeModel; use Doctrine\Tests\Models\Generic\DecimalModel; use Doctrine\Tests\Models\Generic\SerializationModel; - -use Doctrine\ORM\Mapping\AssociationMapping; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\OrmFunctionalTestCase; class TypeTest extends OrmFunctionalTestCase @@ -105,7 +104,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dateTimeDb = $this->_em->find('Doctrine\Tests\Models\Generic\DateTimeModel', $dateTime->id); + $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf('DateTime', $dateTimeDb->date); $this->assertEquals('2009-10-01', $dateTimeDb->date->format('Y-m-d')); @@ -120,12 +119,12 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dateTimeDb = $this->_em->find('Doctrine\Tests\Models\Generic\DateTimeModel', $dateTime->id); + $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf('DateTime', $dateTimeDb->datetime); $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); - $articles = $this->_em->getRepository( 'Doctrine\Tests\Models\Generic\DateTimeModel' )->findBy( ['datetime' => new \DateTime( "now" )] + $articles = $this->_em->getRepository( DateTimeModel::class )->findBy( ['datetime' => new \DateTime( "now" )] ); $this->assertEquals( 0, count( $articles ) ); } @@ -159,7 +158,7 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->createQueryBuilder() ->select('d') - ->from('Doctrine\Tests\Models\Generic\DateTimeModel', 'd') + ->from(DateTimeModel::class, 'd') ->where('d.datetime = ?1') ->setParameter(1, $date, DBALType::DATETIME) ->getQuery()->getSingleResult(); @@ -174,7 +173,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dateTimeDb = $this->_em->find('Doctrine\Tests\Models\Generic\DateTimeModel', $dateTime->id); + $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf('DateTime', $dateTime->time); $this->assertEquals('19:27:20', $dateTime->time->format('H:i:s')); diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php index 8e305d1f1..971af9170 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php @@ -2,10 +2,10 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\CustomType\CustomTypeChild; 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 OrmFunctionalTestCase @@ -51,7 +51,7 @@ class TypeValueSqlTest extends OrmFunctionalTestCase */ public function testUpperCaseStringTypeWhenColumnNameIsDefined() { - + $entity = new CustomTypeUpperCase(); $entity->lowerCaseString = 'Some Value'; $entity->namedLowerCaseString = 'foo'; @@ -104,7 +104,7 @@ class TypeValueSqlTest extends OrmFunctionalTestCase $this->_em->clear(); - $entity = $this->_em->find('Doctrine\Tests\Models\CustomType\CustomTypeParent', $parentId); + $entity = $this->_em->find(CustomTypeParent::class, $parentId); $this->assertTrue($entity->customInteger < 0, 'Fetched customInteger negative'); $this->assertEquals(1, $this->_em->getConnection()->fetchColumn("select customInteger from customtype_parents where id=".$entity->id.""), 'Database has stored customInteger positive'); @@ -131,7 +131,7 @@ class TypeValueSqlTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CustomType\CustomTypeParent', $result[0][0]); + $this->assertInstanceOf(CustomTypeParent::class, $result[0][0]); $this->assertEquals(-1, $result[0][0]->customInteger); $this->assertEquals(-1, $result[0]['customInteger']); diff --git a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php index c722771da..ff352ba1f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php @@ -17,7 +17,7 @@ class UUIDGeneratorTest extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\\UUIDEntity') + $this->_em->getClassMetadata(UUIDEntity::class) ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php index 1094da877..108ba7437 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -75,23 +76,23 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', $auxiliary); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\AuxiliaryEntity::class, $auxiliary); + $this->assertInstanceOf(Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity::class, $owning); } /** @@ -100,17 +101,17 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -126,16 +127,16 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatInversedEntityIsFetchedFromTheDatabaseUsingAuxiliaryEntityAsId() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => $auxiliary] ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', $inversed); + $this->assertInstanceOf(Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, $inversed); } /** @@ -144,7 +145,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -157,7 +158,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); @@ -175,7 +176,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase // remove association $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php index c7470a198..4403f2bf9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -67,17 +68,17 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToManyCompositeIdEntity::class, $owning); } /** @@ -86,12 +87,12 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdEntity::class, 'ghi' ); @@ -106,7 +107,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheCollectionFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity', + Models\ValueConversionType\OwningManyToManyCompositeIdEntity::class, 'ghi' ); @@ -119,7 +120,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); @@ -137,7 +138,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase // remove association $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', + Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php index a8ea389c9..af1d99de3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -64,7 +65,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromOwningToInversedIsCounted() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class, 'ghi' ); @@ -74,7 +75,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromInversedToOwningIsCounted() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, 'abc' ); @@ -84,12 +85,12 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromOwningToInversedContainsAnEntity() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class, 'ghi' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, 'abc' ); @@ -99,12 +100,12 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromInversedToOwningContainsAnEntity() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class, 'ghi' ); @@ -114,7 +115,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromOwningToInversedContainsAnIndexByKey() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class, 'ghi' ); @@ -124,7 +125,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatTheExtraLazyCollectionFromInversedToOwningContainsAnIndexByKey() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, 'abc' ); @@ -134,7 +135,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatASliceOfTheExtraLazyCollectionFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class, 'ghi' ); @@ -144,7 +145,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatASliceOfTheExtraLazyCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, 'abc' ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php index 2c51d6cd2..4532ee9d5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -64,17 +65,17 @@ class ManyToManyTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', + Models\ValueConversionType\InversedManyToManyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity', + Models\ValueConversionType\OwningManyToManyEntity::class, 'def' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedManyToManyEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToManyEntity::class, $owning); } /** @@ -83,12 +84,12 @@ class ManyToManyTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', + Models\ValueConversionType\InversedManyToManyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity', + Models\ValueConversionType\OwningManyToManyEntity::class, 'def' ); @@ -102,7 +103,7 @@ class ManyToManyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity', + Models\ValueConversionType\OwningManyToManyEntity::class, 'def' ); @@ -115,7 +116,7 @@ class ManyToManyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', + Models\ValueConversionType\InversedManyToManyEntity::class, 'abc' ); @@ -133,7 +134,7 @@ class ManyToManyTest extends OrmFunctionalTestCase // remove association $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', + Models\ValueConversionType\InversedManyToManyEntity::class, 'abc' ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php index eb3de5f12..b76687bc4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -73,23 +74,23 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', $auxiliary); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\AuxiliaryEntity::class, $auxiliary); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity::class, $owning); } /** @@ -98,17 +99,17 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -124,16 +125,16 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatInversedEntityIsFetchedFromTheDatabaseUsingAuxiliaryEntityAsId() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => $auxiliary] ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', $inversed); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, $inversed); } /** @@ -142,7 +143,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -159,7 +160,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php index f68084eb5..266a382e7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -65,17 +66,17 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToManyCompositeIdEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToOneCompositeIdEntity::class, $owning); } /** @@ -84,12 +85,12 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdEntity::class, 'ghi' ); @@ -104,7 +105,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity', + Models\ValueConversionType\OwningManyToOneCompositeIdEntity::class, 'ghi' ); @@ -119,7 +120,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', + Models\ValueConversionType\InversedOneToManyCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php index 75b5403fe..9da341467 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -61,7 +62,7 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatExtraLazyCollectionIsCounted() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', + Models\ValueConversionType\InversedOneToManyExtraLazyEntity::class, 'abc' ); @@ -71,12 +72,12 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatExtraLazyCollectionContainsAnEntity() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', + Models\ValueConversionType\InversedOneToManyExtraLazyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity', + Models\ValueConversionType\OwningManyToOneExtraLazyEntity::class, 'def' ); @@ -86,7 +87,7 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatExtraLazyCollectionContainsAnIndexbyKey() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', + Models\ValueConversionType\InversedOneToManyExtraLazyEntity::class, 'abc' ); @@ -96,7 +97,7 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase public function testThatASliceOfTheExtraLazyCollectionIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', + Models\ValueConversionType\InversedOneToManyExtraLazyEntity::class, 'abc' ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php index 137a5eaa9..6a10296a7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -62,17 +63,17 @@ class OneToManyTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', + Models\ValueConversionType\InversedOneToManyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity', + Models\ValueConversionType\OwningManyToOneEntity::class, 'def' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToManyEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningManyToOneEntity::class, $owning); } /** @@ -81,12 +82,12 @@ class OneToManyTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', + Models\ValueConversionType\InversedOneToManyEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity', + Models\ValueConversionType\OwningManyToOneEntity::class, 'def' ); @@ -100,7 +101,7 @@ class OneToManyTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity', + Models\ValueConversionType\OwningManyToOneEntity::class, 'def' ); @@ -115,7 +116,7 @@ class OneToManyTest extends OrmFunctionalTestCase public function testThatTheCollectionFromInversedToOwningIsLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', + Models\ValueConversionType\InversedOneToManyEntity::class, 'abc' ); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php index e527ee2ef..206ca7e32 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -72,23 +73,23 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', $auxiliary); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\AuxiliaryEntity::class, $auxiliary); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class, $owning); } /** @@ -97,17 +98,17 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -123,16 +124,16 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatInversedEntityIsFetchedFromTheDatabaseUsingAuxiliaryEntityAsId() { $auxiliary = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + Models\ValueConversionType\AuxiliaryEntity::class, 'abc' ); $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => $auxiliary] ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', $inversed); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, $inversed); } /** @@ -141,7 +142,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class, 'ghi' ); @@ -156,10 +157,10 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase public function testThatTheEntityFromInversedToOwningIsEagerLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, ['id1' => 'def', 'foreignEntity' => 'abc'] ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', $inversed->associatedEntity); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class, $inversed->associatedEntity); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php index 2f944f235..428fe80c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -64,17 +65,17 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class, 'ghi' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToOneCompositeIdEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class, $owning); } /** @@ -83,12 +84,12 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class, 'ghi' ); @@ -103,7 +104,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', + Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class, 'ghi' ); @@ -118,10 +119,10 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase public function testThatTheEntityFromInversedToOwningIsEagerLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', + Models\ValueConversionType\InversedOneToOneCompositeIdEntity::class, ['id1' => 'abc', 'id2' => 'def'] ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $inversed->associatedEntity); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class, $inversed->associatedEntity); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php index 0de217e36..8ca8eebe5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; +use Doctrine\Tests\Models; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -62,17 +63,17 @@ class OneToOneTest extends OrmFunctionalTestCase public function testThatEntitiesAreFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', + Models\ValueConversionType\InversedOneToOneEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', + Models\ValueConversionType\OwningOneToOneEntity::class, 'def' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', $inversed); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', $owning); + $this->assertInstanceOf(Models\ValueConversionType\InversedOneToOneEntity::class, $inversed); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneEntity::class, $owning); } /** @@ -81,12 +82,12 @@ class OneToOneTest extends OrmFunctionalTestCase public function testThatTheValueOfIdentifiersAreConvertedBackAfterBeingFetchedFromTheDatabase() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', + Models\ValueConversionType\InversedOneToOneEntity::class, 'abc' ); $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', + Models\ValueConversionType\OwningOneToOneEntity::class, 'def' ); @@ -100,7 +101,7 @@ class OneToOneTest extends OrmFunctionalTestCase public function testThatTheProxyFromOwningToInversedIsLoaded() { $owning = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', + Models\ValueConversionType\OwningOneToOneEntity::class, 'def' ); @@ -115,10 +116,10 @@ class OneToOneTest extends OrmFunctionalTestCase public function testThatTheEntityFromInversedToOwningIsEagerLoaded() { $inversed = $this->_em->find( - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', + Models\ValueConversionType\InversedOneToOneEntity::class, 'abc' ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', $inversed->associatedEntity); + $this->assertInstanceOf(Models\ValueConversionType\OwningOneToOneEntity::class, $inversed->associatedEntity); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php index 02b4748be..7df4171b4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php @@ -1,7 +1,9 @@ _schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Person'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Address'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Vehicle'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'), + $this->_em->getClassMetadata(DDC93Person::class), + $this->_em->getClassMetadata(DDC93Address::class), + $this->_em->getClassMetadata(DDC93Vehicle::class), + $this->_em->getClassMetadata(DDC93Car::class), + $this->_em->getClassMetadata(DDC3027Animal::class), + $this->_em->getClassMetadata(DDC3027Dog::class), ] ); } catch(\Exception $e) { @@ -31,10 +33,10 @@ class ValueObjectsTest extends OrmFunctionalTestCase public function testMetadataHasReflectionEmbeddablesAccessible() { - $classMetadata = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Person'); + $classMetadata = $this->_em->getClassMetadata(DDC93Person::class); - $this->assertInstanceOf('Doctrine\Common\Reflection\RuntimePublicReflectionProperty', $classMetadata->getReflectionProperty('address')); - $this->assertInstanceOf('Doctrine\ORM\Mapping\ReflectionEmbeddedProperty', $classMetadata->getReflectionProperty('address.street')); + $this->assertInstanceOf(RuntimePublicReflectionProperty::class, $classMetadata->getReflectionProperty('address')); + $this->assertInstanceOf(ReflectionEmbeddedProperty::class, $classMetadata->getReflectionProperty('address.street')); } public function testCRUD() @@ -54,13 +56,13 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->clear(); // 2. check loading value objects works - $person = $this->_em->find(DDC93Person::CLASSNAME, $person->id); + $person = $this->_em->find(DDC93Person::class, $person->id); - $this->assertInstanceOf(DDC93Address::CLASSNAME, $person->address); + $this->assertInstanceOf(DDC93Address::class, $person->address); $this->assertEquals('United States of Tara Street', $person->address->street); $this->assertEquals('12345', $person->address->zip); $this->assertEquals('funkytown', $person->address->city); - $this->assertInstanceOf(DDC93Country::CLASSNAME, $person->address->country); + $this->assertInstanceOf(DDC93Country::class, $person->address->country); $this->assertEquals('Germany', $person->address->country->name); // 3. check changing value objects works @@ -72,7 +74,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->clear(); - $person = $this->_em->find(DDC93Person::CLASSNAME, $person->id); + $person = $this->_em->find(DDC93Person::class, $person->id); $this->assertEquals('Street', $person->address->street); $this->assertEquals('54321', $person->address->zip); @@ -84,7 +86,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->remove($person); $this->_em->flush(); - $this->assertNull($this->_em->find(DDC93Person::CLASSNAME, $personId)); + $this->assertNull($this->_em->find(DDC93Person::class, $personId)); } public function testLoadDql() @@ -109,11 +111,11 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->assertCount(3, $persons); foreach ($persons as $person) { - $this->assertInstanceOf(DDC93Address::CLASSNAME, $person->address); + $this->assertInstanceOf(DDC93Address::class, $person->address); $this->assertEquals('Tree', $person->address->street); $this->assertEquals('12345', $person->address->zip); $this->assertEquals('funkytown', $person->address->city); - $this->assertInstanceOf(DDC93Country::CLASSNAME, $person->address->country); + $this->assertInstanceOf(DDC93Country::class, $person->address->country); $this->assertEquals('United States of America', $person->address->country->name); } @@ -175,7 +177,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase ->execute(); $this->_em->clear(); - $this->assertNull($this->_em->find(__NAMESPACE__.'\\DDC93Person', $person->id)); + $this->assertNull($this->_em->find(DDC93Person::class, $person->id)); } public function testPartialDqlOnEmbeddedObjectsField() @@ -254,13 +256,13 @@ class ValueObjectsTest extends OrmFunctionalTestCase $this->_em->persist($car); $this->_em->flush($car); - $reloadedCar = $this->_em->find(__NAMESPACE__.'\\DDC93Car', $car->id); + $reloadedCar = $this->_em->find(DDC93Car::class, $car->id); $this->assertEquals($car, $reloadedCar); } public function testInlineEmbeddableWithPrefix() { - $metadata = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3028PersonWithPrefix'); + $metadata = $this->_em->getClassMetadata(DDC3028PersonWithPrefix::class); $this->assertEquals('foobar_id', $metadata->getColumnName('id.id')); $this->assertEquals('bloo_foo_id', $metadata->getColumnName('nested.nestedWithPrefix.id')); @@ -270,7 +272,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase public function testInlineEmbeddableEmptyPrefix() { - $metadata = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3028PersonEmptyPrefix'); + $metadata = $this->_em->getClassMetadata(DDC3028PersonEmptyPrefix::class); $this->assertEquals('id_id', $metadata->getColumnName('id.id')); $this->assertEquals('nested_foo_id', $metadata->getColumnName('nested.nestedWithPrefix.id')); @@ -283,7 +285,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase $expectedColumnName = 'id'; $actualColumnName = $this->_em - ->getClassMetadata(__NAMESPACE__ . '\DDC3028PersonPrefixFalse') + ->getClassMetadata(DDC3028PersonPrefixFalse::class) ->getColumnName('id.id'); $this->assertEquals($expectedColumnName, $actualColumnName); @@ -292,7 +294,7 @@ class ValueObjectsTest extends OrmFunctionalTestCase public function testInlineEmbeddableInMappedSuperClass() { $isFieldMapped = $this->_em - ->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog') + ->getClassMetadata(DDC3027Dog::class) ->hasField('address.street'); $this->assertTrue($isFieldMapped); diff --git a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php index 0fef61a48..f8062f995 100644 --- a/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php @@ -23,8 +23,8 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity') + $this->_em->getClassMetadata(FirstRelatedEntity::class), + $this->_em->getClassMetadata(SecondRelatedEntity::class) ] ); } catch (ORMException $e) { @@ -50,10 +50,10 @@ class VersionedOneToOneTest extends OrmFunctionalTestCase $this->_em->persist($firstRelatedEntity); $this->_em->flush(); - $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity') + $firstEntity = $this->_em->getRepository(FirstRelatedEntity::class) ->findOneBy(['name' => 'Fred']); - $secondEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity') + $secondEntity = $this->_em->getRepository(SecondRelatedEntity::class) ->findOneBy(['name' => 'Bob']); $this->assertSame($firstRelatedEntity, $firstEntity); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php index 4763ded58..6c0b30ef6 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php @@ -2,8 +2,14 @@ namespace Doctrine\Tests\ORM\Hydration; -use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Mocks\HydratorMockStatement; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsComment; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Forum\ForumBoard; +use Doctrine\Tests\Models\Forum\ForumCategory; class ArrayHydratorTest extends HydrationTestCase { @@ -25,7 +31,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -66,7 +72,7 @@ class ArrayHydratorTest extends HydrationTestCase $alias = $userEntityKey ?: 'u'; $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', $alias); + $rsm->addEntityResult(CmsUser::class, $alias); $rsm->addFieldResult($alias, 's__id', 'id'); $rsm->addFieldResult($alias, 's__name', 'name'); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); @@ -117,7 +123,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -157,8 +163,8 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a'); + $rsm->addEntityResult(CmsUser::class, 'u'); + $rsm->addEntityResult(CmsArticle::class, 'a'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -207,8 +213,8 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); + $rsm->addEntityResult(CmsArticle::class, 'a'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -261,8 +267,8 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a', 'article'); + $rsm->addEntityResult(CmsUser::class, 'u'); + $rsm->addEntityResult(CmsArticle::class, 'a', 'article'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -315,8 +321,8 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a', 'article'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); + $rsm->addEntityResult(CmsArticle::class, 'a', 'article'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -373,7 +379,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'numPhones', 'integer'); @@ -422,9 +428,9 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -493,9 +499,9 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -572,15 +578,15 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' @@ -691,21 +697,21 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsComment', + CmsComment::class, 'c', 'a', 'comments' @@ -848,9 +854,9 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Forum\ForumCategory', 'c'); + $rsm->addEntityResult(ForumCategory::class, 'c'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\Forum\ForumBoard', + ForumBoard::class, 'b', 'c', 'boards' @@ -924,7 +930,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $entityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $entityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('a__id', 'id', 'integer'); @@ -994,7 +1000,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -1039,7 +1045,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -1087,7 +1093,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -1121,7 +1127,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); @@ -1180,7 +1186,7 @@ class ArrayHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); diff --git a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php index 1135e988d..7342b942f 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php @@ -2,7 +2,8 @@ namespace Doctrine\Tests\ORM\Hydration; -use PDO, Doctrine\ORM\Internal\Hydration\AbstractHydrator; +use Doctrine\ORM\Internal\Hydration\AbstractHydrator; +use PDO; class CustomHydratorTest extends HydrationTestCase { @@ -10,10 +11,10 @@ class CustomHydratorTest extends HydrationTestCase { $em = $this->_getTestEntityManager(); $config = $em->getConfiguration(); - $config->addCustomHydrationMode('CustomHydrator', 'Doctrine\Tests\ORM\Hydration\CustomHydrator'); + $config->addCustomHydrationMode('CustomHydrator', CustomHydrator::class); $hydrator = $em->newHydrator('CustomHydrator'); - $this->assertInstanceOf('Doctrine\Tests\ORM\Hydration\CustomHydrator', $hydrator); + $this->assertInstanceOf(CustomHydrator::class, $hydrator); $this->assertNull($config->getCustomHydrationMode('does not exist')); } } diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index 7a4c8aaed..83e398836 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -2,11 +2,25 @@ namespace Doctrine\Tests\ORM\Hydration; -use Doctrine\ORM\Proxy\ProxyFactory; -use Doctrine\Tests\Mocks\HydratorMockStatement; -use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\Proxy\ProxyFactory; use Doctrine\ORM\Query; +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Mocks\HydratorMockStatement; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsComment; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Company\CompanyEmployee; +use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\ECommerce\ECommerceProduct; +use Doctrine\Tests\Models\ECommerce\ECommerceShipping; +use Doctrine\Tests\Models\Forum\ForumBoard; +use Doctrine\Tests\Models\Forum\ForumCategory; use Doctrine\Tests\Models\Hydration\EntityWithArrayDefaultArrayValueM2M; use Doctrine\Tests\Models\Hydration\SimpleEntity; @@ -45,7 +59,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleEntityQuery() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -67,8 +81,8 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); + $this->assertInstanceOf(CmsUser::class, $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[1]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); @@ -84,7 +98,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleEntityQueryWithAliasedUserEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -107,10 +121,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); $this->assertArrayHasKey('user', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['user']); + $this->assertInstanceOf(CmsUser::class, $result[0]['user']); $this->assertArrayHasKey('user', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]['user']); + $this->assertInstanceOf(CmsUser::class, $result[1]['user']); $this->assertEquals(1, $result[0]['user']->id); $this->assertEquals('romanb', $result[0]['user']->name); @@ -126,8 +140,8 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleMultipleRootEntityQuery() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a'); + $rsm->addEntityResult(CmsUser::class, 'u'); + $rsm->addEntityResult(CmsArticle::class, 'a'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -155,10 +169,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(4, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3]); + $this->assertInstanceOf(CmsUser::class, $result[0]); + $this->assertInstanceOf(CmsArticle::class, $result[1]); + $this->assertInstanceOf(CmsUser::class, $result[2]); + $this->assertInstanceOf(CmsArticle::class, $result[3]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); @@ -180,8 +194,8 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleMultipleRootEntityQueryWithAliasedUserEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); + $rsm->addEntityResult(CmsArticle::class, 'a'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -211,25 +225,25 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertArrayHasKey('user', $result[0]); $this->assertArrayNotHasKey(0, $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['user']); + $this->assertInstanceOf(CmsUser::class, $result[0]['user']); $this->assertEquals(1, $result[0]['user']->id); $this->assertEquals('romanb', $result[0]['user']->name); $this->assertArrayHasKey(0, $result[1]); $this->assertArrayNotHasKey('user', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]); + $this->assertInstanceOf(CmsArticle::class, $result[1][0]); $this->assertEquals(1, $result[1][0]->id); $this->assertEquals('Cool things.', $result[1][0]->topic); $this->assertArrayHasKey('user', $result[2]); $this->assertArrayNotHasKey(0, $result[2]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2]['user']); + $this->assertInstanceOf(CmsUser::class, $result[2]['user']); $this->assertEquals(2, $result[2]['user']->id); $this->assertEquals('jwage', $result[2]['user']->name); $this->assertArrayHasKey(0, $result[3]); $this->assertArrayNotHasKey('user', $result[3]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3][0]); + $this->assertInstanceOf(CmsArticle::class, $result[3][0]); $this->assertEquals(2, $result[3][0]->id); $this->assertEquals('Cool things II.', $result[3][0]->topic); } @@ -241,8 +255,8 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleMultipleRootEntityQueryWithAliasedArticleEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a', 'article'); + $rsm->addEntityResult(CmsUser::class, 'u'); + $rsm->addEntityResult(CmsArticle::class, 'a', 'article'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -272,25 +286,25 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertArrayHasKey(0, $result[0]); $this->assertArrayNotHasKey('article', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf(CmsUser::class, $result[0][0]); $this->assertEquals(1, $result[0][0]->id); $this->assertEquals('romanb', $result[0][0]->name); $this->assertArrayHasKey('article', $result[1]); $this->assertArrayNotHasKey(0, $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1]['article']); + $this->assertInstanceOf(CmsArticle::class, $result[1]['article']); $this->assertEquals(1, $result[1]['article']->id); $this->assertEquals('Cool things.', $result[1]['article']->topic); $this->assertArrayHasKey(0, $result[2]); $this->assertArrayNotHasKey('article', $result[2]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][0]); + $this->assertInstanceOf(CmsUser::class, $result[2][0]); $this->assertEquals(2, $result[2][0]->id); $this->assertEquals('jwage', $result[2][0]->name); $this->assertArrayHasKey('article', $result[3]); $this->assertArrayNotHasKey(0, $result[3]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3]['article']); + $this->assertInstanceOf(CmsArticle::class, $result[3]['article']); $this->assertEquals(2, $result[3]['article']->id); $this->assertEquals('Cool things II.', $result[3]['article']->topic); } @@ -302,8 +316,8 @@ class ObjectHydratorTest extends HydrationTestCase public function testSimpleMultipleRootEntityQueryWithAliasedEntities() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsArticle', 'a', 'article'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); + $rsm->addEntityResult(CmsArticle::class, 'a', 'article'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addFieldResult('a', 'a__id', 'id'); @@ -333,25 +347,25 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertArrayHasKey('user', $result[0]); $this->assertArrayNotHasKey('article', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['user']); + $this->assertInstanceOf(CmsUser::class, $result[0]['user']); $this->assertEquals(1, $result[0]['user']->id); $this->assertEquals('romanb', $result[0]['user']->name); $this->assertArrayHasKey('article', $result[1]); $this->assertArrayNotHasKey('user', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1]['article']); + $this->assertInstanceOf(CmsArticle::class, $result[1]['article']); $this->assertEquals(1, $result[1]['article']->id); $this->assertEquals('Cool things.', $result[1]['article']->topic); $this->assertArrayHasKey('user', $result[2]); $this->assertArrayNotHasKey('article', $result[2]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2]['user']); + $this->assertInstanceOf(CmsUser::class, $result[2]['user']); $this->assertEquals(2, $result[2]['user']->id); $this->assertEquals('jwage', $result[2]['user']->name); $this->assertArrayHasKey('article', $result[3]); $this->assertArrayNotHasKey('user', $result[3]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3]['article']); + $this->assertInstanceOf(CmsArticle::class, $result[3]['article']); $this->assertEquals(2, $result[3]['article']->id); $this->assertEquals('Cool things II.', $result[3]['article']->topic); } @@ -367,7 +381,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testMixedQueryNormalJoin($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'numPhones', 'integer'); @@ -399,11 +413,11 @@ class ObjectHydratorTest extends HydrationTestCase // first user => 2 phonenumbers $this->assertEquals(2, $result[0]['numPhones']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[0][$userEntityKey]); // second user => 1 phonenumber $this->assertEquals(1, $result[1]['numPhones']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[1][$userEntityKey]); } /** @@ -416,9 +430,9 @@ class ObjectHydratorTest extends HydrationTestCase public function testMixedQueryFetchJoin($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -461,13 +475,13 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertInternalType('array', $result[0]); $this->assertInternalType('array', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[0]); + $this->assertInstanceOf(CmsUser::class, $result[0][$userEntityKey]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][$userEntityKey]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[1]); + $this->assertInstanceOf(CmsUser::class, $result[1][$userEntityKey]); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[1]); // first user => 2 phonenumbers $this->assertEquals(2, count($result[0][$userEntityKey]->phonenumbers)); @@ -494,9 +508,9 @@ class ObjectHydratorTest extends HydrationTestCase public function testMixedQueryFetchJoinCustomIndex($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -546,9 +560,9 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals('ROMANB', $result[1]['nameUpper']); $this->assertEquals('JWAGE', $result[2]['nameUpper']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][$userEntityKey]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][$userEntityKey]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsUser::class, $result[1][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[2][$userEntityKey]); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->phonenumbers); // first user => 2 phonenumbers. notice the custom indexing by user id $this->assertEquals(2, count($result[1][$userEntityKey]->phonenumbers)); @@ -573,15 +587,15 @@ class ObjectHydratorTest extends HydrationTestCase public function testMixedQueryMultipleFetchJoin($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' @@ -656,19 +670,19 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[1]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->articles); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][$userEntityKey]->articles[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][$userEntityKey]->articles[1]); + $this->assertInstanceOf(CmsUser::class, $result[0][$userEntityKey]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[0]); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[1]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->articles); + $this->assertInstanceOf(CmsArticle::class, $result[0][$userEntityKey]->articles[0]); + $this->assertInstanceOf(CmsArticle::class, $result[0][$userEntityKey]->articles[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][$userEntityKey]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][$userEntityKey]->phonenumbers[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][$userEntityKey]->articles[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][$userEntityKey]->articles[1]); + $this->assertInstanceOf(CmsUser::class, $result[1][$userEntityKey]); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[1][$userEntityKey]->phonenumbers[0]); + $this->assertInstanceOf(CmsArticle::class, $result[1][$userEntityKey]->articles[0]); + $this->assertInstanceOf(CmsArticle::class, $result[1][$userEntityKey]->articles[1]); } /** @@ -683,21 +697,21 @@ class ObjectHydratorTest extends HydrationTestCase public function testMixedQueryMultipleDeepMixedFetchJoin($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsComment', + CmsComment::class, 'c', 'a', 'comments' @@ -786,36 +800,36 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[0][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[1][$userEntityKey]); // phonenumbers - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][$userEntityKey]->phonenumbers[1]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[0]); + $this->assertInstanceOf(CmsPhonenumber::class, $result[0][$userEntityKey]->phonenumbers[1]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->phonenumbers); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][$userEntityKey]->phonenumbers[0]); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->phonenumbers); + $this->assertInstanceOf(CmsPhonenumber::class, $result[1][$userEntityKey]->phonenumbers[0]); // articles - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->articles); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][$userEntityKey]->articles[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][$userEntityKey]->articles[1]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->articles); + $this->assertInstanceOf(CmsArticle::class, $result[0][$userEntityKey]->articles[0]); + $this->assertInstanceOf(CmsArticle::class, $result[0][$userEntityKey]->articles[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][$userEntityKey]->articles[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][$userEntityKey]->articles[1]); + $this->assertInstanceOf(CmsArticle::class, $result[1][$userEntityKey]->articles[0]); + $this->assertInstanceOf(CmsArticle::class, $result[1][$userEntityKey]->articles[1]); // article comments - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->articles[0]->comments); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsComment', $result[0][$userEntityKey]->articles[0]->comments[0]); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->articles[0]->comments); + $this->assertInstanceOf(CmsComment::class, $result[0][$userEntityKey]->articles[0]->comments[0]); // empty comment collections - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][$userEntityKey]->articles[1]->comments); + $this->assertInstanceOf(PersistentCollection::class, $result[0][$userEntityKey]->articles[1]->comments); $this->assertEquals(0, count($result[0][$userEntityKey]->articles[1]->comments)); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->articles[0]->comments); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->articles[0]->comments); $this->assertEquals(0, count($result[1][$userEntityKey]->articles[0]->comments)); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][$userEntityKey]->articles[1]->comments); + $this->assertInstanceOf(PersistentCollection::class, $result[1][$userEntityKey]->articles[1]->comments); $this->assertEquals(0, count($result[1][$userEntityKey]->articles[1]->comments)); } @@ -840,9 +854,9 @@ class ObjectHydratorTest extends HydrationTestCase public function testEntityQueryCustomResultSetOrder() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Forum\ForumCategory', 'c'); + $rsm->addEntityResult(ForumCategory::class, 'c'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\Forum\ForumBoard', + ForumBoard::class, 'b', 'c', 'boards' @@ -895,8 +909,8 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[1]); + $this->assertInstanceOf(ForumCategory::class, $result[0]); + $this->assertInstanceOf(ForumCategory::class, $result[1]); $this->assertTrue($result[0] !== $result[1]); @@ -919,7 +933,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testSkipUnknownColumns() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -937,7 +951,7 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[0]); } /** @@ -949,7 +963,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testScalarQueryWithoutResultVariables($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addScalarResult('sclr0', 'id', 'integer'); $rsm->addScalarResult('sclr1', 'name', 'string'); @@ -988,7 +1002,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testCreatesProxyForLazyLoadingWithForeignKeys() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\ECommerce\ECommerceProduct', 'p'); + $rsm->addEntityResult(ECommerceProduct::class, 'p'); $rsm->addFieldResult('p', 'p__id', 'id'); $rsm->addFieldResult('p', 'p__name', 'name'); $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer'); @@ -1012,13 +1026,13 @@ class ObjectHydratorTest extends HydrationTestCase $proxyFactory->expects($this->once()) ->method('getProxy') - ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42]) + ->with($this->equalTo(ECommerceShipping::class), ['id' => 42]) ->will($this->returnValue($proxyInstance)); $this->_em->setProxyFactory($proxyFactory); // configuring lazy loading - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $metadata = $this->_em->getClassMetadata(ECommerceProduct::class); $metadata->associationMappings['shipping']['fetch'] = ClassMetadata::FETCH_LAZY; $stmt = new HydratorMockStatement($resultSet); @@ -1027,7 +1041,7 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(1, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $result[0]); + $this->assertInstanceOf(ECommerceProduct::class, $result[0]); } /** @@ -1037,7 +1051,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testCreatesProxyForLazyLoadingWithForeignKeysWithAliasedProductEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\ECommerce\ECommerceProduct', 'p', 'product'); + $rsm->addEntityResult(ECommerceProduct::class, 'p', 'product'); $rsm->addFieldResult('p', 'p__id', 'id'); $rsm->addFieldResult('p', 'p__name', 'name'); $rsm->addMetaResult('p', 'p__shipping_id', 'shipping_id', false, 'integer'); @@ -1061,13 +1075,13 @@ class ObjectHydratorTest extends HydrationTestCase $proxyFactory->expects($this->once()) ->method('getProxy') - ->with($this->equalTo('Doctrine\Tests\Models\ECommerce\ECommerceShipping'), ['id' => 42]) + ->with($this->equalTo(ECommerceShipping::class), ['id' => 42]) ->will($this->returnValue($proxyInstance)); $this->_em->setProxyFactory($proxyFactory); // configuring lazy loading - $metadata = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $metadata = $this->_em->getClassMetadata(ECommerceProduct::class); $metadata->associationMappings['shipping']['fetch'] = ClassMetadata::FETCH_LAZY; $stmt = new HydratorMockStatement($resultSet); @@ -1077,7 +1091,7 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(1, count($result)); $this->assertInternalType('array', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $result[0]['product']); + $this->assertInstanceOf(ECommerceProduct::class, $result[0]['product']); } /** @@ -1089,15 +1103,15 @@ class ObjectHydratorTest extends HydrationTestCase public function testChainedJoinWithEmptyCollections() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsComment', + CmsComment::class, 'c', 'a', 'comments' @@ -1136,8 +1150,8 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); + $this->assertInstanceOf(CmsUser::class, $result[0]); + $this->assertInstanceOf(CmsUser::class, $result[1]); $this->assertEquals(0, $result[0]->articles->count()); $this->assertEquals(0, $result[1]->articles->count()); @@ -1152,15 +1166,15 @@ class ObjectHydratorTest extends HydrationTestCase public function testChainedJoinWithEmptyCollectionsWithAliasedUserEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsArticle', + CmsArticle::class, 'a', 'u', 'articles' ); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsComment', + CmsComment::class, 'c', 'a', 'comments' @@ -1200,10 +1214,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); $this->assertInternalType('array', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['user']); + $this->assertInstanceOf(CmsUser::class, $result[0]['user']); $this->assertInternalType('array', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]['user']); + $this->assertInstanceOf(CmsUser::class, $result[1]['user']); $this->assertEquals(0, $result[0]['user']->articles->count()); $this->assertEquals(0, $result[1]['user']->articles->count()); @@ -1280,7 +1294,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testResultIteration() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -1303,7 +1317,7 @@ class ObjectHydratorTest extends HydrationTestCase while (($row = $iterableResult->next()) !== false) { $this->assertEquals(1, count($row)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $row[0]); + $this->assertInstanceOf(CmsUser::class, $row[0]); if ($rowNum == 0) { $this->assertEquals(1, $row[0]->id); @@ -1324,7 +1338,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testResultIterationWithAliasedUserEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -1349,7 +1363,7 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(1, count($row)); $this->assertArrayHasKey(0, $row); $this->assertArrayHasKey('user', $row[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $row[0]['user']); + $this->assertInstanceOf(CmsUser::class, $row[0]['user']); if ($rowNum == 0) { $this->assertEquals(1, $row[0]['user']->id); @@ -1374,13 +1388,13 @@ class ObjectHydratorTest extends HydrationTestCase public function testManyToManyHydration() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsGroup', 'g', 'u', 'groups'); + $rsm->addJoinedEntityResult(CmsGroup::class, 'g', 'u', 'groups'); $rsm->addFieldResult('g', 'g__id', 'id'); $rsm->addFieldResult('g', 'g__name', 'name'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p', 'u', 'phonenumbers'); + $rsm->addJoinedEntityResult(CmsPhonenumber::class, 'p', 'u', 'phonenumbers'); $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set @@ -1477,7 +1491,7 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); - $this->assertContainsOnly('Doctrine\Tests\Models\CMS\CmsUser', $result); + $this->assertContainsOnly(CmsUser::class, $result); $this->assertEquals(2, count($result[0]->groups)); $this->assertEquals(2, count($result[0]->phonenumbers)); @@ -1497,13 +1511,13 @@ class ObjectHydratorTest extends HydrationTestCase public function testManyToManyHydrationWithAliasedUserEntity() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'user'); + $rsm->addEntityResult(CmsUser::class, 'u', 'user'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsGroup', 'g', 'u', 'groups'); + $rsm->addJoinedEntityResult(CmsGroup::class, 'g', 'u', 'groups'); $rsm->addFieldResult('g', 'g__id', 'id'); $rsm->addFieldResult('g', 'g__name', 'name'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p', 'u', 'phonenumbers'); + $rsm->addJoinedEntityResult(CmsPhonenumber::class, 'p', 'u', 'phonenumbers'); $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); // Faked result set @@ -1601,9 +1615,9 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); $this->assertInternalType('array', $result[0]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['user']); + $this->assertInstanceOf(CmsUser::class, $result[0]['user']); $this->assertInternalType('array', $result[1]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]['user']); + $this->assertInstanceOf(CmsUser::class, $result[1]['user']); $this->assertEquals(2, count($result[0]['user']->groups)); $this->assertEquals(2, count($result[0]['user']->phonenumbers)); @@ -1622,7 +1636,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testMissingIdForRootEntity($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); @@ -1663,10 +1677,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals('JWAGE', $result[2]['nameUpper']); $this->assertEquals('JWAGE', $result[3]['nameUpper']); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[0][$userEntityKey]); $this->assertNull($result[1][$userEntityKey]); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][$userEntityKey]); + $this->assertInstanceOf(CmsUser::class, $result[2][$userEntityKey]); $this->assertNull($result[3][$userEntityKey]); } @@ -1681,9 +1695,9 @@ class ObjectHydratorTest extends HydrationTestCase public function testMissingIdForCollectionValuedChildEntity($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -1743,9 +1757,9 @@ class ObjectHydratorTest extends HydrationTestCase public function testMissingIdForSingleValuedChildEntity($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsAddress', + CmsAddress::class, 'a', 'u', 'address' @@ -1782,7 +1796,7 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, count($result)); - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $result[0][$userEntityKey]->address); + $this->assertInstanceOf(CmsAddress::class, $result[0][$userEntityKey]->address); $this->assertNull($result[1][$userEntityKey]->address); } @@ -1797,7 +1811,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testIndexByAndMixedResult($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); @@ -1841,7 +1855,7 @@ class ObjectHydratorTest extends HydrationTestCase public function testIndexByScalarsOnly($userEntityKey) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); + $rsm->addEntityResult(CmsUser::class, 'u', $userEntityKey ?: null); $rsm->addScalarResult('sclr0', 'nameUpper', 'string'); $rsm->addIndexByScalar('sclr0'); @@ -1880,8 +1894,8 @@ class ObjectHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Company\CompanyFixContract', 'c'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\Company\CompanyEmployee', 'e', 'c', 'salesPerson'); + $rsm->addEntityResult(CompanyFixContract::class, 'c'); + $rsm->addJoinedEntityResult(CompanyEmployee::class, 'e', 'c', 'salesPerson'); $rsm->addFieldResult('c', 'c__id', 'id'); $rsm->setDiscriminatorColumn('c', 'c_discr'); @@ -1907,8 +1921,8 @@ class ObjectHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Company\CompanyFixContract', 'c'); - $rsm->addJoinedEntityResult('Doctrine\Tests\Models\Company\CompanyEmployee', 'e', 'c', 'salesPerson'); + $rsm->addEntityResult(CompanyFixContract::class, 'c'); + $rsm->addJoinedEntityResult(CompanyEmployee::class, 'e', 'c', 'salesPerson'); $rsm->addFieldResult('c', 'c__id', 'id'); $rsm->addMetaResult('c', 'c_discr', 'discr', false, 'string'); $rsm->setDiscriminatorColumn('c', 'c_discr'); @@ -1941,7 +1955,7 @@ class ObjectHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Company\CompanyPerson', 'p'); + $rsm->addEntityResult(CompanyPerson::class, 'p'); $rsm->addFieldResult('p', 'p__id', 'id'); $rsm->addFieldResult('p', 'p__name', 'name'); $rsm->addMetaResult('p', 'discr', 'discr', false, 'string'); @@ -1964,8 +1978,8 @@ class ObjectHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult(EntityWithArrayDefaultArrayValueM2M::CLASSNAME, 'e1', null); - $rsm->addJoinedEntityResult(SimpleEntity::CLASSNAME, 'e2', 'e1', 'collection'); + $rsm->addEntityResult(EntityWithArrayDefaultArrayValueM2M::class, 'e1', null); + $rsm->addJoinedEntityResult(SimpleEntity::class, 'e2', 'e1', 'collection'); $rsm->addFieldResult('e1', 'a1__id', 'id'); $rsm->addFieldResult('e2', 'e2__id', 'id'); @@ -1981,9 +1995,9 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm); $this->assertCount(1, $result); - $this->assertInstanceOf(EntityWithArrayDefaultArrayValueM2M::CLASSNAME, $result[0]); - $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0]->collection); + $this->assertInstanceOf(EntityWithArrayDefaultArrayValueM2M::class, $result[0]); + $this->assertInstanceOf(PersistentCollection::class, $result[0]->collection); $this->assertCount(1, $result[0]->collection); - $this->assertInstanceOf(SimpleEntity::CLASSNAME, $result[0]->collection[0]); + $this->assertInstanceOf(SimpleEntity::class, $result[0]->collection[0]); } } diff --git a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php index 745f30ec0..30352b365 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php @@ -2,8 +2,13 @@ namespace Doctrine\Tests\ORM\Hydration; -use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Models\CMS\CmsEmail; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Legacy\LegacyUser; +use Doctrine\Tests\Models\Legacy\LegacyUserReference; /** * Description of ResultSetMappingTest @@ -34,7 +39,7 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase public function testBasicResultSetMapping() { $this->_rsm->addEntityResult( - 'Doctrine\Tests\Models\CMS\CmsUser', + CmsUser::class, 'u' ); $this->_rsm->addFieldResult('u', 'id', 'id'); @@ -47,9 +52,9 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertFalse($this->_rsm->isScalarResult('username')); $this->assertFalse($this->_rsm->isScalarResult('name')); - $this->assertTrue($this->_rsm->getClassName('u') == 'Doctrine\Tests\Models\CMS\CmsUser'); + $this->assertTrue($this->_rsm->getClassName('u') == CmsUser::class); $class = $this->_rsm->getDeclaringClass('id'); - $this->assertTrue($class == 'Doctrine\Tests\Models\CMS\CmsUser'); + $this->assertTrue($class == CmsUser::class); $this->assertEquals('u', $this->_rsm->getEntityAlias('id')); $this->assertEquals('u', $this->_rsm->getEntityAlias('status')); @@ -71,8 +76,8 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase { $rms = $this->_rsm; - $this->_rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser','u'); - $this->_rsm->addJoinedEntityResult('Doctrine\Tests\Models\CMS\CmsPhonenumber','p','u','phonenumbers'); + $this->_rsm->addEntityResult(CmsUser::class,'u'); + $this->_rsm->addJoinedEntityResult(CmsPhonenumber::class,'p','u','phonenumbers'); $this->_rsm->addFieldResult('u', 'id', 'id'); $this->_rsm->addFieldResult('u', 'name', 'name'); $this->_rsm->setDiscriminatorColumn('name', 'name'); @@ -96,13 +101,13 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase */ public function testAddNamedNativeQueryResultSetMapping() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CmsUser::class); $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); $cm->mapOneToOne( [ 'fieldName' => 'email', - 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsEmail', + 'targetEntity' => CmsEmail::class, 'cascade' => ['persist'], 'inversedBy' => 'user', 'orphanRemoval' => false, @@ -171,16 +176,16 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('c0', $rsm->getEntityAlias('user_id')); $this->assertEquals('c0', $rsm->getEntityAlias('name')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getClassName('c0')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('name')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('user_id')); + $this->assertEquals(CmsUser::class, $rsm->getClassName('c0')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('name')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('user_id')); $this->assertEquals('c1', $rsm->getEntityAlias('email_id')); $this->assertEquals('c1', $rsm->getEntityAlias('email')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $rsm->getClassName('c1')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $rsm->getDeclaringClass('email')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $rsm->getDeclaringClass('email_id')); + $this->assertEquals(CmsEmail::class, $rsm->getClassName('c1')); + $this->assertEquals(CmsEmail::class, $rsm->getDeclaringClass('email')); + $this->assertEquals(CmsEmail::class, $rsm->getDeclaringClass('email_id')); } /** @@ -188,7 +193,7 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase */ public function testAddNamedNativeQueryResultSetMappingWithoutFields() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CmsUser::class); $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); $cm->addNamedNativeQuery( @@ -225,11 +230,11 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('c0', $rsm->getEntityAlias('name')); $this->assertEquals('c0', $rsm->getEntityAlias('status')); $this->assertEquals('c0', $rsm->getEntityAlias('username')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getClassName('c0')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('id')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('name')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('status')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('username')); + $this->assertEquals(CmsUser::class, $rsm->getClassName('c0')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('id')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('name')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('status')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('username')); } /** @@ -237,7 +242,7 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase */ public function testAddNamedNativeQueryResultClass() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CmsUser::class); $cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); @@ -258,19 +263,19 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('c0', $rsm->getEntityAlias('name')); $this->assertEquals('c0', $rsm->getEntityAlias('status')); $this->assertEquals('c0', $rsm->getEntityAlias('username')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getClassName('c0')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('id')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('name')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('status')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('username')); + $this->assertEquals(CmsUser::class, $rsm->getClassName('c0')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('id')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('name')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('status')); + $this->assertEquals(CmsUser::class, $rsm->getDeclaringClass('username')); } /** * @group DDC-117 */ public function testIndexByMetadataColumn() { - $this->_rsm->addEntityResult('Doctrine\Tests\Models\Legacy\LegacyUser', 'u'); - $this->_rsm->addJoinedEntityResult('Doctrine\Tests\Models\LegacyUserReference', 'lu', 'u', '_references'); + $this->_rsm->addEntityResult(LegacyUser::class, 'u'); + $this->_rsm->addJoinedEntityResult(LegacyUserReference::class, 'lu', 'u', '_references'); $this->_rsm->addMetaResult('lu', '_source', '_source', true, 'integer'); $this->_rsm->addMetaResult('lu', '_target', '_target', true, 'integer'); $this->_rsm->addIndexBy('lu', '_source'); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 6cce68811..2ad9461ff 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Hydration; use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Models\CMS\CmsUser; class ScalarHydratorTest extends HydrationTestCase { @@ -13,7 +14,7 @@ class ScalarHydratorTest extends HydrationTestCase public function testNewHydrationSimpleEntityQuery() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); @@ -73,7 +74,7 @@ class ScalarHydratorTest extends HydrationTestCase public function testSkipUnknownColumns() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addScalarResult('foo1', 'foo', 'string'); diff --git a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php index d6eaeb10c..ffcd81e35 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php @@ -2,8 +2,13 @@ namespace Doctrine\Tests\ORM\Hydration; -use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Mocks\HydratorMockStatement; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\Issue5989\Issue5989Employee; +use Doctrine\Tests\Models\Issue5989\Issue5989Manager; +use Doctrine\Tests\Models\Issue5989\Issue5989Person; class SimpleObjectHydratorTest extends HydrationTestCase { @@ -16,7 +21,7 @@ class SimpleObjectHydratorTest extends HydrationTestCase public function testMissingDiscriminatorColumnException() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Company\CompanyPerson', 'p'); + $rsm->addEntityResult(CompanyPerson::class, 'p'); $rsm->addFieldResult('p', 'p__id', 'id'); $rsm->addFieldResult('p', 'p__name', 'name'); $rsm->addMetaResult('p ', 'discr', 'discr', false, 'string'); @@ -36,7 +41,7 @@ class SimpleObjectHydratorTest extends HydrationTestCase public function testExtraFieldInResultSetShouldBeIgnore() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $rsm->addEntityResult(CmsAddress::class, 'a'); $rsm->addFieldResult('a', 'a__id', 'id'); $rsm->addFieldResult('a', 'a__city', 'city'); $resultSet = [ @@ -67,7 +72,7 @@ class SimpleObjectHydratorTest extends HydrationTestCase { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Company\CompanyPerson', 'p'); + $rsm->addEntityResult(CompanyPerson::class, 'p'); $rsm->addFieldResult('p', 'p__id', 'id'); $rsm->addFieldResult('p', 'p__name', 'name'); @@ -93,10 +98,10 @@ class SimpleObjectHydratorTest extends HydrationTestCase public function testNullValueShouldNotOverwriteFieldWithSameNameInJoinedInheritance() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\Issue5989\Issue5989Person', 'p'); + $rsm->addEntityResult(Issue5989Person::class, 'p'); $rsm->addFieldResult('p', 'p__id', 'id'); - $rsm->addFieldResult('p', 'm__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Manager'); - $rsm->addFieldResult('p', 'e__tags', 'tags', 'Doctrine\Tests\Models\Issue5989\Issue5989Employee'); + $rsm->addFieldResult('p', 'm__tags', 'tags', Issue5989Manager::class); + $rsm->addFieldResult('p', 'e__tags', 'tags', Issue5989Employee::class); $rsm->addMetaResult('p', 'discr', 'discr', false, 'string'); $resultSet = [ [ @@ -107,7 +112,7 @@ class SimpleObjectHydratorTest extends HydrationTestCase ], ]; - $expectedEntity = new \Doctrine\Tests\Models\Issue5989\Issue5989Manager(); + $expectedEntity = new Issue5989Manager(); $expectedEntity->id = 1; $expectedEntity->tags = ['tag1', 'tag2']; diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index fa98dd070..d0cebbc49 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Hydration; use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Models\CMS\CmsUser; class SingleScalarHydratorTest extends HydrationTestCase { @@ -61,7 +62,7 @@ class SingleScalarHydratorTest extends HydrationTestCase public function testHydrateSingleScalar($name, $resultSet) { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__name', 'name'); diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php index 1f667b464..3015341d9 100644 --- a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\LazyCriteriaCollection; use Doctrine\ORM\Persisters\Entity\EntityPersister; @@ -97,7 +98,7 @@ class LazyCriteriaCollectionTest extends \PHPUnit_Framework_TestCase $filtered = $this->lazyCriteriaCollection->matching($criteria); - $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $filtered); + $this->assertInstanceOf(Collection::class, $filtered); $this->assertEquals([$foo], $filtered->toArray()); $this->assertEquals([$foo], $this->lazyCriteriaCollection->matching($criteria)->toArray()); diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 4e9546daa..4e19c987c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -5,16 +5,36 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Events; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\ORM\Mapping\DefaultNamingStrategy; use Doctrine\ORM\Mapping\DiscriminatorColumn; use Doctrine\ORM\Mapping\Id; use Doctrine\ORM\Mapping\MappingException; 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\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsAddressListener; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Company\CompanyContract; +use Doctrine\Tests\Models\Company\CompanyContractListener; +use Doctrine\Tests\Models\Company\CompanyFixContract; +use Doctrine\Tests\Models\Company\CompanyFlexContract; +use Doctrine\Tests\Models\Company\CompanyFlexUltraContract; +use Doctrine\Tests\Models\Company\CompanyFlexUltraContractListener; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType; use Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable; use Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName; +use Doctrine\Tests\Models\DDC3579\DDC3579Admin; +use Doctrine\Tests\Models\DDC869\DDC869ChequePayment; +use Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment; +use Doctrine\Tests\Models\DDC869\DDC869PaymentRepository; +use Doctrine\Tests\Models\DDC889\DDC889Class; +use Doctrine\Tests\Models\DDC889\DDC889Entity; +use Doctrine\Tests\Models\DDC964\DDC964Admin; +use Doctrine\Tests\Models\DDC964\DDC964Guest; use Doctrine\Tests\OrmTestCase; abstract class AbstractMappingDriverTest extends OrmTestCase @@ -49,8 +69,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testLoadMapping() { - $entityClassName = 'Doctrine\Tests\ORM\Mapping\User'; - return $this->createClassMetadata($entityClassName); + return $this->createClassMetadata(User::class); } /** @@ -83,7 +102,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testEntityIndexFlagsAndPartialIndexes() { - $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Comment'); + $class = $this->createClassMetadata(Comment::class); $this->assertEquals( [ @@ -147,7 +166,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testEntityCustomGenerator() { - $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal'); + $class = $this->createClassMetadata(Animal::class); $this->assertEquals(ClassMetadata::GENERATOR_TYPE_CUSTOM, $class->generatorType, "Generator Type"); @@ -412,7 +431,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->markTestSkipped('PHP Mapping Drivers have no defaults.'); } - $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\Animal'); + $class = $this->createClassMetadata(Animal::class); $this->assertEquals( ['name' => 'discr', 'type' => 'string', 'length' => '32', 'fieldName' => 'discr', 'columnDefinition' => null], @@ -429,27 +448,25 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $factory = $this->createClassMetadataFactory($em); - $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment'); + $class = $factory->getMetadataFor(DDC869CreditCardPayment::class); $this->assertTrue(isset($class->fieldMappings['id'])); $this->assertTrue(isset($class->fieldMappings['value'])); $this->assertTrue(isset($class->fieldMappings['creditCardNumber'])); - $this->assertEquals($class->customRepositoryClassName, "Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository", - $em->getRepository("Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment")); - $this->assertTrue($em->getRepository("Doctrine\Tests\Models\DDC869\DDC869ChequePayment")->isTrue()); + $this->assertEquals($class->customRepositoryClassName, DDC869PaymentRepository::class); + $this->assertInstanceOf(DDC869PaymentRepository::class, $em->getRepository(DDC869CreditCardPayment::class)); + $this->assertTrue($em->getRepository(DDC869ChequePayment::class)->isTrue()); - $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC869\DDC869ChequePayment'); + $class = $factory->getMetadataFor(DDC869ChequePayment::class); $this->assertTrue(isset($class->fieldMappings['id'])); $this->assertTrue(isset($class->fieldMappings['value'])); $this->assertTrue(isset($class->fieldMappings['serialNumber'])); - $this->assertEquals($class->customRepositoryClassName, "Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); - $this->assertInstanceOf("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository", - $em->getRepository("Doctrine\Tests\Models\DDC869\DDC869ChequePayment")); - $this->assertTrue($em->getRepository("Doctrine\Tests\Models\DDC869\DDC869ChequePayment")->isTrue()); + $this->assertEquals($class->customRepositoryClassName, DDC869PaymentRepository::class); + $this->assertInstanceOf(DDC869PaymentRepository::class, $em->getRepository(DDC869ChequePayment::class)); + $this->assertTrue($em->getRepository(DDC869ChequePayment::class)->isTrue()); } /** @@ -458,7 +475,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testDefaultFieldType() { $factory = $this->createClassMetadataFactory(); - $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType'); + $class = $factory->getMetadataFor(DDC1476EntityWithDefaultFieldType::class); $this->assertArrayHasKey('id', $class->fieldMappings); @@ -495,7 +512,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase */ public function testIdentifierColumnDefinition() { - $class = $this->createClassMetadata(__NAMESPACE__ . '\DDC1170Entity'); + $class = $this->createClassMetadata(DDC1170Entity::class); $this->assertArrayHasKey('id', $class->fieldMappings); @@ -517,11 +534,11 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $factory = $this->createClassMetadataFactory($em); - $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultNamingStrategy', $em->getConfiguration()->getNamingStrategy()); + $this->assertInstanceOf(DefaultNamingStrategy::class, $em->getConfiguration()->getNamingStrategy()); $em->getConfiguration()->setNamingStrategy(new UnderscoreNamingStrategy(CASE_UPPER)); - $this->assertInstanceOf('Doctrine\ORM\Mapping\UnderscoreNamingStrategy', $em->getConfiguration()->getNamingStrategy()); + $this->assertInstanceOf(UnderscoreNamingStrategy::class, $em->getConfiguration()->getNamingStrategy()); - $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType'); + $class = $factory->getMetadataFor(DDC1476EntityWithDefaultFieldType::class); $this->assertEquals('ID', $class->getColumnName('id')); $this->assertEquals('NAME', $class->getColumnName('name')); @@ -534,7 +551,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase */ public function testDiscriminatorColumnDefinition() { - $class = $this->createClassMetadata(__NAMESPACE__ . '\DDC807Entity'); + $class = $this->createClassMetadata(DDC807Entity::class); $this->assertArrayHasKey('columnDefinition', $class->discriminatorColumn); $this->assertArrayHasKey('name', $class->discriminatorColumn); @@ -551,7 +568,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.'); - $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class'); + $this->createClassMetadata(DDC889Class::class); } /** @@ -564,13 +581,13 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->expectException(MappingException::class); $this->expectExceptionMessage('No identifier/primary key specified for Entity "Doctrine\Tests\Models\DDC889\DDC889Entity" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass". Every Entity must have an identifier/primary key.'); - $factory->getMetadataFor('Doctrine\Tests\Models\DDC889\DDC889Entity'); + $factory->getMetadataFor(DDC889Entity::class); } public function testNamedQuery() { $driver = $this->_loadDriver(); - $class = $this->createClassMetadata(__NAMESPACE__.'\User'); + $class = $this->createClassMetadata(User::class); $this->assertCount(1, $class->getNamedQueries(), sprintf("Named queries not processed correctly by driver %s", get_class($driver))); } @@ -581,7 +598,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testNamedNativeQuery() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $class = $this->createClassMetadata(CmsAddress::class); //named native query $this->assertCount(3, $class->namedNativeQueries); @@ -596,7 +613,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $findByIdQuery = $class->getNamedNativeQuery('find-by-id'); $this->assertEquals('find-by-id', $findByIdQuery['name']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress',$findByIdQuery['resultClass']); + $this->assertEquals(CmsAddress::class,$findByIdQuery['resultClass']); $this->assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']); $countQuery = $class->getNamedNativeQuery('count'); @@ -612,14 +629,14 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all'); $this->assertEquals('mapping-find-all', $findAllMapping['name']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $findAllMapping['entities'][0]['entityClass']); + $this->assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']); $this->assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]); $this->assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]); $this->assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]); $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields'); $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $withoutFieldsMapping['entities'][0]['entityClass']); + $this->assertEquals(CmsAddress::class, $withoutFieldsMapping['entities'][0]['entityClass']); $this->assertEquals([], $withoutFieldsMapping['entities'][0]['fields']); $countMapping = $class->getSqlResultSetMapping('mapping-count'); @@ -634,8 +651,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testSqlResultSetMapping() { - $userMetadata = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $personMetadata = $this->createClassMetadata('Doctrine\Tests\Models\Company\CompanyPerson'); + $userMetadata = $this->createClassMetadata(CmsUser::class); + $personMetadata = $this->createClassMetadata(CompanyPerson::class); // user asserts $this->assertCount(4, $userMetadata->getSqlResultSetMappings()); @@ -685,7 +702,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertEquals(['name'=>'id','column'=>'a_id'], $mapping['entities'][1]['fields'][0]); $this->assertEquals(['name'=>'zip','column'=>'a_zip'], $mapping['entities'][1]['fields'][1]); $this->assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $mapping['entities'][1]['entityClass']); + $this->assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']); //person asserts $this->assertCount(1, $personMetadata->getSqlResultSetMappings()); @@ -706,8 +723,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $factory = $this->createClassMetadataFactory(); - $adminMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Admin'); - $guestMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Guest'); + $adminMetadata = $factory->getMetadataFor(DDC964Admin::class); + $guestMetadata = $factory->getMetadataFor(DDC964Guest::class); // assert groups association mappings @@ -789,7 +806,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $factory = $this->createClassMetadataFactory(); - $adminMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3579\DDC3579Admin'); + $adminMetadata = $factory->getMetadataFor(DDC3579Admin::class); // assert groups association mappings $this->assertArrayHasKey('groups', $adminMetadata->associationMappings); @@ -806,8 +823,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $factory = $this->createClassMetadataFactory(); - $guestMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Guest'); - $adminMetadata = $factory->getMetadataFor('Doctrine\Tests\Models\DDC964\DDC964Admin'); + $guestMetadata = $factory->getMetadataFor(DDC964Guest::class); + $adminMetadata = $factory->getMetadataFor(DDC964Admin::class); $this->assertTrue($adminMetadata->fieldMappings['id']['id']); $this->assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']); @@ -845,10 +862,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $em = $this->_getTestEntityManager(); $factory = $this->createClassMetadataFactory($em); - $superClass = $factory->getMetadataFor('Doctrine\Tests\Models\Company\CompanyContract'); - $flexClass = $factory->getMetadataFor('Doctrine\Tests\Models\Company\CompanyFixContract'); - $fixClass = $factory->getMetadataFor('Doctrine\Tests\Models\Company\CompanyFlexContract'); - $ultraClass = $factory->getMetadataFor('Doctrine\Tests\Models\Company\CompanyFlexUltraContract'); + $superClass = $factory->getMetadataFor(CompanyContract::class); + $flexClass = $factory->getMetadataFor(CompanyFixContract::class); + $fixClass = $factory->getMetadataFor(CompanyFlexContract::class); + $ultraClass = $factory->getMetadataFor(CompanyFlexUltraContract::class); $this->assertArrayHasKey(Events::prePersist, $superClass->entityListeners); $this->assertArrayHasKey(Events::postPersist, $superClass->entityListeners); @@ -859,8 +876,8 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $postPersist = $superClass->entityListeners[Events::postPersist][0]; $prePersist = $superClass->entityListeners[Events::prePersist][0]; - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContractListener', $postPersist['class']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContractListener', $prePersist['class']); + $this->assertEquals(CompanyContractListener::class, $postPersist['class']); + $this->assertEquals(CompanyContractListener::class, $prePersist['class']); $this->assertEquals('postPersistHandler', $postPersist['method']); $this->assertEquals('prePersistHandler', $prePersist['method']); @@ -876,7 +893,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $em = $this->_getTestEntityManager(); $factory = $this->createClassMetadataFactory($em); - $ultraClass = $factory->getMetadataFor('Doctrine\Tests\Models\Company\CompanyFlexUltraContract'); + $ultraClass = $factory->getMetadataFor(CompanyFlexUltraContract::class); //overridden listeners $this->assertArrayHasKey(Events::postPersist, $ultraClass->entityListeners); @@ -888,17 +905,17 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $postPersist = $ultraClass->entityListeners[Events::postPersist][0]; $prePersist = $ultraClass->entityListeners[Events::prePersist][0]; - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContractListener', $postPersist['class']); - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyContractListener', $prePersist['class']); + $this->assertEquals(CompanyContractListener::class, $postPersist['class']); + $this->assertEquals(CompanyContractListener::class, $prePersist['class']); $this->assertEquals('postPersistHandler', $postPersist['method']); $this->assertEquals('prePersistHandler', $prePersist['method']); $prePersist = $ultraClass->entityListeners[Events::prePersist][1]; - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexUltraContractListener', $prePersist['class']); + $this->assertEquals(CompanyFlexUltraContractListener::class, $prePersist['class']); $this->assertEquals('prePersistHandler1', $prePersist['method']); $prePersist = $ultraClass->entityListeners[Events::prePersist][2]; - $this->assertEquals('Doctrine\Tests\Models\Company\CompanyFlexUltraContractListener', $prePersist['class']); + $this->assertEquals(CompanyFlexUltraContractListener::class, $prePersist['class']); $this->assertEquals('prePersistHandler2', $prePersist['method']); } @@ -910,7 +927,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $em = $this->_getTestEntityManager(); $factory = $this->createClassMetadataFactory($em); - $metadata = $factory->getMetadataFor('Doctrine\Tests\Models\CMS\CmsAddress'); + $metadata = $factory->getMetadataFor(CmsAddress::class); $this->assertArrayHasKey(Events::postPersist, $metadata->entityListeners); $this->assertArrayHasKey(Events::prePersist, $metadata->entityListeners); @@ -940,14 +957,14 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $preFlush = $metadata->entityListeners[Events::preFlush][0]; - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $postPersist['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $prePersist['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $postUpdate['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $preUpdate['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $postRemove['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $preRemove['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $postLoad['class']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddressListener', $preFlush['class']); + $this->assertEquals(CmsAddressListener::class, $postPersist['class']); + $this->assertEquals(CmsAddressListener::class, $prePersist['class']); + $this->assertEquals(CmsAddressListener::class, $postUpdate['class']); + $this->assertEquals(CmsAddressListener::class, $preUpdate['class']); + $this->assertEquals(CmsAddressListener::class, $postRemove['class']); + $this->assertEquals(CmsAddressListener::class, $preRemove['class']); + $this->assertEquals(CmsAddressListener::class, $postLoad['class']); + $this->assertEquals(CmsAddressListener::class, $preFlush['class']); $this->assertEquals(Events::postPersist, $postPersist['method']); $this->assertEquals(Events::prePersist, $prePersist['method']); @@ -966,7 +983,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase { $em = $this->_getTestEntityManager(); $factory = $this->createClassMetadataFactory($em); - $class = $factory->getMetadataFor(City::CLASSNAME); + $class = $factory->getMetadataFor(City::class); $this->assertArrayHasKey('usage', $class->cache); $this->assertArrayHasKey('region', $class->cache); $this->assertEquals(ClassMetadata::CACHE_USAGE_READ_ONLY, $class->cache['usage']); @@ -994,7 +1011,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testSchemaDefinitionViaExplicitTableSchemaAnnotationProperty() { /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */ - $metadata = $this->createClassMetadataFactory()->getMetadataFor(ExplicitSchemaAndTable::CLASSNAME); + $metadata = $this->createClassMetadataFactory()->getMetadataFor(ExplicitSchemaAndTable::class); $this->assertSame('explicit_schema', $metadata->getSchemaName()); $this->assertSame('explicit_table', $metadata->getTableName()); @@ -1007,7 +1024,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase public function testSchemaDefinitionViaSchemaDefinedInTableNameInTableAnnotationProperty() { /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */ - $metadata = $this->createClassMetadataFactory()->getMetadataFor(SchemaAndTableInTableName::CLASSNAME); + $metadata = $this->createClassMetadataFactory()->getMetadataFor(SchemaAndTableInTableName::class); $this->assertSame('implicit_schema', $metadata->getSchemaName()); $this->assertSame('implicit_table', $metadata->getTableName()); @@ -1022,9 +1039,9 @@ abstract class AbstractMappingDriverTest extends OrmTestCase if (strpos(get_class($this), 'PHPMappingDriver') !== false) { $this->markTestSkipped('PHP Mapping Drivers have no defaults.'); } - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityNoDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityNoDiscriminatorColumnMapping::class); $this->assertEquals(255, $class->discriminatorColumn['length']); - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityIncompleteDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityIncompleteDiscriminatorColumnMapping::class); $this->assertEquals(255, $class->discriminatorColumn['length']); } @@ -1037,9 +1054,9 @@ abstract class AbstractMappingDriverTest extends OrmTestCase if (strpos(get_class($this), 'PHPMappingDriver') !== false) { $this->markTestSkipped('PHP Mapping Drivers have no defaults.'); } - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityNoDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityNoDiscriminatorColumnMapping::class); $this->assertEquals('string', $class->discriminatorColumn['type']); - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityIncompleteDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityIncompleteDiscriminatorColumnMapping::class); $this->assertEquals('string', $class->discriminatorColumn['type']); } @@ -1052,9 +1069,9 @@ abstract class AbstractMappingDriverTest extends OrmTestCase if (strpos(get_class($this), 'PHPMappingDriver') !== false) { $this->markTestSkipped('PHP Mapping Drivers have no defaults.'); } - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityNoDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityNoDiscriminatorColumnMapping::class); $this->assertEquals('dtype', $class->discriminatorColumn['name']); - $class = $this->createClassMetadata(__NAMESPACE__ . '\SingleTableEntityIncompleteDiscriminatorColumnMapping'); + $class = $this->createClassMetadata(SingleTableEntityIncompleteDiscriminatorColumnMapping::class); $this->assertEquals('dtype', $class->discriminatorColumn['name']); } @@ -1188,7 +1205,7 @@ class User $metadata->mapOneToOne( [ 'fieldName' => 'address', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address', + 'targetEntity' => Address::class, 'cascade' => [ 0 => 'remove', @@ -1210,7 +1227,7 @@ class User $metadata->mapOneToMany( [ 'fieldName' => 'phonenumbers', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber', + 'targetEntity' => Phonenumber::class, 'cascade' => [ 1 => 'persist', @@ -1226,7 +1243,7 @@ class User $metadata->mapManyToMany( [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group', + 'targetEntity' => Group::class, 'cascade' => [ 0 => 'remove', diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index e87412d3e..89951f971 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -5,10 +5,17 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Annotations\AnnotationException; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; +use Doctrine\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; use Doctrine\ORM\Mapping\MappingException; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride; +use Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithOverride; +use Doctrine\Tests\Models\DirectoryTree\Directory; +use Doctrine\Tests\Models\DirectoryTree\File; +use Doctrine\Tests\Models\ECommerce\ECommerceCart; class AnnotationDriverTest extends AbstractMappingDriverTest { @@ -32,11 +39,10 @@ class AnnotationDriverTest extends AbstractMappingDriverTest */ public function testFailingSecondLevelCacheAssociation() { - $className = 'Doctrine\Tests\ORM\Mapping\AnnotationSLC'; $mappingDriver = $this->_loadDriver(); - $class = new ClassMetadata($className); - $mappingDriver->loadMetadataForClass($className, $class); + $class = new ClassMetadata(AnnotationSLC::class); + $mappingDriver->loadMetadataForClass(AnnotationSLC::class, $class); } /** @@ -44,11 +50,11 @@ class AnnotationDriverTest extends AbstractMappingDriverTest */ public function testColumnWithMissingTypeDefaultsToString() { - $cm = new ClassMetadata('Doctrine\Tests\ORM\Mapping\ColumnWithoutType'); + $cm = new ClassMetadata(ColumnWithoutType::class); $cm->initializeReflection(new RuntimeReflectionService()); $annotationDriver = $this->_loadDriver(); - $annotationDriver->loadMetadataForClass('Doctrine\Tests\ORM\Mapping\InvalidColumn', $cm); + $annotationDriver->loadMetadataForClass(Mapping\InvalidColumn::class, $cm); $this->assertEquals('string', $cm->fieldMappings['id']['type']); } @@ -85,13 +91,12 @@ class AnnotationDriverTest extends AbstractMappingDriverTest */ public function testGetAllClassNamesReturnsAlreadyLoadedClassesIfAppropriate() { - $rightClassName = 'Doctrine\Tests\Models\CMS\CmsUser'; - $this->_ensureIsLoaded($rightClassName); + $this->_ensureIsLoaded(CmsUser::class); $annotationDriver = $this->_loadDriverForCMSModels(); $classes = $annotationDriver->getAllClassNames(); - $this->assertContains($rightClassName, $classes); + $this->assertContains(CmsUser::class, $classes); } /** @@ -99,13 +104,12 @@ class AnnotationDriverTest extends AbstractMappingDriverTest */ public function testGetClassNamesReturnsOnlyTheAppropriateClasses() { - $extraneousClassName = 'Doctrine\Tests\Models\ECommerce\ECommerceCart'; - $this->_ensureIsLoaded($extraneousClassName); + $this->_ensureIsLoaded(ECommerceCart::class); $annotationDriver = $this->_loadDriverForCMSModels(); $classes = $annotationDriver->getAllClassNames(); - $this->assertNotContains($extraneousClassName, $classes); + $this->assertNotContains(ECommerceCart::class, $classes); } protected function _loadDriverForCMSModels() @@ -140,11 +144,11 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); - $classPage = $factory->getMetadataFor('Doctrine\Tests\Models\DirectoryTree\File'); - $this->assertEquals('Doctrine\Tests\Models\DirectoryTree\File', $classPage->associationMappings['parentDirectory']['sourceEntity']); + $classPage = $factory->getMetadataFor(File::class); + $this->assertEquals(File::class, $classPage->associationMappings['parentDirectory']['sourceEntity']); - $classDirectory = $factory->getMetadataFor('Doctrine\Tests\Models\DirectoryTree\Directory'); - $this->assertEquals('Doctrine\Tests\Models\DirectoryTree\Directory', $classDirectory->associationMappings['parentDirectory']['sourceEntity']); + $classDirectory = $factory->getMetadataFor(Directory::class); + $this->assertEquals(Directory::class, $classDirectory->associationMappings['parentDirectory']['sourceEntity']); } /** @@ -165,7 +169,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest "mapped superclass 'Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass#users'" ); - $usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\UsingInvalidMappedSuperClass'); + $usingInvalidMsc = $factory->getMetadataFor(UsingInvalidMappedSuperClass::class); } /** @@ -183,10 +187,10 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $this->expectException(MappingException::class); $this->expectExceptionMessage( "It is not supported to define inheritance information on a mapped " . - "superclass 'Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'." + "superclass '" . MappedSuperClassInheritence::class . "'." ); - $usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'); + $usingInvalidMsc = $factory->getMetadataFor(MappedSuperClassInheritence::class); } /** @@ -201,10 +205,10 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); - $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationChild'); + $cm = $factory->getMetadataFor(AnnotationChild::class); $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks); - $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationParent'); + $cm = $factory->getMetadataFor(AnnotationParent::class); $this->assertEquals(["postLoad" => ["postLoad"], "preUpdate" => ["preUpdate"]], $cm->lifecycleCallbacks); } @@ -220,7 +224,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); - $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\ChildEntity'); + $cm = $factory->getMetadataFor(ChildEntity::class); } public function testInvalidFetchOptionThrowsException() @@ -235,15 +239,15 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $this->expectException(AnnotationException::class); $this->expectExceptionMessage('[Enum Error] Attribute "fetch" of @Doctrine\ORM\Mapping\OneToMany declared on property Doctrine\Tests\ORM\Mapping\InvalidFetchOption::$collection accept only [LAZY, EAGER, EXTRA_LAZY], but got eager.'); - $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption'); + $factory->getMetadataFor(InvalidFetchOption::class); } public function testAttributeOverridesMappingWithTrait() { $factory = $this->createClassMetadataFactory(); - $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride'); - $metadataWithOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithOverride'); + $metadataWithoutOverride = $factory->getMetadataFor(DDC1872ExampleEntityWithoutOverride::class); + $metadataWithOverride = $factory->getMetadataFor(DDC1872ExampleEntityWithOverride::class); $this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']); $this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']); diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php index 497e2a005..a0b422c0f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnsiQuoteStrategyTest.php @@ -5,6 +5,10 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\AnsiQuoteStrategy; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\DDC117\DDC117Article; +use Doctrine\Tests\Models\DDC117\DDC117ArticleDetails; use Doctrine\Tests\OrmTestCase; /** @@ -47,7 +51,7 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testGetColumnName() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->createClassMetadata(CmsUser::class); $class->mapField(['fieldName' => 'name', 'columnName' => 'name']); $class->mapField(['fieldName' => 'id', 'columnName' => 'id', 'id' => true]); @@ -57,7 +61,7 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testGetTableName() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->createClassMetadata(CmsUser::class); $class->setPrimaryTable(['name'=>'cms_user']); $this->assertEquals('cms_user' ,$this->strategy->getTableName($class, $this->platform)); @@ -65,7 +69,7 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testJoinTableName() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $class = $this->createClassMetadata(CmsAddress::class); $class->mapManyToMany( [ @@ -84,7 +88,7 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testIdentifierColumnNames() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $class = $this->createClassMetadata(CmsAddress::class); $class->mapField( [ @@ -105,13 +109,13 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testJoinColumnName() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $class = $this->createClassMetadata(DDC117ArticleDetails::class); $class->mapOneToOne( [ 'id' => true, 'fieldName' => 'article', - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [ [ 'name' => 'article' @@ -126,13 +130,13 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testReferencedJoinColumnName() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = $this->createClassMetadata(DDC117ArticleDetails::class); $cm->mapOneToOne( [ 'id' => true, 'fieldName' => 'article', - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [ [ 'name' => 'article' @@ -147,7 +151,7 @@ class AnsiQuoteStrategyTest extends OrmTestCase public function testGetSequenceName() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $class = $this->createClassMetadata(CmsUser::class); $definition = [ 'sequenceName' => 'user_id_seq', 'allocationSize' => 1, diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 7cd1247dd..292954506 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -3,10 +3,15 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; +use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\Id\SequenceGenerator; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\MappingException; +use Doctrine\Tests\Models\DDC869\DDC869ChequePayment; +use Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment; use Doctrine\Tests\Models\DDC869\DDC869Payment; +use Doctrine\Tests\Models\DDC869\DDC869PaymentRepository; use Doctrine\Tests\OrmTestCase; class BasicInheritanceMappingTest extends OrmTestCase @@ -29,12 +34,12 @@ class BasicInheritanceMappingTest extends OrmTestCase { $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\TransientBaseClass'); + $this->cmf->getMetadataFor(TransientBaseClass::class); } public function testGetMetadataForSubclassWithTransientBaseClass() { - $class = $this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\EntitySubClass'); + $class = $this->cmf->getMetadataFor(EntitySubClass::class); $this->assertEmpty($class->subClasses); $this->assertEmpty($class->parentClasses); @@ -44,7 +49,7 @@ class BasicInheritanceMappingTest extends OrmTestCase public function testGetMetadataForSubclassWithMappedSuperclass() { - $class = $this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\EntitySubClass2'); + $class = $this->cmf->getMetadataFor(EntitySubClass2::class); $this->assertEmpty($class->subClasses); $this->assertEmpty($class->parentClasses); @@ -66,28 +71,28 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testGetMetadataForSubclassWithMappedSuperclassWithRepository() { - $class = $this->cmf->getMetadataFor('Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment'); + $class = $this->cmf->getMetadataFor(DDC869CreditCardPayment::class); $this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('value', $class->fieldMappings); $this->assertArrayHasKey('creditCardNumber', $class->fieldMappings); - $this->assertEquals($class->customRepositoryClassName, 'Doctrine\Tests\Models\DDC869\DDC869PaymentRepository'); + $this->assertEquals($class->customRepositoryClassName, DDC869PaymentRepository::class); - $class = $this->cmf->getMetadataFor('Doctrine\Tests\Models\DDC869\DDC869ChequePayment'); + $class = $this->cmf->getMetadataFor(DDC869ChequePayment::class); $this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('value', $class->fieldMappings); $this->assertArrayHasKey('serialNumber', $class->fieldMappings); - $this->assertEquals($class->customRepositoryClassName, 'Doctrine\Tests\Models\DDC869\DDC869PaymentRepository'); + $this->assertEquals($class->customRepositoryClassName, DDC869PaymentRepository::class); // override repositoryClass - $class = $this->cmf->getMetadataFor('Doctrine\Tests\ORM\Mapping\SubclassWithRepository'); + $class = $this->cmf->getMetadataFor(SubclassWithRepository::class); $this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('value', $class->fieldMappings); - $this->assertEquals($class->customRepositoryClassName, 'Doctrine\ORM\EntityRepository'); + $this->assertEquals($class->customRepositoryClassName, EntityRepository::class); } /** @@ -96,7 +101,7 @@ class BasicInheritanceMappingTest extends OrmTestCase public function testSerializationWithPrivateFieldsFromMappedSuperclass() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\EntitySubClass2'); + $class = $this->cmf->getMetadataFor(EntitySubClass2::class); $class2 = unserialize(serialize($class)); $class2->wakeupReflection(new RuntimeReflectionService); @@ -111,7 +116,7 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testUnmappedSuperclassInHierarchy() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\HierarchyD'); + $class = $this->cmf->getMetadataFor(HierarchyD::class); $this->assertArrayHasKey('id', $class->fieldMappings); $this->assertArrayHasKey('a', $class->fieldMappings); @@ -131,7 +136,7 @@ class BasicInheritanceMappingTest extends OrmTestCase . ' avoid this exception from occurring.' ); - $this->cmf->getMetadataFor(__NAMESPACE__ . '\\HierarchyE'); + $this->cmf->getMetadataFor(HierarchyE::class); } /** @@ -140,7 +145,7 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testMappedSuperclassWithId() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity'); + $class = $this->cmf->getMetadataFor(SuperclassEntity::class); $this->assertArrayHasKey('id', $class->fieldMappings); } @@ -151,10 +156,10 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testGeneratedValueFromMappedSuperclass() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity'); + $class = $this->cmf->getMetadataFor(SuperclassEntity::class); /* @var $class ClassMetadataInfo */ - $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertInstanceOf(SequenceGenerator::class, $class->idGenerator); $this->assertEquals( ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition @@ -167,10 +172,10 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testSequenceDefinitionInHierarchyWithSandwichMappedSuperclass() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\HierarchyD'); + $class = $this->cmf->getMetadataFor(HierarchyD::class); /* @var $class ClassMetadataInfo */ - $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertInstanceOf(SequenceGenerator::class, $class->idGenerator); $this->assertEquals( ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition @@ -183,10 +188,10 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testMultipleMappedSuperclasses() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\MediumSuperclassEntity'); + $class = $this->cmf->getMetadataFor(MediumSuperclassEntity::class); /* @var $class ClassMetadataInfo */ - $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertInstanceOf(SequenceGenerator::class, $class->idGenerator); $this->assertEquals( ['allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'], $class->sequenceGeneratorDefinition @@ -200,7 +205,7 @@ class BasicInheritanceMappingTest extends OrmTestCase */ public function testMappedSuperclassIndex() { - $class = $this->cmf->getMetadataFor(__NAMESPACE__ . '\\EntityIndexSubClass'); + $class = $this->cmf->getMetadataFor(EntityIndexSubClass::class); /* @var $class ClassMetadataInfo */ $this->assertArrayHasKey('mapped1', $class->fieldMappings); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php index e19687c84..657ad65b4 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php @@ -3,8 +3,13 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; +use Doctrine\ORM\Mapping\Builder\EmbeddedBuilder; +use Doctrine\ORM\Mapping\Builder\FieldBuilder; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\ValueObjects\Name; use Doctrine\Tests\OrmTestCase; /** @@ -23,7 +28,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function setUp() { - $this->cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $this->cm = new ClassMetadata(CmsUser::class); $this->cm->initializeReflection(new RuntimeReflectionService()); $this->builder = new ClassMetadataBuilder($this->cm); } @@ -44,17 +49,12 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testAddEmbeddedWithOnlyRequiredParams() { - $this->assertIsFluent( - $this->builder->addEmbedded( - 'name', - 'Doctrine\Tests\Models\ValueObjects\Name' - ) - ); + $this->assertIsFluent($this->builder->addEmbedded('name', Name::class)); $this->assertEquals( [ 'name' => [ - 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', + 'class' => Name::class, 'columnPrefix' => null, 'declaredField' => null, 'originalField' => null, @@ -67,7 +67,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent( $this->builder->addEmbedded( 'name', - 'Doctrine\Tests\Models\ValueObjects\Name', + Name::class, 'nm_' ) ); @@ -75,7 +75,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertEquals( [ 'name' => [ - 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', + 'class' => Name::class, 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null, @@ -85,15 +85,15 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateEmbeddedWithoutExtraParams() { - $embeddedBuilder = ($this->builder->createEmbedded('name', 'Doctrine\Tests\Models\ValueObjects\Name')); - $this->assertInstanceOf('Doctrine\ORM\Mapping\Builder\EmbeddedBuilder', $embeddedBuilder); + $embeddedBuilder = ($this->builder->createEmbedded('name', Name::class)); + $this->assertInstanceOf(EmbeddedBuilder::class, $embeddedBuilder); $this->assertFalse(isset($this->cm->embeddedClasses['name'])); $this->assertIsFluent($embeddedBuilder->build()); $this->assertEquals( [ - 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', + 'class' => Name::class, 'columnPrefix' => null, 'declaredField' => null, 'originalField' => null @@ -104,7 +104,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateEmbeddedWithColumnPrefix() { - $embeddedBuilder = ($this->builder->createEmbedded('name', 'Doctrine\Tests\Models\ValueObjects\Name')); + $embeddedBuilder = ($this->builder->createEmbedded('name', Name::class)); $this->assertEquals($embeddedBuilder, $embeddedBuilder->setColumnPrefix('nm_')); @@ -112,7 +112,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertEquals( [ - 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', + 'class' => Name::class, 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null @@ -123,8 +123,8 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testSetCustomRepositoryClass() { - $this->assertIsFluent($this->builder->setCustomRepositoryClass('Doctrine\Tests\Models\CMS\CmsGroup')); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsGroup', $this->cm->customRepositoryClassName); + $this->assertIsFluent($this->builder->setCustomRepositoryClass(CmsGroup::class)); + $this->assertEquals(CmsGroup::class, $this->cm->customRepositoryClassName); } public function testSetReadOnly() @@ -187,11 +187,11 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testAddDiscriminatorMapClass() { - $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test', 'Doctrine\Tests\Models\CMS\CmsUser')); - $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test2', 'Doctrine\Tests\Models\CMS\CmsGroup')); + $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test', CmsUser::class)); + $this->assertIsFluent($this->builder->addDiscriminatorMapClass('test2', CmsGroup::class)); $this->assertEquals( - ['test' => 'Doctrine\Tests\Models\CMS\CmsUser', 'test2' => 'Doctrine\Tests\Models\CMS\CmsGroup'], $this->cm->discriminatorMap); + ['test' => CmsUser::class, 'test2' => CmsGroup::class], $this->cm->discriminatorMap); $this->assertEquals('test', $this->cm->discriminatorValue); } @@ -216,7 +216,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateField() { $fieldBuilder = ($this->builder->createField('name', 'string')); - $this->assertInstanceOf('Doctrine\ORM\Mapping\Builder\FieldBuilder', $fieldBuilder); + $this->assertInstanceOf(FieldBuilder::class, $fieldBuilder); $this->assertFalse(isset($this->cm->fieldMappings['name'])); $this->assertIsFluent($fieldBuilder->build()); @@ -265,7 +265,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateManyToOne() { $this->assertIsFluent( - $this->builder->createManyToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createManyToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->cascadeAll() ->fetchExtraLazy() @@ -276,7 +276,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [ 0 => 'remove', 1 => 'persist', @@ -300,7 +300,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => true, 'isCascadeRefresh' => true, @@ -328,7 +328,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent( $this ->builder - ->createManyToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createManyToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->cascadeAll() ->fetchExtraLazy() @@ -340,7 +340,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [ 0 => 'remove', 1 => 'persist', @@ -364,7 +364,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => true, 'isCascadeRefresh' => true, @@ -393,7 +393,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateOneToOne() { $this->assertIsFluent( - $this->builder->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createOneToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->cascadeAll() ->fetchExtraLazy() @@ -404,7 +404,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [ 0 => 'remove', 1 => 'persist', @@ -428,7 +428,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => true, 'isCascadeRefresh' => true, @@ -456,7 +456,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->assertIsFluent( $this ->builder - ->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createOneToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->cascadeAll() ->fetchExtraLazy() @@ -468,7 +468,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [ 0 => 'remove', 1 => 'persist', @@ -493,7 +493,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => true, 'isCascadeRefresh' => true, @@ -524,7 +524,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this ->builder - ->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createOneToOne('groups', CmsGroup::class) ->mappedBy('test') ->fetchExtraLazy() ->makePrimaryKey() @@ -534,7 +534,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateManyToMany() { $this->assertIsFluent( - $this->builder->createManyToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createManyToMany('groups', CmsGroup::class) ->setJoinTable('groups_users') ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->addInverseJoinColumn('user_id', 'id') @@ -548,7 +548,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [ 0 => 'remove', @@ -590,7 +590,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => true, 'isCascadeRefresh' => true, @@ -619,7 +619,7 @@ class ClassMetadataBuilderTest extends OrmTestCase { $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $this->builder->createManyToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createManyToMany('groups', CmsGroup::class) ->makePrimaryKey() ->setJoinTable('groups_users') ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') @@ -632,7 +632,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testCreateOneToMany() { $this->assertIsFluent( - $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createOneToMany('groups', CmsGroup::class) ->mappedBy('test') ->setOrderBy(['test']) ->setIndexBy('test') @@ -644,7 +644,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'mappedBy' => 'test', 'orderBy' => [ @@ -654,7 +654,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'type' => 4, 'inversedBy' => NULL, 'isOwningSide' => false, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'fetch' => 2, 'cascade' => [ @@ -673,7 +673,7 @@ class ClassMetadataBuilderTest extends OrmTestCase { $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); - $this->builder->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + $this->builder->createOneToMany('groups', CmsGroup::class) ->makePrimaryKey() ->mappedBy('test') ->setOrderBy(['test']) @@ -685,7 +685,7 @@ class ClassMetadataBuilderTest extends OrmTestCase { $this->assertIsFluent( $this->builder - ->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createOneToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->orphanRemoval() ->build() @@ -695,7 +695,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [], 'fetch' => 2, 'joinColumns' => [ @@ -713,7 +713,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => true, 'isCascadePersist' => false, 'isCascadeRefresh' => false, @@ -740,7 +740,7 @@ class ClassMetadataBuilderTest extends OrmTestCase { $this->assertIsFluent( $this->builder - ->createOneToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createOneToMany('groups', CmsGroup::class) ->mappedBy('test') ->orphanRemoval() ->build() @@ -751,12 +751,12 @@ class ClassMetadataBuilderTest extends OrmTestCase 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'mappedBy' => 'test', 'type' => 4, 'inversedBy' => NULL, 'isOwningSide' => false, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'fetch' => 2, 'cascade' => [], 'isCascadeRemove' => true, @@ -774,7 +774,7 @@ class ClassMetadataBuilderTest extends OrmTestCase $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); $this->builder - ->createManyToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createManyToOne('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->orphanRemoval() ->build(); @@ -783,7 +783,7 @@ class ClassMetadataBuilderTest extends OrmTestCase public function testOrphanRemovalOnManyToMany() { $this->builder - ->createManyToMany('groups', 'Doctrine\Tests\Models\CMS\CmsGroup') + ->createManyToMany('groups', CmsGroup::class) ->addJoinColumn('group_id', 'id', true, false, 'CASCADE') ->orphanRemoval() ->build(); @@ -792,7 +792,7 @@ class ClassMetadataBuilderTest extends OrmTestCase [ 'groups' => [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup', + 'targetEntity' => CmsGroup::class, 'cascade' => [], 'fetch' => 2, 'joinTable' => [ @@ -819,7 +819,7 @@ class ClassMetadataBuilderTest extends OrmTestCase 'mappedBy' => NULL, 'inversedBy' => NULL, 'isOwningSide' => true, - 'sourceEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'sourceEntity' => CmsUser::class, 'isCascadeRemove' => false, 'isCascadePersist' => false, 'isCascadeRefresh' => false, diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index bdfd6893d..d1cf1b48f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -20,7 +20,15 @@ use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\MetadataDriverMock; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\DDC4006\DDC4006User; +use Doctrine\Tests\Models\JoinedInheritanceType\AnotherChildClass; +use Doctrine\Tests\Models\JoinedInheritanceType\ChildClass; +use Doctrine\Tests\Models\JoinedInheritanceType\RootClass; +use Doctrine\Tests\Models\Quote; use Doctrine\Tests\OrmTestCase; +use DoctrineGlobal_Article; class ClassMetadataFactoryTest extends OrmTestCase { @@ -63,18 +71,14 @@ class ClassMetadataFactoryTest extends OrmTestCase { $cm1 = $this->_createValidClassMetadata(); $cm1->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_CUSTOM); - $cm1->customGeneratorDefinition = [ - "class" => "Doctrine\Tests\ORM\Mapping\CustomIdGenerator" - ]; + $cm1->customGeneratorDefinition = ['class' => CustomIdGenerator::class]; $cmf = $this->_createTestFactory(); $cmf->setMetadataForClass($cm1->name, $cm1); $actual = $cmf->getMetadataFor($cm1->name); - $this->assertEquals(ClassMetadata::GENERATOR_TYPE_CUSTOM, - $actual->generatorType); - $this->assertInstanceOf("Doctrine\Tests\ORM\Mapping\CustomIdGenerator", - $actual->idGenerator); + $this->assertEquals(ClassMetadata::GENERATOR_TYPE_CUSTOM, $actual->generatorType); + $this->assertInstanceOf(CustomIdGenerator::class, $actual->idGenerator); } public function testGetMetadataFor_ThrowsExceptionOnUnknownCustomGeneratorClass() @@ -109,10 +113,10 @@ class ClassMetadataFactoryTest extends OrmTestCase $entityManager = $this->_createEntityManager($metadataDriver); $mf = $entityManager->getMetadataFactory(); - $m1 = $mf->getMetadataFor("DoctrineGlobal_Article"); - $h1 = $mf->hasMetadataFor("DoctrineGlobal_Article"); - $h2 = $mf->hasMetadataFor("\DoctrineGlobal_Article"); - $m2 = $mf->getMetadataFor("\DoctrineGlobal_Article"); + $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class); + $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class); + $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class); + $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class); $this->assertNotSame($m1, $m2); $this->assertFalse($h2); @@ -128,17 +132,17 @@ class ClassMetadataFactoryTest extends OrmTestCase $driver = $this->createMock(MappingDriver::class); $driver->expects($this->at(0)) ->method('isTransient') - ->with($this->equalTo('Doctrine\Tests\Models\CMS\CmsUser')) + ->with($this->equalTo(CmsUser::class)) ->will($this->returnValue(true)); $driver->expects($this->at(1)) ->method('isTransient') - ->with($this->equalTo('Doctrine\Tests\Models\CMS\CmsArticle')) + ->with($this->equalTo(CmsArticle::class)) ->will($this->returnValue(false)); $em = $this->_createEntityManager($driver); - $this->assertTrue($em->getMetadataFactory()->isTransient('Doctrine\Tests\Models\CMS\CmsUser')); - $this->assertFalse($em->getMetadataFactory()->isTransient('Doctrine\Tests\Models\CMS\CmsArticle')); + $this->assertTrue($em->getMetadataFactory()->isTransient(CmsUser::class)); + $this->assertFalse($em->getMetadataFactory()->isTransient(CmsArticle::class)); } /** @@ -150,11 +154,11 @@ class ClassMetadataFactoryTest extends OrmTestCase $driver = $this->createMock(MappingDriver::class); $driver->expects($this->at(0)) ->method('isTransient') - ->with($this->equalTo('Doctrine\Tests\Models\CMS\CmsUser')) + ->with($this->equalTo(CmsUser::class)) ->will($this->returnValue(true)); $driver->expects($this->at(1)) ->method('isTransient') - ->with($this->equalTo('Doctrine\Tests\Models\CMS\CmsArticle')) + ->with($this->equalTo(CmsArticle::class)) ->will($this->returnValue(false)); $em = $this->_createEntityManager($driver); @@ -171,16 +175,16 @@ class ClassMetadataFactoryTest extends OrmTestCase $em = $this->_createEntityManager($driver); $cmf->setEntityManager($em); - $rootMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\JoinedInheritanceType\RootClass'); - $childMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\JoinedInheritanceType\ChildClass'); - $anotherChildMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\JoinedInheritanceType\AnotherChildClass'); + $rootMetadata = $cmf->getMetadataFor(RootClass::class); + $childMetadata = $cmf->getMetadataFor(ChildClass::class); + $anotherChildMetadata = $cmf->getMetadataFor(AnotherChildClass::class); $rootDiscriminatorMap = $rootMetadata->discriminatorMap; $childDiscriminatorMap = $childMetadata->discriminatorMap; $anotherChildDiscriminatorMap = $anotherChildMetadata->discriminatorMap; - $rootClass = 'Doctrine\Tests\Models\JoinedInheritanceType\RootClass'; - $childClass = 'Doctrine\Tests\Models\JoinedInheritanceType\ChildClass'; - $anotherChildClass = 'Doctrine\Tests\Models\JoinedInheritanceType\AnotherChildClass'; + $rootClass = RootClass::class; + $childClass = ChildClass::class; + $anotherChildClass = AnotherChildClass::class; $rootClassKey = array_search($rootClass, $rootDiscriminatorMap); $childClassKey = array_search($childClass, $rootDiscriminatorMap); @@ -200,7 +204,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $cmf->expects($this->never()) ->method('addDefaultDiscriminatorMap'); - $rootMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\JoinedInheritanceType\RootClass'); + $rootMetadata = $cmf->getMetadataFor(RootClass::class); } public function testGetAllMetadataWorksWithBadConnection() @@ -257,7 +261,7 @@ class ClassMetadataFactoryTest extends OrmTestCase protected function _createValidClassMetadata() { // Self-made metadata - $cm1 = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1'); + $cm1 = new ClassMetadata(TestEntity1::class); $cm1->initializeReflection(new RuntimeReflectionService()); $cm1->setPrimaryTable(['name' => '`group`']); // Add a mapped field @@ -289,10 +293,10 @@ class ClassMetadataFactoryTest extends OrmTestCase $cmf->setEntityManager($em); - $userMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\Quote\User'); - $phoneMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\Quote\Phone'); - $groupMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\Quote\Group'); - $addressMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\Quote\Address'); + $userMetadata = $cmf->getMetadataFor(Quote\User::class); + $phoneMetadata = $cmf->getMetadataFor(Quote\Phone::class); + $groupMetadata = $cmf->getMetadataFor(Quote\Group::class); + $addressMetadata = $cmf->getMetadataFor(Quote\Address::class); // Phone Class Metadata @@ -443,7 +447,7 @@ class ClassMetadataFactoryTest extends OrmTestCase $em = $this->_createEntityManager($driver); $cmf->setEntityManager($em); - $userMetadata = $cmf->getMetadataFor('Doctrine\Tests\Models\DDC4006\DDC4006User'); + $userMetadata = $cmf->getMetadataFor(DDC4006User::class); $this->assertTrue($userMetadata->isIdGeneratorIdentity()); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php index 424cafb94..bf268cf82 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php @@ -17,7 +17,7 @@ class ClassMetadataLoadEventTest extends OrmTestCase $metadataFactory = $em->getMetadataFactory(); $evm = $em->getEventManager(); $evm->addEventListener(Events::loadClassMetadata, $this); - $classMetadata = $metadataFactory->getMetadataFor('Doctrine\Tests\ORM\Mapping\LoadEventTestEntity'); + $classMetadata = $metadataFactory->getMetadataFor(LoadEventTestEntity::class); $this->assertTrue($classMetadata->hasField('about')); $this->assertArrayHasKey('about', $classMetadata->reflFields); $this->assertInstanceOf('ReflectionProperty', $classMetadata->reflFields['about']); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index bfaec8041..1dac953c2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -4,13 +4,21 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\Common\Persistence\Mapping\StaticReflectionService; -use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Events; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\DefaultNamingStrategy; use Doctrine\ORM\Mapping\MappingException; use Doctrine\ORM\Mapping\UnderscoreNamingStrategy; +use Doctrine\Tests\Models\CMS; +use Doctrine\Tests\Models\Company\CompanyContract; +use Doctrine\Tests\Models\CustomType\CustomTypeParent; +use Doctrine\Tests\Models\DDC117\DDC117Article; +use Doctrine\Tests\Models\DDC117\DDC117ArticleDetails; +use Doctrine\Tests\Models\DDC964\DDC964Admin; +use Doctrine\Tests\Models\DDC964\DDC964Guest; +use Doctrine\Tests\Models\Routing\RoutingLeg; use Doctrine\Tests\OrmTestCase; -use Doctrine\Tests\Proxies\__CG__\Doctrine\Tests\Models\CMS\CmsUser; +use DoctrineGlobal_Article; require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php'; @@ -18,14 +26,14 @@ class ClassMetadataTest extends OrmTestCase { public function testClassMetadataInstanceSerialization() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); // Test initial state $this->assertTrue(count($cm->getReflectionProperties()) == 0); $this->assertInstanceOf('ReflectionClass', $cm->reflClass); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->rootEntityName); + $this->assertEquals(CMS\CmsUser::class, $cm->name); + $this->assertEquals(CMS\CmsUser::class, $cm->rootEntityName); $this->assertEquals([], $cm->subClasses); $this->assertEquals([], $cm->parentClasses); $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $cm->inheritanceType); @@ -48,27 +56,26 @@ class ClassMetadataTest extends OrmTestCase // Check state $this->assertTrue(count($cm->getReflectionProperties()) > 0); $this->assertEquals('Doctrine\Tests\Models\CMS', $cm->namespace); - $this->assertInstanceOf('ReflectionClass', $cm->reflClass); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); + $this->assertInstanceOf(\ReflectionClass::class, $cm->reflClass); + $this->assertEquals(CMS\CmsUser::class, $cm->name); $this->assertEquals('UserParent', $cm->rootEntityName); - $this->assertEquals( - ['Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'], $cm->subClasses); + $this->assertEquals([CMS\One::class, CMS\Two::class, CMS\Three::class], $cm->subClasses); $this->assertEquals(['UserParent'], $cm->parentClasses); - $this->assertEquals('Doctrine\Tests\Models\CMS\UserRepository', $cm->customRepositoryClassName); + $this->assertEquals(CMS\UserRepository::class, $cm->customRepositoryClassName); $this->assertEquals(['name' => 'disc', 'type' => 'integer', 'fieldName' => 'disc'], $cm->discriminatorColumn); $this->assertTrue($cm->associationMappings['phonenumbers']['type'] == ClassMetadata::ONE_TO_ONE); $this->assertEquals(1, count($cm->associationMappings)); $oneOneMapping = $cm->getAssociationMapping('phonenumbers'); $this->assertTrue($oneOneMapping['fetch'] == ClassMetadata::FETCH_LAZY); $this->assertEquals('phonenumbers', $oneOneMapping['fieldName']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsAddress', $oneOneMapping['targetEntity']); + $this->assertEquals(CMS\CmsAddress::class, $oneOneMapping['targetEntity']); $this->assertTrue($cm->isReadOnly); $this->assertEquals(['dql' => ['name'=>'dql','query'=>'foo','dql'=>'foo']], $cm->namedQueries); } public function testFieldIsNullable() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); // Explicit Nullable @@ -110,7 +117,7 @@ class ClassMetadataTest extends OrmTestCase public function testMapManyToManyJoinTableDefaults() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( [ @@ -132,7 +139,7 @@ class ClassMetadataTest extends OrmTestCase public function testSerializeManyToManyJoinTableCascade() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( [ @@ -141,7 +148,7 @@ class ClassMetadataTest extends OrmTestCase ] ); - /* @var $assoc \Doctrine\ORM\Mapping\ManyToManyMapping */ + /* @var $assoc \Doctrine\ORM\Mapping\ManyToMany */ $assoc = $cm->associationMappings['groups']; $assoc = unserialize(serialize($assoc)); @@ -186,7 +193,7 @@ class ClassMetadataTest extends OrmTestCase $field['fieldName'] = 'foo'; $field['type'] = 'string'; - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); @@ -195,7 +202,7 @@ class ClassMetadataTest extends OrmTestCase public function testGetSingleIdentifierFieldName_MultipleIdentifierEntity_ThrowsException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->isIdentifierComposite = true; @@ -205,7 +212,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateAssociationMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $a1 = ['fieldName' => 'foo', 'sourceEntity' => 'stdClass', 'targetEntity' => 'stdClass', 'mappedBy' => 'foo']; @@ -218,7 +225,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateColumnName_ThrowsMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); @@ -229,7 +236,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateColumnName_DiscriminatorColumn_ThrowsMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); @@ -240,7 +247,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateColumnName_DiscriminatorColumn2_ThrowsMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->setDiscriminatorColumn(['name' => 'name']); @@ -251,7 +258,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateFieldAndAssociationMapping1_ThrowsException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name', 'columnName' => 'name']); @@ -262,7 +269,7 @@ class ClassMetadataTest extends OrmTestCase public function testDuplicateFieldAndAssociationMapping2_ThrowsException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapOneToOne(['fieldName' => 'name', 'targetEntity' => 'CmsUser']); @@ -276,7 +283,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testGetTemporaryTableNameSchema() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->setTableName('foo.bar'); @@ -286,7 +293,7 @@ class ClassMetadataTest extends OrmTestCase public function testDefaultTableName() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); // When table's name is not given @@ -296,18 +303,18 @@ class ClassMetadataTest extends OrmTestCase $this->assertEquals('CmsUser', $cm->getTableName()); $this->assertEquals('CmsUser', $cm->table['name']); - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $cm = new ClassMetadata(CMS\CmsAddress::class); $cm->initializeReflection(new RuntimeReflectionService()); // When joinTable's name is not given $cm->mapManyToMany( [ - 'fieldName' => 'user', - 'targetEntity' => 'CmsUser', - 'inversedBy' => 'users', - 'joinTable' => [ - 'joinColumns' => [['referencedColumnName' => 'id']], - 'inverseJoinColumns' => [['referencedColumnName' => 'id']] - ] + 'fieldName' => 'user', + 'targetEntity' => 'CmsUser', + 'inversedBy' => 'users', + 'joinTable' => [ + 'joinColumns' => [['referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['referencedColumnName' => 'id']] + ] ] ); $this->assertEquals('cmsaddress_cmsuser', $cm->associationMappings['user']['joinTable']['name']); @@ -315,7 +322,7 @@ class ClassMetadataTest extends OrmTestCase public function testDefaultJoinColumnName() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $cm = new ClassMetadata(CMS\CmsAddress::class); $cm->initializeReflection(new RuntimeReflectionService()); // this is really dirty, but it's the simplest way to test whether @@ -329,7 +336,7 @@ class ClassMetadataTest extends OrmTestCase ); $this->assertEquals('user_id', $cm->associationMappings['user']['joinColumns'][0]['name']); - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $cm = new ClassMetadata(CMS\CmsAddress::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( [ @@ -337,10 +344,10 @@ class ClassMetadataTest extends OrmTestCase 'targetEntity' => 'CmsUser', 'inversedBy' => 'users', 'joinTable' => [ - 'name' => 'user_CmsUser', - 'joinColumns' => [['referencedColumnName' => 'id']], - 'inverseJoinColumns' => [['referencedColumnName' => 'id']] - ] + 'name' => 'user_CmsUser', + 'joinColumns' => [['referencedColumnName' => 'id']], + 'inverseJoinColumns' => [['referencedColumnName' => 'id']] + ] ] ); $this->assertEquals('cmsaddress_id', $cm->associationMappings['user']['joinTable']['joinColumns'][0]['name']); @@ -353,8 +360,8 @@ class ClassMetadataTest extends OrmTestCase public function testUnderscoreNamingStrategyDefaults() { $namingStrategy = new UnderscoreNamingStrategy(CASE_UPPER); - $oneToOneMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); - $manyToManyMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); + $oneToOneMetadata = new ClassMetadata(CMS\CmsAddress::class, $namingStrategy); + $manyToManyMetadata = new ClassMetadata(CMS\CmsAddress::class, $namingStrategy); $oneToOneMetadata->mapOneToOne( [ @@ -392,7 +399,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_Article', $namingStrategy); - $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']); + $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => CMS\CmsUser::class]); $this->assertEquals('DOCTRINE_GLOBAL_ARTICLE_CMS_USER', $cm->associationMappings['author']['joinTable']['name']); } @@ -401,7 +408,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testSetMultipleIdentifierSetsComposite() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name']); @@ -416,11 +423,11 @@ class ClassMetadataTest extends OrmTestCase */ public function testMappingNotFound() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(MappingException::class); - $this->expectExceptionMessage("No mapping found for field 'foo' on class 'Doctrine\Tests\Models\CMS\CmsUser'."); + $this->expectExceptionMessage("No mapping found for field 'foo' on class '" . CMS\CmsUser::class . "'."); $cm->getFieldMapping('foo'); } @@ -433,7 +440,7 @@ class ClassMetadataTest extends OrmTestCase $cm = new ClassMetadata('DoctrineGlobal_Article'); $cm->initializeReflection(new RuntimeReflectionService()); - $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser']); + $cm->mapManyToMany(['fieldName' => 'author', 'targetEntity' => CMS\CmsUser::class]); $this->assertEquals('doctrineglobal_article_cmsuser', $cm->associationMappings['author']['joinTable']['name']); } @@ -443,14 +450,14 @@ class ClassMetadataTest extends OrmTestCase */ public function testMapIdentifierAssociation() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = new ClassMetadata(DDC117ArticleDetails::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapOneToOne( [ 'fieldName' => 'article', 'id' => true, - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [], ] ); @@ -464,7 +471,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testOrphanRemovalIdentifierAssociation() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = new ClassMetadata(DDC117ArticleDetails::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(MappingException::class); @@ -474,7 +481,7 @@ class ClassMetadataTest extends OrmTestCase [ 'fieldName' => 'article', 'id' => true, - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'orphanRemoval' => true, 'joinColumns' => [], ] @@ -486,7 +493,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInverseIdentifierAssociation() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = new ClassMetadata(DDC117ArticleDetails::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(MappingException::class); @@ -497,7 +504,7 @@ class ClassMetadataTest extends OrmTestCase 'fieldName' => 'article', 'id' => true, 'mappedBy' => 'details', // INVERSE! - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [], ] ); @@ -508,7 +515,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testIdentifierAssociationManyToMany() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = new ClassMetadata(DDC117ArticleDetails::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(MappingException::class); @@ -518,7 +525,7 @@ class ClassMetadataTest extends OrmTestCase [ 'fieldName' => 'article', 'id' => true, - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [], ] ); @@ -530,9 +537,9 @@ class ClassMetadataTest extends OrmTestCase public function testEmptyFieldNameThrowsException() { $this->expectException(MappingException::class); - $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity 'Doctrine\Tests\Models\CMS\CmsUser'."); + $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'."); - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => '']); @@ -540,7 +547,7 @@ class ClassMetadataTest extends OrmTestCase public function testRetrievalOfNamedQueries() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); @@ -561,7 +568,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testRetrievalOfResultSetMappings() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); @@ -572,7 +579,7 @@ class ClassMetadataTest extends OrmTestCase 'name' => 'find-all', 'entities' => [ [ - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CMS\CmsUser::class, ], ], ] @@ -583,7 +590,7 @@ class ClassMetadataTest extends OrmTestCase public function testExistanceOfNamedQuery() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); @@ -603,7 +610,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testRetrieveOfNamedNativeQuery() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addNamedNativeQuery( @@ -611,7 +618,7 @@ class ClassMetadataTest extends OrmTestCase 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', 'resultSetMapping' => 'result-mapping-name', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, ] ); @@ -627,12 +634,12 @@ class ClassMetadataTest extends OrmTestCase $mapping = $cm->getNamedNativeQuery('find-all'); $this->assertEquals('SELECT * FROM cms_users', $mapping['query']); $this->assertEquals('result-mapping-name', $mapping['resultSetMapping']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $mapping['resultClass']); + $this->assertEquals(CMS\CmsUser::class, $mapping['resultClass']); $mapping = $cm->getNamedNativeQuery('find-by-id'); $this->assertEquals('SELECT * FROM cms_users WHERE id = ?', $mapping['query']); $this->assertEquals('result-mapping-name', $mapping['resultSetMapping']); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $mapping['resultClass']); + $this->assertEquals(CMS\CmsUser::class, $mapping['resultClass']); } /** @@ -640,7 +647,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testRetrieveOfSqlResultSetMapping() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addSqlResultSetMapping( @@ -661,7 +668,7 @@ class ClassMetadataTest extends OrmTestCase ] ], [ - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsEmail', + 'entityClass' => CMS\CmsEmail::class, 'fields' => [ [ 'name' => 'id', @@ -684,11 +691,11 @@ class ClassMetadataTest extends OrmTestCase $mapping = $cm->getSqlResultSetMapping('find-all'); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $mapping['entities'][0]['entityClass']); + $this->assertEquals(CMS\CmsUser::class, $mapping['entities'][0]['entityClass']); $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); $this->assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsEmail', $mapping['entities'][1]['entityClass']); + $this->assertEquals(CMS\CmsEmail::class, $mapping['entities'][1]['entityClass']); $this->assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]); $this->assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]); @@ -700,7 +707,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testExistanceOfSqlResultSetMapping() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addSqlResultSetMapping( @@ -708,7 +715,7 @@ class ClassMetadataTest extends OrmTestCase 'name' => 'find-all', 'entities' => [ [ - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CMS\CmsUser::class, ], ], ] @@ -723,7 +730,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testExistanceOfNamedNativeQuery() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); @@ -731,7 +738,7 @@ class ClassMetadataTest extends OrmTestCase [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, 'resultSetMapping' => 'result-mapping-name' ] ); @@ -742,7 +749,7 @@ class ClassMetadataTest extends OrmTestCase public function testRetrieveOfNamedQuery() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); @@ -761,7 +768,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testRetrievalOfNamedNativeQueries() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->assertEquals(0, count($cm->getNamedNativeQueries())); @@ -770,7 +777,7 @@ class ClassMetadataTest extends OrmTestCase [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, 'resultSetMapping' => 'result-mapping-name' ] ); @@ -783,7 +790,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testSerializeEntityListeners() { - $metadata = new ClassMetadata('Doctrine\Tests\Models\Company\CompanyContract'); + $metadata = new ClassMetadata(CompanyContract::class); $metadata->initializeReflection(new RuntimeReflectionService()); $metadata->addEntityListener(Events::prePersist, 'CompanyContractListener', 'prePersistHandler'); @@ -801,7 +808,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testNamingCollisionNamedQueryShouldThrowException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addNamedQuery( @@ -827,14 +834,14 @@ class ClassMetadataTest extends OrmTestCase */ public function testNamingCollisionNamedNativeQueryShouldThrowException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addNamedNativeQuery( [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, 'resultSetMapping' => 'result-mapping-name' ] ); @@ -843,7 +850,7 @@ class ClassMetadataTest extends OrmTestCase [ 'name' => 'find-all', 'query' => 'SELECT * FROM cms_users', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, 'resultSetMapping' => 'result-mapping-name' ] ); @@ -857,7 +864,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testNamingCollisionSqlResultSetMappingShouldThrowException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addSqlResultSetMapping( @@ -865,7 +872,7 @@ class ClassMetadataTest extends OrmTestCase 'name' => 'find-all', 'entities' => [ [ - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CMS\CmsUser::class, ], ], ] @@ -876,7 +883,7 @@ class ClassMetadataTest extends OrmTestCase 'name' => 'find-all', 'entities' => [ [ - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CMS\CmsUser::class, ], ], ] @@ -888,11 +895,11 @@ class ClassMetadataTest extends OrmTestCase */ public function testClassCaseSensitivity() { - $user = new CmsUser(); - $cm = new ClassMetadata('DOCTRINE\TESTS\MODELS\CMS\CMSUSER'); + $user = new CMS\CmsUser(); + $cm = new ClassMetadata(strtoupper(CMS\CmsUser::class)); $cm->initializeReflection(new RuntimeReflectionService()); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); + $this->assertEquals(CMS\CmsUser::class, $cm->name); } /** @@ -900,12 +907,12 @@ class ClassMetadataTest extends OrmTestCase */ public function testLifecycleCallbackNotFound() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addLifecycleCallback('notfound', 'postLoad'); $this->expectException(MappingException::class); - $this->expectExceptionMessage("Entity 'Doctrine\Tests\Models\CMS\CmsUser' has no method 'notfound' to be registered as lifecycle callback."); + $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no method 'notfound' to be registered as lifecycle callback."); $cm->validateLifecycleCallbacks(new RuntimeReflectionService()); } @@ -915,12 +922,12 @@ class ClassMetadataTest extends OrmTestCase */ public function testTargetEntityNotFound() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass']); $this->expectException(MappingException::class); - $this->expectExceptionMessage("The target-entity Doctrine\Tests\Models\CMS\UnknownClass cannot be found in 'Doctrine\Tests\Models\CMS\CmsUser#address'."); + $this->expectExceptionMessage("The target-entity Doctrine\\Tests\\Models\\CMS\\UnknownClass cannot be found in '" . CMS\CmsUser::class . "#address'."); $cm->validateAssociations(); } @@ -933,7 +940,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testNameIsMandatoryForNamedQueryMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addNamedQuery( [ @@ -950,12 +957,12 @@ class ClassMetadataTest extends OrmTestCase */ public function testNameIsMandatoryForNameNativeQueryMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addNamedQuery( [ 'query' => 'SELECT * FROM cms_users', - 'resultClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'resultClass' => CMS\CmsUser::class, 'resultSetMapping' => 'result-mapping-name' ] ); @@ -969,7 +976,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testNameIsMandatoryForEntityNameSqlResultSetMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addSqlResultSetMapping( [ @@ -989,7 +996,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testNameIsMandatoryForDiscriminatorColumnsMappingException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->setDiscriminatorColumn([]); } @@ -1002,9 +1009,9 @@ class ClassMetadataTest extends OrmTestCase public function testFullyQualifiedClassNameShouldBeGivenToNamingStrategy() { $namingStrategy = new MyNamespacedNamingStrategy(); - $addressMetadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); - $articleMetadata = new ClassMetadata('DoctrineGlobal_Article', $namingStrategy); - $routingMetadata = new ClassMetadata('Doctrine\Tests\Models\Routing\RoutingLeg',$namingStrategy); + $addressMetadata = new ClassMetadata(CMS\CmsAddress::class, $namingStrategy); + $articleMetadata = new ClassMetadata(DoctrineGlobal_Article::class, $namingStrategy); + $routingMetadata = new ClassMetadata(RoutingLeg::class, $namingStrategy); $addressMetadata->initializeReflection(new RuntimeReflectionService()); $articleMetadata->initializeReflection(new RuntimeReflectionService()); @@ -1020,7 +1027,7 @@ class ClassMetadataTest extends OrmTestCase $articleMetadata->mapManyToMany( [ 'fieldName' => 'author', - 'targetEntity' => 'Doctrine\Tests\Models\CMS\CmsUser' + 'targetEntity' => CMS\CmsUser::class ] ); @@ -1036,7 +1043,7 @@ class ClassMetadataTest extends OrmTestCase public function testFullyQualifiedClassNameShouldBeGivenToNamingStrategyPropertyToColumnName() { $namingStrategy = new MyPrefixNamingStrategy(); - $metadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy); + $metadata = new ClassMetadata(CMS\CmsAddress::class, $namingStrategy); $metadata->initializeReflection(new RuntimeReflectionService()); @@ -1055,11 +1062,11 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidCascade() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(MappingException::class); - $this->expectExceptionMessage("You have specified invalid cascade options for Doctrine\Tests\Models\CMS\CmsUser::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'"); + $this->expectExceptionMessage("You have specified invalid cascade options for " . CMS\CmsUser::class . "::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'"); $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => ['invalid']]); } @@ -1071,7 +1078,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidPropertyAssociationOverrideNameException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Admin'); + $cm = new ClassMetadata(DDC964Admin::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'DDC964Address']); @@ -1085,7 +1092,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidPropertyAttributeOverrideNameException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest'); + $cm = new ClassMetadata(DDC964Guest::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name']); @@ -1099,7 +1106,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidOverrideAttributeFieldTypeException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\DDC964\DDC964Guest'); + $cm = new ClassMetadata(DDC964Guest::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapField(['fieldName' => 'name', 'type'=>'string']); @@ -1114,7 +1121,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidEntityListenerClassException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addEntityListener(Events::postLoad, '\InvalidClassName', 'postLoadHandler'); @@ -1128,7 +1135,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testInvalidEntityListenerMethodException() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->addEntityListener(Events::postLoad, '\Doctrine\Tests\Models\Company\CompanyContractListener', 'invalidMethod'); @@ -1136,7 +1143,7 @@ class ClassMetadataTest extends OrmTestCase public function testManyToManySelfReferencingNamingStrategyDefaults() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CustomType\CustomTypeParent'); + $cm = new ClassMetadata(CustomTypeParent::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->mapManyToMany( [ @@ -1163,7 +1170,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testSetSequenceGeneratorThrowsExceptionWhenSequenceNameIsMissing() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); @@ -1175,7 +1182,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testQuotedSequenceName() { - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CMS\CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->setSequenceGeneratorDefinition(['sequenceName' => '`foo`']); @@ -1188,7 +1195,7 @@ class ClassMetadataTest extends OrmTestCase */ public function testIsIdentifierMappedSuperClass() { - $class = new ClassMetadata(__NAMESPACE__ . '\\DDC2700MappedSuperClass'); + $class = new ClassMetadata(DDC2700MappedSuperClass::class); $this->assertFalse($class->isIdentifier('foo')); } @@ -1198,9 +1205,9 @@ class ClassMetadataTest extends OrmTestCase */ public function testCanInstantiateInternalPhpClassSubclass() { - $classMetadata = new ClassMetadata(__NAMESPACE__ . '\\MyArrayObjectEntity'); + $classMetadata = new ClassMetadata(MyArrayObjectEntity::class); - $this->assertInstanceOf(__NAMESPACE__ . '\\MyArrayObjectEntity', $classMetadata->newInstance()); + $this->assertInstanceOf(MyArrayObjectEntity::class, $classMetadata->newInstance()); } /** @@ -1209,21 +1216,21 @@ class ClassMetadataTest extends OrmTestCase public function testCanInstantiateInternalPhpClassSubclassFromUnserializedMetadata() { /* @var $classMetadata ClassMetadata */ - $classMetadata = unserialize(serialize(new ClassMetadata(__NAMESPACE__ . '\\MyArrayObjectEntity'))); + $classMetadata = unserialize(serialize(new ClassMetadata(MyArrayObjectEntity::class))); $classMetadata->wakeupReflection(new RuntimeReflectionService()); - $this->assertInstanceOf(__NAMESPACE__ . '\\MyArrayObjectEntity', $classMetadata->newInstance()); + $this->assertInstanceOf(MyArrayObjectEntity::class, $classMetadata->newInstance()); } public function testWakeupReflectionWithEmbeddableAndStaticReflectionService() { - $classMetadata = new ClassMetadata('Doctrine\Tests\ORM\Mapping\TestEntity1'); + $classMetadata = new ClassMetadata(TestEntity1::class); $classMetadata->mapEmbedded( [ 'fieldName' => 'test', - 'class' => 'Doctrine\Tests\ORM\Mapping\TestEntity1', + 'class' => TestEntity1::class, 'columnPrefix' => false, ] ); @@ -1231,7 +1238,7 @@ class ClassMetadataTest extends OrmTestCase $field = [ 'fieldName' => 'test.embeddedProperty', 'type' => 'string', - 'originalClass' => 'Doctrine\Tests\ORM\Mapping\TestEntity1', + 'originalClass' => TestEntity1::class, 'declaredField' => 'test', 'originalField' => 'embeddedProperty' ]; @@ -1244,7 +1251,7 @@ class ClassMetadataTest extends OrmTestCase public function testGetColumnNamesWithGivenFieldNames() { - $metadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $metadata = new ClassMetadata(CMS\CmsUser::class); $metadata->initializeReflection(new RuntimeReflectionService()); $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'columnName' => 'foo']); diff --git a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php index 9c20cb8b9..765518c41 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Mapping; +use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\ORM\Mapping\DefaultQuoteStrategy; use Doctrine\Tests\Models\NonPublicSchemaJoins\User as NonPublicSchemaUser; use Doctrine\Tests\OrmTestCase; @@ -20,10 +21,10 @@ class DefaultQuoteStrategyTest extends OrmTestCase public function testGetJoinTableName() { $em = $this->_getTestEntityManager(); - $metadata = $em->getClassMetadata(NonPublicSchemaUser::CLASSNAME); - /* @var $platform \Doctrine\DBAL\Platforms\AbstractPlatform */ + $metadata = $em->getClassMetadata(NonPublicSchemaUser::class); $strategy = new DefaultQuoteStrategy(); - $platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform'); + /* @var $platform AbstractPlatform */ + $platform = $this->getMockForAbstractClass(AbstractPlatform::class); $this->assertSame( 'readers.author_reader', diff --git a/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php b/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php index 67a0ebce0..0ec0798aa 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/FieldBuilderTest.php @@ -4,13 +4,14 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; class FieldBuilderTest extends OrmTestCase { public function testCustomIdGeneratorCanBeSet() { - $cmBuilder = new ClassMetadataBuilder(new ClassMetadataInfo('Doctrine\Tests\Models\CMS\CmsUser')); + $cmBuilder = new ClassMetadataBuilder(new ClassMetadataInfo(CmsUser::class)); $fieldBuilder = $cmBuilder->createField('aField', 'string'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php index cfc7f0cc8..39b5525b2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php @@ -2,8 +2,10 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\Common\Persistence\Mapping\Driver\PHPDriver; +use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\Tests\Models\DDC889\DDC889Class; +use Doctrine\Tests\ORM\Mapping; class PHPMappingDriverTest extends AbstractMappingDriverTest { @@ -30,7 +32,7 @@ class PHPMappingDriverTest extends AbstractMappingDriverTest */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() { - $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class'); + $this->createClassMetadata(DDC889Class::class); } /** @@ -39,10 +41,9 @@ class PHPMappingDriverTest extends AbstractMappingDriverTest */ public function testFailingSecondLevelCacheAssociation() { - $className = 'Doctrine\Tests\ORM\Mapping\PHPSLC'; $mappingDriver = $this->_loadDriver(); - $class = new ClassMetadata($className); - $mappingDriver->loadMetadataForClass($className, $class); + $class = new ClassMetadata(Mapping\PHPSLC::class); + $mappingDriver->loadMetadataForClass(Mapping\PHPSLC::class, $class); } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php index 0afb3698d..2af97169c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php @@ -3,8 +3,13 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; -use Doctrine\ORM\Mapping\DefaultQuoteStrategy; use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Mapping\DefaultQuoteStrategy; +use Doctrine\ORM\Mapping\QuoteStrategy; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\DDC117\DDC117Article; +use Doctrine\Tests\Models\DDC117\DDC117ArticleDetails; use Doctrine\Tests\OrmTestCase; /** @@ -48,18 +53,18 @@ class QuoteStrategyTest extends OrmTestCase $em = $this->_getTestEntityManager(); $config = $em->getConfiguration(); - $this->assertInstanceOf('Doctrine\ORM\Mapping\QuoteStrategy', $config->getQuoteStrategy()); - $this->assertInstanceOf('Doctrine\ORM\Mapping\DefaultQuoteStrategy', $config->getQuoteStrategy()); + $this->assertInstanceOf(QuoteStrategy::class, $config->getQuoteStrategy()); + $this->assertInstanceOf(DefaultQuoteStrategy::class, $config->getQuoteStrategy()); $config->setQuoteStrategy(new MyQuoteStrategy()); - $this->assertInstanceOf('Doctrine\ORM\Mapping\QuoteStrategy', $config->getQuoteStrategy()); - $this->assertInstanceOf('Doctrine\Tests\ORM\Mapping\MyQuoteStrategy', $config->getQuoteStrategy()); + $this->assertInstanceOf(QuoteStrategy::class, $config->getQuoteStrategy()); + $this->assertInstanceOf(MyQuoteStrategy::class, $config->getQuoteStrategy()); } public function testGetColumnName() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = $this->createClassMetadata(CmsUser::class); $cm->mapField(['fieldName' => 'name', 'columnName' => '`name`']); $cm->mapField(['fieldName' => 'id', 'columnName' => 'id']); @@ -69,20 +74,20 @@ class QuoteStrategyTest extends OrmTestCase public function testGetTableName() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = $this->createClassMetadata(CmsUser::class); $cm->setPrimaryTable(['name'=>'`cms_user`']); - $this->assertEquals('"cms_user"' ,$this->strategy->getTableName($cm, $this->platform)); + $this->assertEquals('"cms_user"', $this->strategy->getTableName($cm, $this->platform)); - $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm = new ClassMetadata(CmsUser::class); $cm->initializeReflection(new RuntimeReflectionService()); $cm->setPrimaryTable(['name'=>'cms_user']); - $this->assertEquals('cms_user' ,$this->strategy->getTableName($cm, $this->platform)); + $this->assertEquals('cms_user', $this->strategy->getTableName($cm, $this->platform)); } public function testJoinTableName() { - $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $cm1 = $this->createClassMetadata(CmsAddress::class); + $cm2 = $this->createClassMetadata(CmsAddress::class); $cm1->mapManyToMany( [ @@ -113,8 +118,8 @@ class QuoteStrategyTest extends OrmTestCase public function testIdentifierColumnNames() { - $cm1 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); - $cm2 = $this->createClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $cm1 = $this->createClassMetadata(CmsAddress::class); + $cm2 = $this->createClassMetadata(CmsAddress::class); $cm1->mapField( [ @@ -148,13 +153,13 @@ class QuoteStrategyTest extends OrmTestCase public function testQuoteIdentifierJoinColumns() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = $this->createClassMetadata(DDC117ArticleDetails::class); $cm->mapOneToOne( [ 'id' => true, 'fieldName' => 'article', - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [ [ 'name' => '`article`' @@ -168,13 +173,13 @@ class QuoteStrategyTest extends OrmTestCase public function testJoinColumnName() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = $this->createClassMetadata(DDC117ArticleDetails::class); $cm->mapOneToOne( [ 'id' => true, 'fieldName' => 'article', - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [ [ 'name' => '`article`' @@ -189,13 +194,13 @@ class QuoteStrategyTest extends OrmTestCase public function testReferencedJoinColumnName() { - $cm = $this->createClassMetadata('Doctrine\Tests\Models\DDC117\DDC117ArticleDetails'); + $cm = $this->createClassMetadata(DDC117ArticleDetails::class); $cm->mapOneToOne( [ 'id' => true, 'fieldName' => 'article', - 'targetEntity' => 'Doctrine\Tests\Models\DDC117\DDC117Article', + 'targetEntity' => DDC117Article::class, 'joinColumns' => [ [ 'name' => '`article`' diff --git a/tests/Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php b/tests/Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php index 1b18deb11..06a895159 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php @@ -20,7 +20,7 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase public function testRetrievesProperties() { $properties = (new ReflectionPropertiesGetter(new RuntimeReflectionService())) - ->getProperties(ClassWithMixedProperties::CLASSNAME); + ->getProperties(ClassWithMixedProperties::class); $this->assertCount(5, $properties); @@ -32,7 +32,7 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase public function testRetrievedInstancesAreNotStatic() { $properties = (new ReflectionPropertiesGetter(new RuntimeReflectionService())) - ->getProperties(ClassWithMixedProperties::CLASSNAME); + ->getProperties(ClassWithMixedProperties::class); foreach ($properties as $property) { $this->assertFalse($property->isStatic()); @@ -42,18 +42,18 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase public function testExpectedKeys() { $properties = (new ReflectionPropertiesGetter(new RuntimeReflectionService())) - ->getProperties(ClassWithMixedProperties::CLASSNAME); + ->getProperties(ClassWithMixedProperties::class); $this->assertArrayHasKey( - "\0" . ClassWithMixedProperties::CLASSNAME . "\0" . 'privateProperty', + "\0" . ClassWithMixedProperties::class . "\0" . 'privateProperty', $properties ); $this->assertArrayHasKey( - "\0" . ClassWithMixedProperties::CLASSNAME . "\0" . 'privatePropertyOverride', + "\0" . ClassWithMixedProperties::class . "\0" . 'privatePropertyOverride', $properties ); $this->assertArrayHasKey( - "\0" . ParentClass::CLASSNAME . "\0" . 'privatePropertyOverride', + "\0" . ParentClass::class . "\0" . 'privatePropertyOverride', $properties ); $this->assertArrayHasKey( @@ -70,7 +70,7 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase { $object = new ClassWithMixedProperties(); $properties = (new ReflectionPropertiesGetter(new RuntimeReflectionService())) - ->getProperties(ClassWithMixedProperties::CLASSNAME); + ->getProperties(ClassWithMixedProperties::class); foreach ($properties as $property) { $this->assertSame($property->getName(), $property->getValue($object)); @@ -82,8 +82,8 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase $getter = (new ReflectionPropertiesGetter(new RuntimeReflectionService())); $this->assertSame( - $getter->getProperties(ClassWithMixedProperties::CLASSNAME), - $getter->getProperties(ClassWithMixedProperties::CLASSNAME) + $getter->getProperties(ClassWithMixedProperties::class), + $getter->getProperties(ClassWithMixedProperties::class) ); } @@ -95,10 +95,10 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase $reflectionService ->expects($this->exactly(2)) ->method('getClass') - ->with($this->logicalOr(ClassWithMixedProperties::CLASSNAME, ParentClass::CLASSNAME)) + ->with($this->logicalOr(ClassWithMixedProperties::class, ParentClass::class)) ->will($this->returnValueMap([ - [ClassWithMixedProperties::CLASSNAME, new ReflectionClass(ClassWithMixedProperties::CLASSNAME)], - [ParentClass::CLASSNAME, new ReflectionClass(ParentClass::CLASSNAME)], + [ClassWithMixedProperties::class, new ReflectionClass(ClassWithMixedProperties::class)], + [ParentClass::class, new ReflectionClass(ParentClass::class)], ])); $reflectionService @@ -107,7 +107,7 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase $getter = (new ReflectionPropertiesGetter($reflectionService)); - $this->assertEmpty($getter->getProperties(ClassWithMixedProperties::CLASSNAME)); + $this->assertEmpty($getter->getProperties(ClassWithMixedProperties::class)); } public function testPropertyGetterWillSkipClassesNotRetrievedByTheRuntimeReflectionService() @@ -118,12 +118,12 @@ class ReflectionPropertiesGetterTest extends PHPUnit_Framework_TestCase $reflectionService ->expects($this->once()) ->method('getClass') - ->with(ClassWithMixedProperties::CLASSNAME); + ->with(ClassWithMixedProperties::class); $reflectionService->expects($this->never())->method('getAccessibleProperty'); $getter = (new ReflectionPropertiesGetter($reflectionService)); - $this->assertEmpty($getter->getProperties(ClassWithMixedProperties::CLASSNAME)); + $this->assertEmpty($getter->getProperties(ClassWithMixedProperties::class)); } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php index d6f629149..04ed194a6 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ReflectionEmbeddedPropertyTest.php @@ -4,7 +4,11 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Instantiator\Instantiator; use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty; +use Doctrine\Tests\Models\Generic\BooleanModel; use Doctrine\Tests\Models\Mapping\Entity; +use Doctrine\Tests\Models\Reflection\AbstractEmbeddable; +use Doctrine\Tests\Models\Reflection\ArrayObjectExtendingClass; +use Doctrine\Tests\Models\Reflection\ConcreteEmbeddable; use ReflectionProperty; /** @@ -71,72 +75,36 @@ class ReflectionEmbeddedPropertyTest extends \PHPUnit_Framework_TestCase { return [ [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', - 'id' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', - 'id' - ), - 'Doctrine\\Tests\\Models\\Generic\\BooleanModel' + $this->getReflectionProperty(BooleanModel::class, 'id'), + $this->getReflectionProperty(BooleanModel::class, 'id'), + BooleanModel::class ], // reflection on embeddables that have properties defined in abstract ancestors: [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', - 'id' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\AbstractEmbeddable', - 'propertyInAbstractClass' - ), - 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' + $this->getReflectionProperty(BooleanModel::class, 'id'), + $this->getReflectionProperty(AbstractEmbeddable::class, 'propertyInAbstractClass'), + ConcreteEmbeddable::class ], [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Generic\\BooleanModel', - 'id' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable', - 'propertyInConcreteClass' - ), - 'Doctrine\\Tests\\Models\\Reflection\\ConcreteEmbeddable' + $this->getReflectionProperty(BooleanModel::class, 'id'), + $this->getReflectionProperty(ConcreteEmbeddable::class, 'propertyInConcreteClass'), + ConcreteEmbeddable::class ], // reflection on classes extending internal PHP classes: [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'publicProperty' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'privateProperty' - ), - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'publicProperty'), + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'privateProperty'), + ArrayObjectExtendingClass::class ], [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'publicProperty' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'protectedProperty' - ), - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'publicProperty'), + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'protectedProperty'), + ArrayObjectExtendingClass::class ], [ - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'publicProperty' - ), - $this->getReflectionProperty( - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass', - 'publicProperty' - ), - 'Doctrine\\Tests\\Models\\Reflection\\ArrayObjectExtendingClass' + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'publicProperty'), + $this->getReflectionProperty(ArrayObjectExtendingClass::class, 'publicProperty'), + ArrayObjectExtendingClass::class ], ]; } diff --git a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php index 598a42ce8..e374e135e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver; +use Doctrine\Tests\Models\DDC889\DDC889Class; class StaticPHPMappingDriverTest extends AbstractMappingDriverTest { @@ -19,7 +20,7 @@ class StaticPHPMappingDriverTest extends AbstractMappingDriverTest */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() { - $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class'); + $this->createClassMetadata(DDC889Class::class); } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index 6d5dde331..cc543b891 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -6,6 +6,13 @@ use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\Tests\Models\DDC117\DDC117Translation; +use Doctrine\Tests\Models\DDC3293\DDC3293User; +use Doctrine\Tests\Models\DDC3293\DDC3293UserPrefixed; +use Doctrine\Tests\Models\DDC889\DDC889Class; +use Doctrine\Tests\Models\Generic\SerializationModel; +use Doctrine\Tests\Models\ValueObjects\Name; +use Doctrine\Tests\Models\ValueObjects\Person; class XmlMappingDriverTest extends AbstractMappingDriverTest { @@ -16,17 +23,16 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest public function testClassTableInheritanceDiscriminatorMap() { - $className = 'Doctrine\Tests\ORM\Mapping\CTI'; $mappingDriver = $this->_loadDriver(); - $class = new ClassMetadata($className); + $class = new ClassMetadata(CTI::class); $class->initializeReflection(new RuntimeReflectionService()); - $mappingDriver->loadMetadataForClass($className, $class); + $mappingDriver->loadMetadataForClass(CTI::class, $class); $expectedMap = [ - 'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo', - 'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar', - 'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz', + 'foo' => CTIFoo::class, + 'bar' => CTIBar::class, + 'baz' => CTIBaz::class, ]; $this->assertEquals(3, count($class->discriminatorMap)); @@ -39,11 +45,10 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest */ public function testFailingSecondLevelCacheAssociation() { - $className = 'Doctrine\Tests\ORM\Mapping\XMLSLC'; $mappingDriver = $this->_loadDriver(); - $class = new ClassMetadata($className); - $mappingDriver->loadMetadataForClass($className, $class); + $class = new ClassMetadata(XMLSLC::class); + $mappingDriver->loadMetadataForClass(XMLSLC::class, $class); } public function testIdentifierWithAssociationKey() @@ -55,7 +60,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $em->getConfiguration()->setMetadataDriverImpl($driver); $factory->setEntityManager($em); - $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC117\DDC117Translation'); + $class = $factory->getMetadataFor(DDC117Translation::class); $this->assertEquals(['language', 'article'], $class->identifier); $this->assertArrayHasKey('article', $class->associationMappings); @@ -66,7 +71,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest public function testEmbeddableMapping() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\ValueObjects\Name'); + $class = $this->createClassMetadata(Name::class); $this->assertEquals(true, $class->isEmbeddedClass); } @@ -86,8 +91,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $this->assertEquals( '__prefix__', - $factory - ->getMetadataFor('Doctrine\Tests\Models\DDC3293\DDC3293UserPrefixed') + $factory->getMetadataFor(DDC3293UserPrefixed::class) ->embeddedClasses['address']['columnPrefix'] ); } @@ -106,20 +110,19 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $factory->setEntityManager($em); $this->assertFalse( - $factory - ->getMetadataFor('Doctrine\Tests\Models\DDC3293\DDC3293User') + $factory->getMetadataFor(DDC3293User::class) ->embeddedClasses['address']['columnPrefix'] ); } public function testEmbeddedMapping() { - $class = $this->createClassMetadata('Doctrine\Tests\Models\ValueObjects\Person'); + $class = $this->createClassMetadata(Person::class); $this->assertEquals( [ 'name' => [ - 'class' => 'Doctrine\Tests\Models\ValueObjects\Name', + 'class' => Name::class, 'columnPrefix' => 'nm_', 'declaredField' => null, 'originalField' => null, @@ -137,7 +140,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest */ public function testInvalidMappingFileException() { - $this->createClassMetadata('Doctrine\Tests\Models\Generic\SerializationModel'); + $this->createClassMetadata(SerializationModel::class); } /** @@ -178,7 +181,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() { - $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class'); + $this->createClassMetadata(DDC889Class::class); } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php index a739c2b61..b6feb4052 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php @@ -2,15 +2,19 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\Tests\Models\DirectoryTree\Directory; +use Doctrine\Tests\Models\DirectoryTree\File; +use Doctrine\Tests\Models\Generic\SerializationModel; +use Symfony\Component\Yaml\Yaml; class YamlMappingDriverTest extends AbstractMappingDriverTest { protected function _loadDriver() { - if (!class_exists('Symfony\Component\Yaml\Yaml', true)) { + if (!class_exists(Yaml::class, true)) { $this->markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.'); } @@ -32,13 +36,13 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); - $classPage = new ClassMetadata('Doctrine\Tests\Models\DirectoryTree\File'); - $classPage = $factory->getMetadataFor('Doctrine\Tests\Models\DirectoryTree\File'); - $this->assertEquals('Doctrine\Tests\Models\DirectoryTree\File', $classPage->associationMappings['parentDirectory']['sourceEntity']); + $classPage = new ClassMetadata(File::class); + $classPage = $factory->getMetadataFor(File::class); + $this->assertEquals(File::class, $classPage->associationMappings['parentDirectory']['sourceEntity']); - $classDirectory = new ClassMetadata('Doctrine\Tests\Models\DirectoryTree\Directory'); - $classDirectory = $factory->getMetadataFor('Doctrine\Tests\Models\DirectoryTree\Directory'); - $this->assertEquals('Doctrine\Tests\Models\DirectoryTree\Directory', $classDirectory->associationMappings['parentDirectory']['sourceEntity']); + $classDirectory = new ClassMetadata(Directory::class); + $classDirectory = $factory->getMetadataFor(Directory::class); + $this->assertEquals(Directory::class, $classDirectory->associationMappings['parentDirectory']['sourceEntity']); } /** @@ -49,7 +53,7 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest */ public function testInvalidMappingFileException() { - $this->createClassMetadata('Doctrine\Tests\Models\Generic\SerializationModel'); + $this->createClassMetadata(SerializationModel::class); } /** @@ -57,7 +61,7 @@ class YamlMappingDriverTest extends AbstractMappingDriverTest */ public function testSpacesShouldBeIgnoredWhenUseExplode() { - $metadata = $this->createClassMetadata(__NAMESPACE__.'\DDC2069Entity'); + $metadata = $this->createClassMetadata(DDC2069Entity::class); $unique = $metadata->table['uniqueConstraints'][0]['columns']; $indexes = $metadata->table['indexes'][0]['columns']; diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php index 2dce0c416..7238eb15a 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsAddress.php @@ -1,5 +1,8 @@ setPrimaryTable( [ 'name' => 'company_person', @@ -48,7 +51,7 @@ $metadata->addNamedNativeQuery( [ 'name' => 'find-by-id', 'query' => 'SELECT * FROM cms_addresses WHERE id = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', + 'resultClass' => CmsAddress::class, ] ); @@ -81,7 +84,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'country', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', + 'entityClass' => CmsAddress::class, ], ], ] @@ -93,7 +96,7 @@ $metadata->addSqlResultSetMapping( 'columns' => [], 'entities' => [ [ - 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsAddress', + 'entityClass' => CmsAddress::class, 'fields' => [] ] ] @@ -111,14 +114,14 @@ $metadata->addSqlResultSetMapping( ] ); -$metadata->addEntityListener(\Doctrine\ORM\Events::postPersist, 'CmsAddressListener', 'postPersist'); -$metadata->addEntityListener(\Doctrine\ORM\Events::prePersist, 'CmsAddressListener', 'prePersist'); +$metadata->addEntityListener(Events::postPersist, 'CmsAddressListener', 'postPersist'); +$metadata->addEntityListener(Events::prePersist, 'CmsAddressListener', 'prePersist'); -$metadata->addEntityListener(\Doctrine\ORM\Events::postUpdate, 'CmsAddressListener', 'postUpdate'); -$metadata->addEntityListener(\Doctrine\ORM\Events::preUpdate, 'CmsAddressListener', 'preUpdate'); +$metadata->addEntityListener(Events::postUpdate, 'CmsAddressListener', 'postUpdate'); +$metadata->addEntityListener(Events::preUpdate, 'CmsAddressListener', 'preUpdate'); -$metadata->addEntityListener(\Doctrine\ORM\Events::postRemove, 'CmsAddressListener', 'postRemove'); -$metadata->addEntityListener(\Doctrine\ORM\Events::preRemove, 'CmsAddressListener', 'preRemove'); +$metadata->addEntityListener(Events::postRemove, 'CmsAddressListener', 'postRemove'); +$metadata->addEntityListener(Events::preRemove, 'CmsAddressListener', 'preRemove'); -$metadata->addEntityListener(\Doctrine\ORM\Events::preFlush, 'CmsAddressListener', 'preFlush'); -$metadata->addEntityListener(\Doctrine\ORM\Events::postLoad, 'CmsAddressListener', 'postLoad'); +$metadata->addEntityListener(Events::preFlush, 'CmsAddressListener', 'preFlush'); +$metadata->addEntityListener(Events::postLoad, 'CmsAddressListener', 'postLoad'); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php index c707f3fdf..4b0075ecf 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php @@ -1,5 +1,8 @@ setPrimaryTable( [ 'name' => 'cms_users', @@ -10,7 +13,7 @@ $metadata->addNamedNativeQuery( [ 'name' => 'fetchIdAndUsernameWithResultClass', 'query' => 'SELECT id, username FROM cms_users WHERE username = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'resultClass' => CmsUser::class, ] ); @@ -18,7 +21,7 @@ $metadata->addNamedNativeQuery( [ 'name' => 'fetchAllColumns', 'query' => 'SELECT * FROM cms_users WHERE username = ?', - 'resultClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'resultClass' => CmsUser::class, ] ); @@ -90,7 +93,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'a_id', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ], ], @@ -121,7 +124,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'number', ], ], - 'entityClass' => 'Doctrine\\Tests\\Models\\CMS\\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ], ], @@ -148,7 +151,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'status', ] ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null ] ], @@ -179,7 +182,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'u_status', ] ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsUser', + 'entityClass' => CmsUser::class, 'discriminatorColumn' => null, ], [ @@ -197,7 +200,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'a_country', ], ], - 'entityClass' => 'Doctrine\Tests\Models\CMS\CmsAddress', + 'entityClass' => CmsAddress::class, 'discriminatorColumn' => null, ], ], diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php index 4626cd46b..6ee9a78fc 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.City.php @@ -1,6 +1,9 @@ setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); $metadata->setPrimaryTable(['name' => 'cache_city']); @@ -32,7 +35,7 @@ $metadata->mapField( $metadata->mapOneToOne( [ 'fieldName' => 'state', - 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\State', + 'targetEntity' => State::class, 'inversedBy' => 'cities', 'joinColumns' => [ @@ -51,7 +54,7 @@ $metadata->enableAssociationCache('state', [ $metadata->mapManyToMany( [ 'fieldName' => 'travels', - 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Travel', + 'targetEntity' => Travel::class, 'mappedBy' => 'visitedCities', ] ); @@ -59,7 +62,7 @@ $metadata->mapManyToMany( $metadata->mapOneToMany( [ 'fieldName' => 'attractions', - 'targetEntity' => 'Doctrine\\Tests\\Models\\Cache\\Attraction', + 'targetEntity' => Attraction::class, 'mappedBy' => 'city', 'orderBy' => ['name' => 'ASC',], ] diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php index 9402cc1ed..d92bd218b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php @@ -1,5 +1,7 @@ setPrimaryTable( [ 'name' => 'company_person', @@ -10,7 +12,7 @@ $metadata->addNamedNativeQuery( [ 'name' => 'fetchAllWithResultClass', 'query' => 'SELECT id, name, discr FROM company_persons ORDER BY name', - 'resultClass' => 'Doctrine\\Tests\\Models\\Company\\CompanyPerson', + 'resultClass' => CompanyPerson::class, ] ); @@ -38,7 +40,7 @@ $metadata->addSqlResultSetMapping( 'column' => 'name', ], ], - 'entityClass' => 'Doctrine\Tests\Models\Company\CompanyPerson', + 'entityClass' => CompanyPerson::class, 'discriminatorColumn' => 'discriminator', ], ], diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php index 3a9b84793..1f3f12b2d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869Payment.php @@ -1,6 +1,7 @@ mapField( [ @@ -17,5 +18,5 @@ $metadata->mapField( ] ); $metadata->isMappedSuperclass = true; -$metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC869\DDC869PaymentRepository"); +$metadata->setCustomRepositoryClass(DDC869PaymentRepository::class); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php index c3ee069df..f7f4816a8 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php @@ -1,6 +1,7 @@ mapField( [ @@ -9,5 +10,5 @@ $metadata->mapField( ] ); $metadata->isMappedSuperclass = true; -$metadata->setCustomRepositoryClass("Doctrine\Tests\Models\DDC889\DDC889SuperClass"); +$metadata->setCustomRepositoryClass(DDC889SuperClass::class); $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php index 3adc2a7a6..5000a68a2 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php @@ -1,6 +1,8 @@ setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE); @@ -14,8 +16,8 @@ $metadata->setDiscriminatorColumn( ); $metadata->setDiscriminatorMap( [ - 'cat' => 'Doctrine\\Tests\\ORM\\Mapping\\Cat', - 'dog' => 'Doctrine\\Tests\\ORM\\Mapping\\Dog', + 'cat' => Cat::class, + 'dog' => Dog::class, ] ); $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php index cc23c3992..b716893b6 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php @@ -1,6 +1,9 @@ setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); $metadata->setPrimaryTable( @@ -53,7 +56,7 @@ $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); $metadata->mapOneToOne( [ 'fieldName' => 'address', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Address', + 'targetEntity' => Address::class, 'cascade' => [ 0 => 'remove', @@ -75,7 +78,7 @@ $metadata->mapOneToOne( $metadata->mapOneToMany( [ 'fieldName' => 'phonenumbers', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Phonenumber', + 'targetEntity' => Phonenumber::class, 'cascade' => [ 1 => 'persist', @@ -91,7 +94,7 @@ $metadata->mapOneToMany( $metadata->mapManyToMany( [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Mapping\\Group', + 'targetEntity' => Group::class, 'cascade' => [ 0 => 'remove', diff --git a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php index 4c992a870..618b5f9c6 100644 --- a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php +++ b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php @@ -19,10 +19,10 @@ class DDC2602Test extends OrmPerformanceTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'), + $this->_em->getClassMetadata(DDC2602User::class), + $this->_em->getClassMetadata(DDC2602Biography::class), + $this->_em->getClassMetadata(DDC2602BiographyField::class), + $this->_em->getClassMetadata(DDC2602BiographyFieldChoice::class), ] ); @@ -35,10 +35,10 @@ class DDC2602Test extends OrmPerformanceTestCase $this->_schemaTool->dropSchema( [ - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602User'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602Biography'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyField'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC2602BiographyFieldChoice'), + $this->_em->getClassMetadata(DDC2602User::class), + $this->_em->getClassMetadata(DDC2602Biography::class), + $this->_em->getClassMetadata(DDC2602BiographyField::class), + $this->_em->getClassMetadata(DDC2602BiographyFieldChoice::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php index 0846ca4de..0035222ad 100644 --- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php @@ -5,9 +5,12 @@ 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\ORM\Query; +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\Tests\Mocks\HydratorMockStatement; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmPerformanceTestCase; /** @@ -31,7 +34,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testSimpleQueryScalarHydrationPerformance10000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addFieldResult('u', 'u__username', 'username'); @@ -89,7 +92,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testSimpleQueryArrayHydrationPerformance10000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addFieldResult('u', 'u__username', 'username'); @@ -147,9 +150,9 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testMixedQueryFetchJoinArrayHydrationPerformance10000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -219,7 +222,7 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testSimpleQueryPartialObjectHydrationPerformance10000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addFieldResult('u', 'u__username', 'username'); @@ -275,13 +278,13 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testSimpleQueryFullObjectHydrationPerformance10000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addFieldResult('u', 'u__username', 'username'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsAddress', + CmsAddress::class, 'a', 'u', 'address' @@ -331,9 +334,9 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testMixedQueryFetchJoinPartialObjectHydrationPerformance2000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $rsm->addEntityResult(CmsUser::class, 'u'); $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', + CmsPhonenumber::class, 'p', 'u', 'phonenumbers' @@ -403,25 +406,15 @@ class HydrationPerformanceTest extends OrmPerformanceTestCase public function testMixedQueryFetchJoinFullObjectHydrationPerformance2000Rows() { $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u'); - $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', - 'p', - 'u', - 'phonenumbers' - ); + $rsm->addEntityResult(CmsUser::class, 'u'); + $rsm->addJoinedEntityResult(CmsPhonenumber::class, 'p', 'u', 'phonenumbers'); $rsm->addFieldResult('u', 'u__id', 'id'); $rsm->addFieldResult('u', 'u__status', 'status'); $rsm->addFieldResult('u', 'u__username', 'username'); $rsm->addFieldResult('u', 'u__name', 'name'); $rsm->addScalarResult('sclr0', 'nameUpper'); $rsm->addFieldResult('p', 'p__phonenumber', 'phonenumber'); - $rsm->addJoinedEntityResult( - 'Doctrine\Tests\Models\CMS\CmsAddress', - 'a', - 'u', - 'address' - ); + $rsm->addJoinedEntityResult(CmsAddress::class, 'a', 'u', 'address'); $rsm->addFieldResult('a', 'a__id', 'id'); // Faked result set diff --git a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php index 2104587ae..726389a4c 100644 --- a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Performance; use Doctrine\ORM\Query; +use Doctrine\Tests\Models\Company\CompanyContract; use Doctrine\Tests\Models\Company\CompanyEmployee; use Doctrine\Tests\Models\Company\CompanyFixContract; use Doctrine\Tests\Models\Company\CompanyFlexContract; @@ -54,14 +55,14 @@ class InheritancePersisterPerformanceTest extends OrmFunctionalTestCase $this->_em->clear(); $start = microtime(true); - $contracts = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyContract')->findAll(); + $contracts = $this->_em->getRepository(CompanyContract::class)->findAll(); echo "99 CompanyContract: " . number_format(microtime(true) - $start, 6) . "\n"; $this->assertEquals(99, count($contracts)); $this->_em->clear(); $start = microtime(true); - $contracts = $this->_em->getRepository('Doctrine\Tests\Models\Company\CompanyContract')->findAll(); + $contracts = $this->_em->getRepository(CompanyContract::class)->findAll(); echo "99 CompanyContract: " . number_format(microtime(true) - $start, 6) . "\n"; $this->assertEquals(99, count($contracts)); } diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php index 8d66ba601..30494d49b 100644 --- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php @@ -40,20 +40,20 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle')->findAll(); + $articles = $this->_em->getRepository(CmsArticle::class)->findAll(); echo "100 CmsArticle findAll(): " . number_format(microtime(true) - $start, 6) . "\n"; $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle')->findAll(); + $articles = $this->_em->getRepository(CmsArticle::class)->findAll(); echo "100 CmsArticle findAll(): " . number_format(microtime(true) - $start, 6) . "\n"; $this->_em->clear(); $start = microtime(true); for ($i = 0; $i < 100; $i++) { - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle')->find($ids[$i]->id); + $articles = $this->_em->getRepository(CmsArticle::class)->find($ids[$i]->id); } echo "100 CmsArticle find(): " . number_format(microtime(true) - $start, 6) . "\n"; @@ -61,7 +61,7 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase $start = microtime(true); for ($i = 0; $i < 100; $i++) { - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsArticle')->find($ids[$i]->id); + $articles = $this->_em->getRepository(CmsArticle::class)->find($ids[$i]->id); } echo "100 CmsArticle find(): " . number_format(microtime(true) - $start, 6) . "\n"; } @@ -77,13 +77,13 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll(); + $articles = $this->_em->getRepository(CmsGroup::class)->findAll(); echo "100 CmsGroup: " . number_format(microtime(true) - $start, 6) . "\n"; $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsGroup')->findAll(); + $articles = $this->_em->getRepository(CmsGroup::class)->findAll(); echo "100 CmsGroup: " . number_format(microtime(true) - $start, 6) . "\n"; } @@ -101,13 +101,13 @@ class PersisterPerformanceTest extends OrmFunctionalTestCase $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findAll(); + $articles = $this->_em->getRepository(CmsUser::class)->findAll(); echo "100 CmsUser: " . number_format(microtime(true) - $start, 6) . "\n"; $this->_em->clear(); $start = microtime(true); - $articles = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findAll(); + $articles = $this->_em->getRepository(CmsUser::class)->findAll(); echo "100 CmsUser: " . number_format(microtime(true) - $start, 6) . "\n"; } } diff --git a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php index de77aafd8..d73964dcc 100644 --- a/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/ProxyPerformanceTest.php @@ -2,11 +2,13 @@ namespace Doctrine\Tests\ORM\Performance; -use Doctrine\Tests\OrmPerformanceTestCase; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\UnitOfWork; -use Doctrine\ORM\Proxy\ProxyFactory; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; +use Doctrine\ORM\Proxy\ProxyFactory; +use Doctrine\ORM\UnitOfWork; +use Doctrine\Tests\Models\CMS\CmsEmployee; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\OrmPerformanceTestCase; /** * Performance test used to measure performance of proxy instantiation @@ -22,8 +24,8 @@ class ProxyPerformanceTest extends OrmPerformanceTestCase public function entitiesProvider() { return [ - ['Doctrine\Tests\Models\CMS\CmsEmployee'], - ['Doctrine\Tests\Models\CMS\CmsUser'], + [CmsEmployee::class], + [CmsUser::class], ]; } diff --git a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php index 279740918..f954d4f47 100644 --- a/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php @@ -202,7 +202,7 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase foreach ($states as $state) { - $state = $em->find(State::CLASSNAME, $state->getId()); + $state = $em->find(State::class, $state->getId()); foreach ($state->getCities() as $city) { $city->getName(); @@ -240,7 +240,7 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase for ($i = 0; $i <= $times; $i++) { foreach ($countries as $country) { - $em->find(Country::CLASSNAME, $country->getId()); + $em->find(Country::class, $country->getId()); $em->clear(); } } @@ -254,7 +254,7 @@ class SecondLevelCacheTest extends OrmFunctionalTestCase $times = 100; $size = 50; $startPersist = microtime(true); - $rep = $em->getRepository(Country::CLASSNAME); + $rep = $em->getRepository(Country::class); echo PHP_EOL . $label; diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php index df1a16867..0e1c20f51 100644 --- a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php @@ -40,7 +40,7 @@ class PersistentCollectionTest extends OrmTestCase */ public function setUpPersistentCollection() { - $classMetaData = $this->_emMock->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceCart'); + $classMetaData = $this->_emMock->getClassMetadata(ECommerceCart::class); $this->collection = new PersistentCollection($this->_emMock, $classMetaData, new ArrayCollection); $this->collection->setInitialized(false); $this->collection->setOwner(new ECommerceCart(), $classMetaData->getAssociationMapping('products')); @@ -48,7 +48,7 @@ class PersistentCollectionTest extends OrmTestCase public function testCanBePutInLazyLoadingMode() { - $class = $this->_emMock->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct'); + $class = $this->_emMock->getClassMetadata(ECommerceProduct::class); $collection = new PersistentCollection($this->_emMock, $class, new ArrayCollection); $collection->setInitialized(false); $this->assertFalse($collection->isInitialized()); diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php index db6fa5c83..1694d97ce 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeParametersTest.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Persisters; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; use Doctrine\Tests\Models\GeoNames\Admin1; +use Doctrine\Tests\Models\GeoNames\Admin1AlternateName; use Doctrine\Tests\Models\GeoNames\Country; use Doctrine\Tests\OrmTestCase; @@ -29,11 +30,11 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase $this->_em = $this->_getTestEntityManager(); - $this->_em->getClassMetadata('Doctrine\Tests\Models\GeoNames\Country'); - $this->_em->getClassMetadata('Doctrine\Tests\Models\GeoNames\Admin1'); - $this->_em->getClassMetadata('Doctrine\Tests\Models\GeoNames\Admin1AlternateName'); + $this->_em->getClassMetadata(Country::class); + $this->_em->getClassMetadata(Admin1::class); + $this->_em->getClassMetadata(Admin1AlternateName::class); - $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\GeoNames\Admin1AlternateName')); + $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata(Admin1AlternateName::class)); } @@ -42,12 +43,7 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase $country = new Country("IT", "Italy"); $admin1 = new Admin1(10, "Rome", $country); - - list ($values, $types) = $this->_persister->expandParameters( - [ - 'admin1' => $admin1 - ] - ); + list ($values, $types) = $this->_persister->expandParameters(['admin1' => $admin1]); $this->assertEquals(['integer', 'string'], $types); $this->assertEquals([10, 'IT'], $values); @@ -59,7 +55,6 @@ class BasicEntityPersisterCompositeTypeParametersTest extends OrmTestCase $admin1 = new Admin1(10, "Rome", $country); $criteria = Criteria::create(); - $criteria->andWhere(Criteria::expr()->eq("admin1", $admin1)); list ($values, $types) = $this->_persister->expandCriteriaParameters($criteria); diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php index 441ff0101..9392b8ee5 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Persisters; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; use Doctrine\Common\Collections\Expr\Comparison; +use Doctrine\Tests\Models\GeoNames\Admin1AlternateName; use Doctrine\Tests\OrmTestCase; class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase @@ -26,8 +27,7 @@ class BasicEntityPersisterCompositeTypeSqlTest extends OrmTestCase parent::setUp(); $this->_em = $this->_getTestEntityManager(); - - $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\GeoNames\Admin1AlternateName')); + $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata(Admin1AlternateName::class)); } public function testSelectConditionStatementEq() diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php index c4d747058..ba1d18051 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php @@ -3,12 +3,13 @@ namespace Doctrine\Tests\ORM\Persisters; use Doctrine\Common\Collections\Criteria; +use Doctrine\Common\Collections\Expr\Comparison; use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; -use Doctrine\Tests\Models\CustomType\CustomTypeParent; use Doctrine\Tests\Models\CustomType\CustomTypeChild; use Doctrine\Tests\Models\CustomType\CustomTypeFriend; -use Doctrine\Common\Collections\Expr\Comparison; +use Doctrine\Tests\Models\CustomType\CustomTypeParent; +use Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity; use Doctrine\Tests\OrmTestCase; class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase @@ -44,7 +45,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase $this->_em = $this->_getTestEntityManager(); - $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata("Doctrine\Tests\Models\CustomType\CustomTypeParent")); + $this->_persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata(CustomTypeParent::class)); } public function testGetInsertSQLUsesTypeValuesSQL() @@ -93,7 +94,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase */ public function testStripNonAlphanumericCharactersFromSelectColumnListSQL() { - $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity')); + $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata(NonAlphaColumnsEntity::class)); $method = new \ReflectionMethod($persister, 'getSelectColumnsSQL'); $method->setAccessible(true); @@ -144,7 +145,7 @@ class BasicEntityPersisterTypeValueSqlTest extends OrmTestCase public function testCountCondition() { - $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata('Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity')); + $persister = new BasicEntityPersister($this->_em, $this->_em->getClassMetadata(NonAlphaColumnsEntity::class)); // Using a criteria as array $statement = $persister->getCountSQL(['value' => 'bar']); diff --git a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php index 14deca100..4a4cec244 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Persisters; use Doctrine\ORM\Persisters\Entity\JoinedSubclassPersister; +use Doctrine\Tests\Models\JoinedInheritanceType\RootClass; use Doctrine\Tests\OrmTestCase; /** @@ -30,11 +31,7 @@ class JoinedSubClassPersisterTest extends OrmTestCase parent::setUp(); $this->em = $this->_getTestEntityManager(); - - $this->persister = new JoinedSubclassPersister( - $this->em, - $this->em->getClassMetadata('Doctrine\Tests\Models\JoinedInheritanceType\RootClass') - ); + $this->persister = new JoinedSubclassPersister($this->em, $this->em->getClassMetadata(RootClass::class)); } /** diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php index e7da7a463..739a41f18 100644 --- a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php @@ -12,9 +12,10 @@ use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\UnitOfWorkMock; -use Doctrine\Tests\Models\Company\CompanyPerson; -use Doctrine\Tests\OrmTestCase; use Doctrine\Tests\Models\Company\CompanyEmployee; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\ECommerce\ECommerceFeature; +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. @@ -61,9 +62,9 @@ class ProxyFactoryTest extends OrmTestCase $proxyClass = 'Proxies\__CG__\Doctrine\Tests\Models\ECommerce\ECommerceFeature'; $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); - $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); + $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister); - $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $identifier); + $proxy = $this->proxyFactory->getProxy(ECommerceFeature::class, $identifier); $persister ->expects($this->atLeastOnce()) @@ -79,7 +80,7 @@ class ProxyFactoryTest extends OrmTestCase */ public function testSkipAbstractClassesOnGeneration() { - $cm = new ClassMetadata(__NAMESPACE__ . '\\AbstractClass'); + $cm = new ClassMetadata(AbstractClass::class); $cm->initializeReflection(new RuntimeReflectionService()); $this->assertNotNull($cm->reflClass); @@ -94,10 +95,10 @@ class ProxyFactoryTest extends OrmTestCase public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized() { $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); - $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); + $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister); /* @var $proxy \Doctrine\Common\Proxy\Proxy */ - $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]); + $proxy = $this->proxyFactory->getProxy(ECommerceFeature::class, ['id' => 42]); $persister ->expects($this->atLeastOnce()) @@ -121,10 +122,10 @@ class ProxyFactoryTest extends OrmTestCase public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized() { $persister = $this->getMockBuilder(BasicEntityPersister::class)->setMethods(['load'])->disableOriginalConstructor()->getMock(); - $this->uowMock->setEntityPersister('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $persister); + $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister); /* @var $proxy \Doctrine\Common\Proxy\Proxy */ - $proxy = $this->proxyFactory->getProxy('Doctrine\Tests\Models\ECommerce\ECommerceFeature', ['id' => 42]); + $proxy = $this->proxyFactory->getProxy(ECommerceFeature::class, ['id' => 42]); $persister ->expects($this->atLeastOnce()) diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php index bedcd6597..9bc5bf5a0 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php @@ -3,6 +3,8 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\Query; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; /** @@ -25,7 +27,7 @@ class CustomTreeWalkersJoinTest extends OrmTestCase { try { $query = $this->em->createQuery($dqlToBeTested); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\Tests\ORM\Query\CustomTreeWalkerJoin']) + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CustomTreeWalkerJoin::class]) ->useQueryCache(false); $this->assertEquals($sqlToBeConfirmed, $query->getSql()); @@ -60,7 +62,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) { $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration; - if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') { + if ($rangeVariableDecl->abstractSchemaName !== CmsUser::class) { continue; } @@ -80,8 +82,8 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $selectStatement->selectClause->selectExpressions[] = $selectExpression; $entityManager = $this->_getQuery()->getEntityManager(); - $userMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $userMetadata = $entityManager->getClassMetadata(CmsUser::class); + $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class); $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', [ diff --git a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php index d6ae70818..4c2898141 100644 --- a/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php +++ b/tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersTest.php @@ -4,6 +4,8 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Query; use Doctrine\ORM\Query\QueryException; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; /** @@ -50,7 +52,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.id = 1", - ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] + [CustomTreeWalker::class] ); } @@ -59,7 +61,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name or u.name = :otherName', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE (c0_.name = ? OR c0_.name = ?) AND c0_.id = 1", - ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] + [CustomTreeWalker::class] ); } @@ -68,7 +70,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u where u.name = :name', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c0_.email_id AS email_id_4 FROM cms_users c0_ WHERE c0_.name = ? AND c0_.id = 1", - ['Doctrine\Tests\ORM\Functional\CustomTreeWalker'] + [CustomTreeWalker::class] ); } @@ -80,7 +82,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->generateSql( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', [], - __NAMESPACE__ . '\\AddUnknownQueryComponentWalker' + AddUnknownQueryComponentWalker::class ); } @@ -89,7 +91,7 @@ class CustomTreeWalkersTest extends OrmTestCase $this->assertSqlGeneration( 'select u from Doctrine\Tests\Models\CMS\CmsUser u', "SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3, c1_.id AS id_4, c1_.country AS country_5, c1_.zip AS zip_6, c1_.city AS city_7, c0_.email_id AS email_id_8, c1_.user_id AS user_id_9 FROM cms_users c0_ LEFT JOIN cms_addresses c1_ ON c0_.id = c1_.user_id WHERE c0_.id = 1", - ['Doctrine\Tests\ORM\Functional\CustomTreeWalkerJoin', 'Doctrine\Tests\ORM\Functional\CustomTreeWalker'] + [CustomTreeWalkerJoin::class, CustomTreeWalker::class] ); } } @@ -114,7 +116,7 @@ class CustomTreeWalker extends Query\TreeWalkerAdapter foreach ($this->_getQueryComponents() as $dqlAlias => $comp) { // Hard-coded check just for demonstration: We want to modify the query if // it involves the CmsUser class. - if ($comp['metadata']->name == 'Doctrine\Tests\Models\CMS\CmsUser') { + if ($comp['metadata']->name == CmsUser::class) { $dqlAliases[] = $dqlAlias; } } @@ -187,7 +189,7 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter foreach ($selectStatement->fromClause->identificationVariableDeclarations as $identificationVariableDeclaration) { $rangeVariableDecl = $identificationVariableDeclaration->rangeVariableDeclaration; - if ($rangeVariableDecl->abstractSchemaName !== 'Doctrine\Tests\Models\CMS\CmsUser') { + if ($rangeVariableDecl->abstractSchemaName !== CmsUser::class) { continue; } @@ -207,8 +209,8 @@ class CustomTreeWalkerJoin extends Query\TreeWalkerAdapter $selectStatement->selectClause->selectExpressions[] = $selectExpression; $entityManager = $this->_getQuery()->getEntityManager(); - $userMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); - $addressMetadata = $entityManager->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'); + $userMetadata = $entityManager->getClassMetadata(CmsUser::class); + $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class); $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a', [ diff --git a/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/tests/Doctrine/Tests/ORM/Query/ExprTest.php index 791f2f9b9..37a4b70a6 100644 --- a/tests/Doctrine/Tests/ORM/Query/ExprTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ExprTest.php @@ -3,7 +3,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\Query\Expr; -use Doctrine\ORM\Query; +use Doctrine\Tests\Models\Company\CompanyEmployee; use Doctrine\Tests\OrmTestCase; /** @@ -265,7 +265,7 @@ class ExprTest extends OrmTestCase } public function testIsInstanceOfExpr() { - $this->assertEquals('u INSTANCE OF Doctrine\Tests\Models\Company\CompanyEmployee', (string) $this->_expr->isInstanceOf('u', 'Doctrine\Tests\Models\Company\CompanyEmployee')); + $this->assertEquals('u INSTANCE OF Doctrine\Tests\Models\Company\CompanyEmployee', (string) $this->_expr->isInstanceOf('u', CompanyEmployee::class)); } public function testIsMemberOfExpr() { diff --git a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php index 7a50516a7..0e47f6e82 100644 --- a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php @@ -2,8 +2,8 @@ namespace Doctrine\Tests\ORM\Query; -use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Query\Filter\SQLFilter; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Query\Filter\SQLFilter; use Doctrine\Tests\OrmTestCase; /** @@ -21,8 +21,7 @@ class FilterCollectionTest extends OrmTestCase protected function setUp() { $this->em = $this->_getTestEntityManager(); - - $this->em->getConfiguration()->addFilter('testFilter', 'Doctrine\Tests\ORM\Query\MyFilter'); + $this->em->getConfiguration()->addFilter('testFilter', MyFilter::class); } public function testEnable() @@ -36,7 +35,7 @@ class FilterCollectionTest extends OrmTestCase $enabledFilters = $filterCollection->getEnabledFilters(); $this->assertCount(1, $enabledFilters); - $this->assertContainsOnly('Doctrine\Tests\ORM\Query\MyFilter', $enabledFilters); + $this->assertContainsOnly(MyFilter::class, $enabledFilters); $filterCollection->disable('testFilter'); $this->assertCount(0, $filterCollection->getEnabledFilters()); @@ -70,17 +69,15 @@ class FilterCollectionTest extends OrmTestCase public function testGetFilterInvalidArgument() { $filterCollection = $this->em->getFilters(); - $filterCollection->getFilter('testFilter'); } public function testGetFilter() { $filterCollection = $this->em->getFilters(); - $filterCollection->enable('testFilter'); - $this->assertInstanceOf('Doctrine\Tests\ORM\Query\MyFilter', $filterCollection->getFilter('testFilter')); + $this->assertInstanceOf(MyFilter::class, $filterCollection->getFilter('testFilter')); } } diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index 88fdca9bf..46e72245a 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query, Doctrine\ORM\Query\QueryException; +use Doctrine\Tests\Mocks\MockTreeWalker; use Doctrine\Tests\OrmTestCase; class LanguageRecognitionTest extends OrmTestCase @@ -59,7 +60,7 @@ class LanguageRecognitionTest extends OrmTestCase $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'); + $parser->setCustomOutputTreeWalker(MockTreeWalker::class); return $parser->parse(); } @@ -572,7 +573,7 @@ class LanguageRecognitionTest extends OrmTestCase */ public function testCustomFunctionsReturningStringInStringPrimary() { - $this->_em->getConfiguration()->addCustomStringFunction('CC', 'Doctrine\ORM\Query\AST\Functions\ConcatFunction'); + $this->_em->getConfiguration()->addCustomStringFunction('CC', Query\AST\Functions\ConcatFunction::class); $this->assertValidDQL("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CC('%', u.name) LIKE '%foo%'", true); } diff --git a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php index 0a61d7d31..3d74e0f96 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParserResultTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\ORM\Query\Exec\AbstractSqlExecutor; use Doctrine\ORM\Query\ParserResult; +use Doctrine\ORM\Query\ResultSetMapping; class ParserResultTest extends \PHPUnit_Framework_TestCase { @@ -16,10 +17,7 @@ class ParserResultTest extends \PHPUnit_Framework_TestCase public function testGetRsm() { - $this->assertInstanceOf( - 'Doctrine\ORM\Query\ResultSetMapping', - $this->parserResult->getResultSetMapping() - ); + $this->assertInstanceOf(ResultSetMapping::class, $this->parserResult->getResultSetMapping()); } public function testSetGetSqlExecutor() diff --git a/tests/Doctrine/Tests/ORM/Query/ParserTest.php b/tests/Doctrine/Tests/ORM/Query/ParserTest.php index 6b898f80b..b290812fc 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParserTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParserTest.php @@ -6,6 +6,7 @@ use Doctrine\ORM\Query; use Doctrine\ORM\Query\Lexer; use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\QueryException; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; class ParserTest extends OrmTestCase @@ -17,9 +18,9 @@ class ParserTest extends OrmTestCase */ public function testAbstractSchemaNameSupportsFQCN() { - $parser = $this->createParser('Doctrine\Tests\Models\CMS\CmsUser'); + $parser = $this->createParser(CmsUser::class); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $parser->AbstractSchemaName()); + $this->assertEquals(CmsUser::class, $parser->AbstractSchemaName()); } /** @@ -28,9 +29,9 @@ class ParserTest extends OrmTestCase */ public function testAbstractSchemaNameSupportsClassnamesWithLeadingBackslash() { - $parser = $this->createParser('\Doctrine\Tests\Models\CMS\CmsUser'); + $parser = $this->createParser('\\' . CmsUser::class); - $this->assertEquals('\Doctrine\Tests\Models\CMS\CmsUser', $parser->AbstractSchemaName()); + $this->assertEquals('\\' . CmsUser::class, $parser->AbstractSchemaName()); } /** @@ -39,9 +40,9 @@ class ParserTest extends OrmTestCase */ public function testAbstractSchemaNameSupportsIdentifier() { - $parser = $this->createParser('stdClass'); + $parser = $this->createParser(\stdClass::class); - $this->assertEquals('stdClass', $parser->AbstractSchemaName()); + $this->assertEquals(\stdClass::class, $parser->AbstractSchemaName()); } /** @@ -54,7 +55,7 @@ class ParserTest extends OrmTestCase $parser->getEntityManager()->getConfiguration()->addEntityNamespace('CMS', 'Doctrine\Tests\Models\CMS'); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $parser->AbstractSchemaName()); + $this->assertEquals(CmsUser::class, $parser->AbstractSchemaName()); } /** @@ -67,7 +68,7 @@ class ParserTest extends OrmTestCase $parser->getEntityManager()->getConfiguration()->addEntityNamespace('Model', 'Doctrine\Tests\Models'); - $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $parser->AbstractSchemaName()); + $this->assertEquals(CmsUser::class, $parser->AbstractSchemaName()); } /** diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php index 7653be5ec..91b99f2e3 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php @@ -3,13 +3,10 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\Common\Collections\ArrayCollection; - -use Doctrine\Common\Collections\Expr\Value; use Doctrine\Common\Collections\Expr\Comparison as CriteriaComparison; -use Doctrine\ORM\Query\Expr\Comparison as QueryComparison; +use Doctrine\Common\Collections\Expr\Value; use Doctrine\Common\Collections\ExpressionBuilder as CriteriaBuilder; use Doctrine\ORM\Query\Expr as QueryBuilder; - use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Query\QueryExpressionVisitor; @@ -35,7 +32,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase /** * @param CriteriaComparison $criteriaExpr - * @param QueryComparison|string $queryExpr + * @param QueryBuilder\Comparison|string $queryExpr * @param Parameter $parameter * * @dataProvider comparisonData @@ -89,7 +86,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase ) ); - $this->assertInstanceOf('Doctrine\ORM\Query\Expr\Andx', $expr); + $this->assertInstanceOf(QueryBuilder\Andx::class, $expr); $this->assertCount(2, $expr->getParts()); } @@ -103,7 +100,7 @@ class QueryExpressionVisitorTest extends \PHPUnit_Framework_TestCase ) ); - $this->assertInstanceOf('Doctrine\ORM\Query\Expr\Orx', $expr); + $this->assertInstanceOf(QueryBuilder\Orx::class, $expr); $this->assertCount(2, $expr->getParts()); } diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index e646d670a..9b8f24d40 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -9,6 +9,7 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\Query\Parameter; use Doctrine\Tests\Mocks\DriverConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; +use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\OrmTestCase; class QueryTest extends OrmTestCase @@ -178,8 +179,8 @@ class QueryTest extends OrmTestCase { $query = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)"); $this->assertEquals( - 'Doctrine\Tests\Models\CMS\CmsAddress', - $query->processParameterValue($this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress')) + CmsAddress::class, + $query->processParameterValue($this->_em->getClassMetadata(CmsAddress::class)) ); } diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 9a074d60e..b6bdce323 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -15,8 +15,10 @@ use Doctrine\ORM\Query\Lexer; use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\QueryException; use Doctrine\ORM\Query\SqlWalker; +use Doctrine\Tests\DbalTypes\NegativeToPositiveType; use Doctrine\Tests\Models\CMS\CmsGroup; use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\Company\CompanyEmployee; use Doctrine\Tests\Models\Company\CompanyPerson; use Doctrine\Tests\OrmTestCase; @@ -531,7 +533,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertInvalidSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\CMS\CmsUser", - "Doctrine\\ORM\\Query\\QueryException" + QueryException::class ); } @@ -556,7 +558,7 @@ class SelectSqlGenerationTest extends OrmTestCase $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1", "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN (?)", - [], [1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee')] + [], [1 => $this->_em->getClassMetadata(CompanyEmployee::class)] ); } @@ -609,7 +611,7 @@ class SelectSqlGenerationTest extends OrmTestCase // We do not support SingleValuedAssociationPathExpression on inverse side $this->assertInvalidSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.address IN (?1, ?2)", - "Doctrine\ORM\Query\QueryException" + QueryException::class ); } @@ -1132,7 +1134,7 @@ class SelectSqlGenerationTest extends OrmTestCase public function testSupportToCustomDQLFunctions() { $config = $this->_em->getConfiguration(); - $config->addCustomNumericFunction('MYABS', 'Doctrine\Tests\ORM\Query\MyAbsFunction'); + $config->addCustomNumericFunction('MYABS', MyAbsFunction::class); $this->assertSqlGeneration( 'SELECT MYABS(p.phonenumber) FROM Doctrine\Tests\Models\CMS\CmsPhonenumber p', @@ -1378,7 +1380,7 @@ class SelectSqlGenerationTest extends OrmTestCase $this->assertInvalidSqlGeneration( "SELECT IDENTITY(p.poi, 'invalid') AS invalid FROM Doctrine\Tests\Models\Navigation\NavPhotos p", - "Doctrine\ORM\Query\QueryException" + QueryException::class ); } @@ -1431,7 +1433,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertInvalidSqlGeneration( "SELECT IDENTITY(u.name) as name FROM Doctrine\Tests\Models\CMS\CmsUser u", - "Doctrine\ORM\Query\QueryException" + QueryException::class ); } @@ -1838,9 +1840,9 @@ class SelectSqlGenerationTest extends OrmTestCase public function testCustomTypeValueSql() { if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::overrideType('negative_to_positive', NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType('negative_to_positive', NegativeToPositiveType::class); } $this->assertSqlGeneration( @@ -1852,9 +1854,9 @@ class SelectSqlGenerationTest extends OrmTestCase public function testCustomTypeValueSqlIgnoresIdentifierColumn() { if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::overrideType('negative_to_positive', NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType('negative_to_positive', NegativeToPositiveType::class); } $this->assertSqlGeneration( @@ -1866,9 +1868,9 @@ class SelectSqlGenerationTest extends OrmTestCase public function testCustomTypeValueSqlForAllFields() { if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::overrideType('negative_to_positive', NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType('negative_to_positive', NegativeToPositiveType::class); } $this->assertSqlGeneration( @@ -1880,9 +1882,9 @@ class SelectSqlGenerationTest extends OrmTestCase public function testCustomTypeValueSqlForPartialObject() { if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::overrideType('negative_to_positive', NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType('negative_to_positive', NegativeToPositiveType::class); } $this->assertSqlGeneration( diff --git a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php index 4110b54e6..7044929e9 100644 --- a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Query; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\Tests\DbalTypes\NegativeToPositiveType; use Doctrine\Tests\OrmTestCase; /** @@ -25,9 +26,9 @@ class UpdateSqlGenerationTest extends OrmTestCase protected function setUp() { if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::overrideType('negative_to_positive', NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', 'Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType('negative_to_positive', NegativeToPositiveType::class); } $this->_em = $this->_getTestEntityManager(); diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 9418028ec..7da2c663c 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -5,11 +5,14 @@ namespace Doctrine\Tests\ORM; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Cache; - -use Doctrine\ORM\QueryBuilder; -use Doctrine\ORM\Query\Expr; +use Doctrine\ORM\Query; use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Query\ParameterTypeInferer; +use Doctrine\ORM\QueryBuilder; +use Doctrine\Tests\Models\Cache\State; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmTestCase; /** @@ -43,7 +46,7 @@ class QueryBuilderTest extends OrmTestCase public function testSelectSetsType() { $qb = $this->_em->createQueryBuilder() - ->delete('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->delete(CmsUser::class, 'u') ->select('u.id', 'u.username'); $this->assertEquals($qb->getType(), QueryBuilder::SELECT); @@ -52,7 +55,7 @@ class QueryBuilderTest extends OrmTestCase public function testEmptySelectSetsType() { $qb = $this->_em->createQueryBuilder() - ->delete('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->delete(CmsUser::class, 'u') ->select(); $this->assertEquals($qb->getType(), QueryBuilder::SELECT); @@ -61,7 +64,7 @@ class QueryBuilderTest extends OrmTestCase public function testDeleteSetsType() { $qb = $this->_em->createQueryBuilder() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->delete(); $this->assertEquals($qb->getType(), QueryBuilder::DELETE); @@ -70,7 +73,7 @@ class QueryBuilderTest extends OrmTestCase public function testUpdateSetsType() { $qb = $this->_em->createQueryBuilder() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->update(); $this->assertEquals($qb->getType(), QueryBuilder::UPDATE); @@ -79,7 +82,7 @@ class QueryBuilderTest extends OrmTestCase public function testSimpleSelect() { $qb = $this->_em->createQueryBuilder() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->select('u.id', 'u.username'); $this->assertValidQueryBuilder($qb, 'SELECT u.id, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u'); @@ -88,7 +91,7 @@ class QueryBuilderTest extends OrmTestCase public function testSimpleDelete() { $qb = $this->_em->createQueryBuilder() - ->delete('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->delete(CmsUser::class, 'u'); $this->assertValidQueryBuilder($qb, 'DELETE Doctrine\Tests\Models\CMS\CmsUser u'); } @@ -96,7 +99,7 @@ class QueryBuilderTest extends OrmTestCase public function testSimpleSelectWithFromIndexBy() { $qb = $this->_em->createQueryBuilder() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u', 'u.id') + ->from(CmsUser::class, 'u', 'u.id') ->select('u.id', 'u.username'); $this->assertValidQueryBuilder($qb, 'SELECT u.id, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u INDEX BY u.id'); @@ -105,7 +108,7 @@ class QueryBuilderTest extends OrmTestCase public function testSimpleSelectWithIndexBy() { $qb = $this->_em->createQueryBuilder() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->indexBy('u', 'u.id') ->select('u.id', 'u.username'); @@ -115,7 +118,7 @@ class QueryBuilderTest extends OrmTestCase public function testSimpleUpdate() { $qb = $this->_em->createQueryBuilder() - ->update('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->update(CmsUser::class, 'u') ->set('u.username', ':username'); $this->assertValidQueryBuilder($qb, 'UPDATE Doctrine\Tests\Models\CMS\CmsUser u SET u.username = :username'); @@ -125,7 +128,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'a') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->innerJoin('u.articles', 'a'); $this->assertValidQueryBuilder($qb, 'SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles a'); @@ -135,7 +138,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'a') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->innerJoin('u.articles', 'a', 'ON', 'u.id = a.author_id'); $this->assertValidQueryBuilder( @@ -148,7 +151,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'a') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->innerJoin('u.articles', 'a', 'ON', 'u.id = a.author_id', 'a.name'); $this->assertValidQueryBuilder( @@ -161,7 +164,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'a') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->leftJoin('u.articles', 'a'); $this->assertValidQueryBuilder($qb, 'SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a'); @@ -171,7 +174,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'a') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->leftJoin('u.articles', 'a', null, null, 'a.name'); $this->assertValidQueryBuilder($qb, 'SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a INDEX BY a.name'); @@ -181,8 +184,8 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'g') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->from('Doctrine\Tests\Models\CMS\CmsGroup', 'g'); + ->from(CmsUser::class, 'u') + ->from(CmsGroup::class, 'g'); $this->assertValidQueryBuilder($qb, 'SELECT u, g FROM Doctrine\Tests\Models\CMS\CmsUser u, Doctrine\Tests\Models\CMS\CmsGroup g'); } @@ -191,8 +194,8 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'g') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->from('Doctrine\Tests\Models\CMS\CmsGroup', 'g') + ->from(CmsUser::class, 'u') + ->from(CmsGroup::class, 'g') ->indexBy('g', 'g.id'); $this->assertValidQueryBuilder($qb, 'SELECT u, g FROM Doctrine\Tests\Models\CMS\CmsUser u, Doctrine\Tests\Models\CMS\CmsGroup g INDEX BY g.id'); @@ -202,8 +205,8 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'g') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->from('Doctrine\Tests\Models\CMS\CmsGroup', 'g') + ->from(CmsUser::class, 'u') + ->from(CmsGroup::class, 'g') ->innerJoin('u.articles', 'a', 'ON', 'u.id = a.author_id'); $this->assertValidQueryBuilder($qb, 'SELECT u, g FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles a ON u.id = a.author_id, Doctrine\Tests\Models\CMS\CmsGroup g'); @@ -213,8 +216,8 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u', 'g') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->from('Doctrine\Tests\Models\CMS\CmsArticle', 'a') + ->from(CmsUser::class, 'u') + ->from(CmsArticle::class, 'a') ->innerJoin('u.groups', 'g') ->leftJoin('u.address', 'ad') ->innerJoin('a.comments', 'c'); @@ -226,7 +229,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid'); @@ -236,7 +239,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid OR u.id = :uid2 OR u.id = :uid3') ->andWhere('u.name = :name'); @@ -247,7 +250,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->andWhere('u.id = :uid2'); @@ -258,7 +261,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->orWhere('u.id = :uid2'); @@ -269,7 +272,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->orWhere('u.id = :uid2') ->andWhere('u.id = :uid3') @@ -283,7 +286,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->andWhere($qb->expr()->in('u.id', [1, 2, 3])); @@ -294,7 +297,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->orWhere($qb->expr()->in('u.id', [1, 2, 3])); @@ -305,7 +308,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3])); @@ -316,7 +319,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid') ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3])); @@ -327,7 +330,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->groupBy('u.id') ->addGroupBy('u.username'); @@ -338,7 +341,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->groupBy('u.id') ->having('COUNT(u.id) > 1'); @@ -349,7 +352,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->groupBy('u.id') ->having('COUNT(u.id) > 1') ->andHaving('COUNT(u.id) < 1'); @@ -361,7 +364,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->groupBy('u.id') ->having('COUNT(u.id) > 1') ->andHaving('COUNT(u.id) < 1') @@ -374,7 +377,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->orderBy('u.username', 'ASC'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.username ASC'); @@ -384,7 +387,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->orderBy($qb->expr()->asc('u.username')); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.username ASC'); @@ -394,7 +397,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->orderBy('u.username', 'ASC') ->addOrderBy('u.username', 'DESC'); @@ -405,7 +408,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->orderBy('u.username', 'ASC') ->addOrderBy($qb->expr()->desc('u.username')); @@ -416,7 +419,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $criteria = new Criteria(); $criteria->where($criteria->expr()->eq('field', 'value')); @@ -430,7 +433,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddMultipleSameCriteriaWhere() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $criteria = new Criteria(); $criteria->where($criteria->expr()->andX( @@ -451,7 +454,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithMultipleParametersWithSameField() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $criteria = new Criteria(); $criteria->where($criteria->expr()->eq('field', 'value1')); @@ -470,7 +473,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithMultipleParametersWithDifferentFields() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $criteria = new Criteria(); $criteria->where($criteria->expr()->eq('field1', 'value1')); @@ -489,7 +492,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithMultipleParametersWithSubpathsAndDifferentProperties() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $criteria = new Criteria(); $criteria->where($criteria->expr()->eq('field1', 'value1')); @@ -508,7 +511,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithMultipleParametersWithSubpathsAndSameProperty() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $criteria = new Criteria(); $criteria->where($criteria->expr()->eq('field1', 'value1')); @@ -525,7 +528,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $criteria = new Criteria(); $criteria->orderBy(['field' => Criteria::DESC]); @@ -543,7 +546,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->join('u.article','a'); $criteria = new Criteria(); @@ -559,7 +562,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $criteria = new Criteria(); $criteria->setFirstResult(2); @@ -575,7 +578,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->setFirstResult(2) ->setMaxResults(10); @@ -591,17 +594,17 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $q = $qb->getQuery(); - $this->assertEquals('Doctrine\ORM\Query', get_class($q)); + $this->assertEquals(Query::class, get_class($q)); } public function testSetParameter() { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :id') ->setParameter('id', 1); @@ -614,7 +617,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2')); $parameters = new ArrayCollection(); @@ -631,7 +634,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :id'); $parameters = new ArrayCollection(); @@ -646,7 +649,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :id'); $parameters = new ArrayCollection(); @@ -661,7 +664,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.id = :uid', 'u.id = :uid2'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id = :uid2'); @@ -671,7 +674,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->andWhere('u.id = :uid', 'u.id = :uid2'); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id = :uid2'); @@ -681,7 +684,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->orWhere('u.id = :uid', $qb->expr()->eq('u.id', ':uid2')); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id = :uid2'); @@ -695,7 +698,7 @@ class QueryBuilderTest extends OrmTestCase $orExpr->add($qb->expr()->in('u.id', [1])); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($orExpr); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR u.id IN(1)'); @@ -705,7 +708,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($qb->expr()->in('u.name', ['one', 'two', 'three'])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); @@ -720,7 +723,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $expr = $this->_em->getExpressionBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')])); $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')"); @@ -739,7 +742,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($orExpr); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR NOT(u.id IN(1))'); @@ -750,10 +753,8 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $expr = $this->_em->getExpressionBuilder(); - //$subquery = $qb->subquery('Doctrine\Tests\Models\CMS\CmsArticle', 'a')->select('a.id'); - $qb->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($expr->gt('u.id', $expr->all('select a.id from Doctrine\Tests\Models\CMS\CmsArticle a'))); $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id > ALL(select a.id from Doctrine\Tests\Models\CMS\CmsArticle a)'); @@ -765,7 +766,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder(); $expr = $this->_em->getExpressionBuilder(); - $qb->select('u')->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $qb->select('u')->from(CmsUser::class, 'u'); $qb->where($expr->eq('u.name', ':name')); $qb->setParameter('name', 'romanb'); @@ -802,7 +803,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $this->assertEquals(QueryBuilder::STATE_DIRTY, $qb->getState()); } @@ -820,7 +821,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.username = ?1')->orderBy('u.username'); $this->assertEquals('u.username = ?1', (string)$qb->getDQLPart('where')); @@ -836,7 +837,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.username = ?1')->orderBy('u.username'); $qb->resetDQLParts(['where', 'orderBy']); @@ -850,7 +851,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where('u.username = ?1')->orderBy('u.username'); $qb->resetDQLParts(); @@ -867,7 +868,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->andWhere('u.username = ?1') ->andWhere('u.status = ?2'); @@ -886,7 +887,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithJoinAlias() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $qb->join('alias1.articles','alias2'); $criteria = new Criteria(); @@ -906,7 +907,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereWithDefaultAndJoinAlias() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $qb->join('alias1.articles','alias2'); $criteria = new Criteria(); @@ -926,7 +927,7 @@ class QueryBuilderTest extends OrmTestCase public function testAddCriteriaWhereOnJoinAliasWithDuplicateFields() { $qb = $this->_em->createQueryBuilder(); - $qb->select('alias1')->from('Doctrine\Tests\Models\CMS\CmsUser', 'alias1'); + $qb->select('alias1')->from(CmsUser::class, 'alias1'); $qb->join('alias1.articles','alias2'); $criteria = new Criteria(); @@ -964,7 +965,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $this->assertEquals('u', $qb->getRootAlias()); } @@ -973,7 +974,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $this->assertEquals(['u'], $qb->getRootAliases()); } @@ -982,17 +983,17 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); - $this->assertEquals(['Doctrine\Tests\Models\CMS\CmsUser'], $qb->getRootEntities()); + $this->assertEquals([CmsUser::class], $qb->getRootEntities()); } public function testGetSeveralRootAliases() { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u2'); + ->from(CmsUser::class, 'u') + ->from(CmsUser::class, 'u2'); $this->assertEquals(['u', 'u2'], $qb->getRootAliases()); $this->assertEquals('u', $qb->getRootAlias()); @@ -1002,7 +1003,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->add('join', ['INNER JOIN u.groups g'], true); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.groups g', $qb->getDQL()); @@ -1016,7 +1017,7 @@ class QueryBuilderTest extends OrmTestCase $expr = $this->_em->getExpressionBuilder(); $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($expr->eq('u.username', $expr->literal(""))); $this->assertEquals("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = ''", $qb->getDQL()); @@ -1030,7 +1031,7 @@ class QueryBuilderTest extends OrmTestCase $expr = $this->_em->getExpressionBuilder(); $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->where($expr->eq('u.username', $expr->literal(0))); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 0', $qb->getDQL()); @@ -1043,7 +1044,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->add('select', 'u') - ->add('from', 'Doctrine\Tests\Models\CMS\CmsUser u'); + ->add('from', CmsUser::class . ' u'); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL()); } @@ -1056,7 +1057,7 @@ class QueryBuilderTest extends OrmTestCase $qb = $this->_em->createQueryBuilder() ->select('u') ->distinct() - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + ->from(CmsUser::class, 'u'); $this->assertEquals('SELECT DISTINCT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL()); } @@ -1079,7 +1080,7 @@ class QueryBuilderTest extends OrmTestCase { $defaultQueryBuilder = $this->_em->createQueryBuilder() ->select('s') - ->from('Doctrine\Tests\Models\Cache\State', 's'); + ->from(State::class, 's'); $this->assertFalse($defaultQueryBuilder->isCacheable()); $this->assertEquals(0, $defaultQueryBuilder->getLifetime()); @@ -1099,7 +1100,7 @@ class QueryBuilderTest extends OrmTestCase ->setCacheable(true) ->setCacheRegion('foo_reg') ->setCacheMode(Cache::MODE_REFRESH) - ->from('Doctrine\Tests\Models\Cache\State', 's'); + ->from(State::class, 's'); $this->assertTrue($builder->isCacheable()); $this->assertEquals(123, $builder->getLifetime()); @@ -1121,7 +1122,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->join('u.article', 'a'); $dqlParts = $qb->getDQLParts(); @@ -1139,7 +1140,7 @@ class QueryBuilderTest extends OrmTestCase public function testGetAllAliasesWithNoJoins() { $qb = $this->_em->createQueryBuilder(); - $qb->select('u')->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + $qb->select('u')->from(CmsUser::class, 'u'); $aliases = $qb->getAllAliases(); @@ -1150,7 +1151,7 @@ class QueryBuilderTest extends OrmTestCase { $qb = $this->_em->createQueryBuilder() ->select('u') - ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->from(CmsUser::class, 'u') ->join('u.groups', 'g'); $aliases = $qb->getAllAliases(); diff --git a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php index 182554c93..963757618 100644 --- a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php @@ -6,6 +6,8 @@ use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Repository\DefaultRepositoryFactory; +use Doctrine\Tests\Models\DDC753\DDC753DefaultRepository; +use Doctrine\Tests\Models\DDC869\DDC869PaymentRepository; use PHPUnit_Framework_TestCase; /** @@ -39,31 +41,28 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase $this->entityManager = $this->createEntityManager(); $this->repositoryFactory = new DefaultRepositoryFactory(); - $this - ->configuration + $this->configuration ->expects($this->any()) ->method('getDefaultRepositoryClassName') - ->will($this->returnValue('Doctrine\\Tests\\Models\\DDC869\\DDC869PaymentRepository')); + ->will($this->returnValue(DDC869PaymentRepository::class)); } public function testCreatesRepositoryFromDefaultRepositoryClass() { - $this - ->entityManager + $this->entityManager ->expects($this->any()) ->method('getClassMetadata') ->will($this->returnCallback([$this, 'buildClassMetadata'])); $this->assertInstanceOf( - 'Doctrine\\Tests\\Models\\DDC869\\DDC869PaymentRepository', + DDC869PaymentRepository::class, $this->repositoryFactory->getRepository($this->entityManager, __CLASS__) ); } public function testCreatedRepositoriesAreCached() { - $this - ->entityManager + $this->entityManager ->expects($this->any()) ->method('getClassMetadata') ->will($this->returnCallback([$this, 'buildClassMetadata'])); @@ -77,17 +76,15 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase public function testCreatesRepositoryFromCustomClassMetadata() { $customMetadata = $this->buildClassMetadata(__DIR__); + $customMetadata->customRepositoryClassName = DDC753DefaultRepository::class; - $customMetadata->customRepositoryClassName = 'Doctrine\\Tests\\Models\\DDC753\\DDC753DefaultRepository'; - - $this - ->entityManager + $this->entityManager ->expects($this->any()) ->method('getClassMetadata') ->will($this->returnValue($customMetadata)); $this->assertInstanceOf( - 'Doctrine\\Tests\\Models\\DDC753\\DDC753DefaultRepository', + DDC753DefaultRepository::class, $this->repositoryFactory->getRepository($this->entityManager, __CLASS__) ); } @@ -97,12 +94,11 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase $em1 = $this->createEntityManager(); $em2 = $this->createEntityManager(); - $em1 - ->expects($this->any()) + $em1->expects($this->any()) ->method('getClassMetadata') ->will($this->returnCallback([$this, 'buildClassMetadata'])); - $em2 - ->expects($this->any()) + + $em2->expects($this->any()) ->method('getClassMetadata') ->will($this->returnCallback([$this, 'buildClassMetadata'])); @@ -141,8 +137,7 @@ class DefaultRepositoryFactoryTest extends PHPUnit_Framework_TestCase { $entityManager = $this->createMock(EntityManagerInterface::class); - $entityManager - ->expects($this->any()) + $entityManager->expects($this->any()) ->method('getConfiguration') ->will($this->returnValue($this->configuration)); diff --git a/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php index 8c0a7a75b..5008470fe 100644 --- a/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php @@ -40,36 +40,36 @@ class AttachEntityListenersListenerTest extends OrmTestCase public function testAttachEntityListeners() { $this->listener->addEntityListener( - AttachEntityListenersListenerTestFooEntity::CLASSNAME, - AttachEntityListenersListenerTestListener::CLASSNAME, + AttachEntityListenersListenerTestFooEntity::class, + AttachEntityListenersListenerTestListener::class, Events::postLoad, 'postLoadHandler' ); - $metadata = $this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::CLASSNAME); + $metadata = $this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::class); $this->assertArrayHasKey('postLoad', $metadata->entityListeners); $this->assertCount(1, $metadata->entityListeners['postLoad']); $this->assertEquals('postLoadHandler', $metadata->entityListeners['postLoad'][0]['method']); - $this->assertEquals(AttachEntityListenersListenerTestListener::CLASSNAME, $metadata->entityListeners['postLoad'][0]['class']); + $this->assertEquals(AttachEntityListenersListenerTestListener::class, $metadata->entityListeners['postLoad'][0]['class']); } public function testAttachToExistingEntityListeners() { $this->listener->addEntityListener( - AttachEntityListenersListenerTestBarEntity::CLASSNAME, - AttachEntityListenersListenerTestListener2::CLASSNAME, + AttachEntityListenersListenerTestBarEntity::class, + AttachEntityListenersListenerTestListener2::class, Events::prePersist ); $this->listener->addEntityListener( - AttachEntityListenersListenerTestBarEntity::CLASSNAME, - AttachEntityListenersListenerTestListener2::CLASSNAME, + AttachEntityListenersListenerTestBarEntity::class, + AttachEntityListenersListenerTestListener2::class, Events::postPersist, 'postPersistHandler' ); - $metadata = $this->factory->getMetadataFor(AttachEntityListenersListenerTestBarEntity::CLASSNAME); + $metadata = $this->factory->getMetadataFor(AttachEntityListenersListenerTestBarEntity::class); $this->assertArrayHasKey('postPersist', $metadata->entityListeners); $this->assertArrayHasKey('prePersist', $metadata->entityListeners); @@ -78,16 +78,16 @@ class AttachEntityListenersListenerTest extends OrmTestCase $this->assertCount(2, $metadata->entityListeners['postPersist']); $this->assertEquals('prePersist', $metadata->entityListeners['prePersist'][0]['method']); - $this->assertEquals(AttachEntityListenersListenerTestListener::CLASSNAME, $metadata->entityListeners['prePersist'][0]['class']); + $this->assertEquals(AttachEntityListenersListenerTestListener::class, $metadata->entityListeners['prePersist'][0]['class']); $this->assertEquals('prePersist', $metadata->entityListeners['prePersist'][1]['method']); - $this->assertEquals(AttachEntityListenersListenerTestListener2::CLASSNAME, $metadata->entityListeners['prePersist'][1]['class']); + $this->assertEquals(AttachEntityListenersListenerTestListener2::class, $metadata->entityListeners['prePersist'][1]['class']); $this->assertEquals('postPersist', $metadata->entityListeners['postPersist'][0]['method']); - $this->assertEquals(AttachEntityListenersListenerTestListener::CLASSNAME, $metadata->entityListeners['postPersist'][0]['class']); + $this->assertEquals(AttachEntityListenersListenerTestListener::class, $metadata->entityListeners['postPersist'][0]['class']); $this->assertEquals('postPersistHandler', $metadata->entityListeners['postPersist'][1]['method']); - $this->assertEquals(AttachEntityListenersListenerTestListener2::CLASSNAME, $metadata->entityListeners['postPersist'][1]['class']); + $this->assertEquals(AttachEntityListenersListenerTestListener2::class, $metadata->entityListeners['postPersist'][1]['class']); } /** @@ -97,18 +97,18 @@ class AttachEntityListenersListenerTest extends OrmTestCase public function testDuplicateEntityListenerException() { $this->listener->addEntityListener( - AttachEntityListenersListenerTestFooEntity::CLASSNAME, - AttachEntityListenersListenerTestListener::CLASSNAME, + AttachEntityListenersListenerTestFooEntity::class, + AttachEntityListenersListenerTestListener::class, Events::postPersist ); $this->listener->addEntityListener( - AttachEntityListenersListenerTestFooEntity::CLASSNAME, - AttachEntityListenersListenerTestListener::CLASSNAME, + AttachEntityListenersListenerTestFooEntity::class, + AttachEntityListenersListenerTestListener::class, Events::postPersist ); - $this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::CLASSNAME); + $this->factory->getMetadataFor(AttachEntityListenersListenerTestFooEntity::class); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php index c8e2abca7..5ac2f9752 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php @@ -4,10 +4,11 @@ namespace Doctrine\Tests\ORM\Tools\Console\Command; use Doctrine\ORM\Tools\Console\Command\ClearCache\CollectionRegionCommand; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; -use Symfony\Component\Console\Tester\CommandTester; -use Symfony\Component\Console\Helper\HelperSet; -use Symfony\Component\Console\Application; +use Doctrine\Tests\Models\Cache\State; use Doctrine\Tests\OrmFunctionalTestCase; +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Helper\HelperSet; +use Symfony\Component\Console\Tester\CommandTester; /** * @group DDC-2183 @@ -62,7 +63,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'owner-class' => 'Doctrine\Tests\Models\Cache\State', + 'owner-class' => State::class, 'association' => 'cities', ], ['decorated' => false] ); @@ -77,7 +78,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'owner-class' => 'Doctrine\Tests\Models\Cache\State', + 'owner-class' => State::class, 'association' => 'cities', 'owner-id' => 1, ], ['decorated' => false] @@ -93,7 +94,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'owner-class' => 'Doctrine\Tests\Models\Cache\State', + 'owner-class' => State::class, 'association' => 'cities', '--flush' => true, ], ['decorated' => false] diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php index b579c14d1..3546a3116 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php @@ -4,10 +4,11 @@ namespace Doctrine\Tests\ORM\Tools\Console\Command; use Doctrine\ORM\Tools\Console\Command\ClearCache\EntityRegionCommand; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; -use Symfony\Component\Console\Tester\CommandTester; -use Symfony\Component\Console\Helper\HelperSet; -use Symfony\Component\Console\Application; +use Doctrine\Tests\Models\Cache\Country; use Doctrine\Tests\OrmFunctionalTestCase; +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Helper\HelperSet; +use Symfony\Component\Console\Tester\CommandTester; /** * @group DDC-2183 @@ -62,7 +63,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', + 'entity-class' => Country::class, ], ['decorated' => false] ); @@ -76,7 +77,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', + 'entity-class' => Country::class, 'entity-id' => 1, ], ['decorated' => false] ); @@ -91,7 +92,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $tester->execute( [ 'command' => $command->getName(), - 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', + 'entity-class' => Country::class, '--flush' => true, ], ['decorated' => false] ); diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php index e306c34b6..45bdfa386 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php @@ -2,8 +2,10 @@ namespace Doctrine\Tests\ORM\Tools\Console\Command; +use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Tools\Console\Command\GenerateRepositoriesCommand; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; +use Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Helper\HelperSet; use Symfony\Component\Console\Application; @@ -98,13 +100,13 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase $repo1 = new \ReflectionClass($cname); $repo2 = new \ReflectionClass('DDC3231User1NoNamespaceRepository'); - $this->assertSame('Doctrine\ORM\EntityRepository', $repo1->getParentClass()->getName()); - $this->assertSame('Doctrine\ORM\EntityRepository', $repo2->getParentClass()->getName()); + $this->assertSame(EntityRepository::class, $repo1->getParentClass()->getName()); + $this->assertSame(EntityRepository::class, $repo2->getParentClass()->getName()); } public function testGenerateRepositoriesCustomDefaultRepository() { - $this->generateRepositories('DDC3231User2', 'Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository'); + $this->generateRepositories('DDC3231User2', DDC3231EntityRepository::class); $cname = 'Doctrine\Tests\Models\DDC3231\DDC3231User2Repository'; $fname = str_replace('\\', DIRECTORY_SEPARATOR, $cname) . '.php'; @@ -121,8 +123,8 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase $repo1 = new \ReflectionClass($cname); $repo2 = new \ReflectionClass('DDC3231User2NoNamespaceRepository'); - $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo1->getParentClass()->getName()); - $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo2->getParentClass()->getName()); + $this->assertSame(DDC3231EntityRepository::class, $repo1->getParentClass()->getName()); + $this->assertSame(DDC3231EntityRepository::class, $repo2->getParentClass()->getName()); } /** diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php index 01a4d13db..a27fb90d7 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/InfoCommandTest.php @@ -3,6 +3,8 @@ namespace Doctrine\Tests\ORM\Tools\Console\Command; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; +use Doctrine\Tests\Models\Cache\AttractionInfo; +use Doctrine\Tests\Models\Cache\City; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Helper\HelperSet; use Symfony\Component\Console\Application; @@ -33,11 +35,9 @@ class InfoCommandTest extends OrmFunctionalTestCase $this->application = new Application(); $command = new InfoCommand(); - $this->application->setHelperSet(new HelperSet( - [ - 'em' => new EntityManagerHelper($this->_em) - ] - )); + $this->application->setHelperSet( + new HelperSet(['em' => new EntityManagerHelper($this->_em)]) + ); $this->application->add($command); @@ -47,13 +47,9 @@ class InfoCommandTest extends OrmFunctionalTestCase public function testListAllClasses() { - $this->tester->execute( - [ - 'command' => $this->command->getName(), - ] - ); + $this->tester->execute(['command' => $this->command->getName()]); - $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $this->tester->getDisplay()); - $this->assertContains('Doctrine\Tests\Models\Cache\City', $this->tester->getDisplay()); + $this->assertContains(AttractionInfo::class, $this->tester->getDisplay()); + $this->assertContains(City::class, $this->tester->getDisplay()); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php index 9f1cec7f4..437f521e3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/MappingDescribeCommandTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Tools\Console\Command; use Doctrine\ORM\Tools\Console\Command\MappingDescribeCommand; use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper; +use Doctrine\Tests\Models\Cache\AttractionInfo; use Doctrine\Tests\OrmFunctionalTestCase; use Symfony\Component\Console\Application; use Symfony\Component\Console\Helper\HelperSet; @@ -60,7 +61,7 @@ class MappingDescribeCommandTest extends OrmFunctionalTestCase ); $display = $this->tester->getDisplay(); - $this->assertContains('Doctrine\Tests\Models\Cache\AttractionInfo', $display); + $this->assertContains(AttractionInfo::class, $display); $this->assertContains('Root entity name', $display); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php index aa74ce753..e2e68bd7e 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php @@ -67,12 +67,12 @@ class RunDqlCommandTest extends OrmFunctionalTestCase $this->tester->execute( [ 'command' => $this->command->getName(), - 'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e', + 'dql' => 'SELECT e FROM ' . DateTimeModel::class . ' e', ] ) ); - $this->assertContains(DateTimeModel::CLASSNAME, $this->tester->getDisplay()); + $this->assertContains(DateTimeModel::class, $this->tester->getDisplay()); } public function testWillShowQuery() @@ -85,7 +85,7 @@ class RunDqlCommandTest extends OrmFunctionalTestCase $this->tester->execute( [ 'command' => $this->command->getName(), - 'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e', + 'dql' => 'SELECT e FROM ' . DateTimeModel::class . ' e', '--show-sql' => 'true' ] ) diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index e51bb3116..5a9f451fe 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -67,7 +67,7 @@ class EntityGeneratorTest extends OrmTestCase $metadata->mapField(['fieldName' => 'status', 'type' => 'string', 'options' => ['default' => 'published']]); $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); $metadata->mapOneToOne( - ['fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book'] + ['fieldName' => 'author', 'targetEntity' => EntityGeneratorAuthor::class, 'mappedBy' => 'book'] ); $joinColumns = [ ['name' => 'author_id', 'referencedColumnName' => 'id'] @@ -75,7 +75,7 @@ class EntityGeneratorTest extends OrmTestCase $metadata->mapManyToMany( [ 'fieldName' => 'comments', - 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorComment', + 'targetEntity' => EntityGeneratorComment::class, 'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY, 'joinTable' => [ 'name' => 'book_comment', @@ -270,7 +270,7 @@ class EntityGeneratorTest extends OrmTestCase $comment = new EntityGeneratorComment(); $this->assertInstanceOf($metadata->name, $book->addComment($comment)); - $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $book->getComments()); + $this->assertInstanceOf(ArrayCollection::class, $book->getComments()); $this->assertEquals(new ArrayCollection([$comment]), $book->getComments()); $this->assertInternalType('boolean', $book->removeComment($comment)); $this->assertEquals(new ArrayCollection([]), $book->getComments()); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php index f40aba8f2..feff13dc0 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php @@ -2,9 +2,13 @@ namespace Doctrine\Tests\ORM\Tools; +use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\ORM\Tools\EntityRepositoryGenerator; -use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository; +use Doctrine\Tests\Models\DDC3231\DDC3231User1; +use Doctrine\Tests\Models\DDC3231\DDC3231User2; use Doctrine\Tests\OrmTestCase; class EntityRepositoryGeneratorTest extends OrmTestCase @@ -74,11 +78,8 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $em = $this->_getTestEntityManager(); $ns = $this->_namespace; - - require_once __DIR__ . '/../../Models/DDC3231/DDC3231User1.php'; - $className = $ns . '\DDC3231User1Tmp'; - $this->writeEntityClass('Doctrine\Tests\Models\DDC3231\DDC3231User1', $className); + $this->writeEntityClass(DDC3231User1::class, $className); $rpath = $this->writeRepositoryClass($className); @@ -90,13 +91,12 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $this->assertTrue($repo->inNamespace()); $this->assertSame($className . 'Repository', $repo->getName()); - $this->assertSame('Doctrine\ORM\EntityRepository', $repo->getParentClass()->getName()); - + $this->assertSame(EntityRepository::class, $repo->getParentClass()->getName()); require_once __DIR__ . '/../../Models/DDC3231/DDC3231User1NoNamespace.php'; $className2 = 'DDC3231User1NoNamespaceTmp'; - $this->writeEntityClass('DDC3231User1NoNamespace', $className2); + $this->writeEntityClass(\DDC3231User1NoNamespace::class, $className2); $rpath2 = $this->writeRepositoryClass($className2); @@ -108,7 +108,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $this->assertFalse($repo2->inNamespace()); $this->assertSame($className2 . 'Repository', $repo2->getName()); - $this->assertSame('Doctrine\ORM\EntityRepository', $repo2->getParentClass()->getName()); + $this->assertSame(EntityRepository::class, $repo2->getParentClass()->getName()); } /** @@ -119,13 +119,10 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $em = $this->_getTestEntityManager(); $ns = $this->_namespace; - - require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2.php'; - $className = $ns . '\DDC3231User2Tmp'; - $this->writeEntityClass('Doctrine\Tests\Models\DDC3231\DDC3231User2', $className); + $this->writeEntityClass(DDC3231User2::class, $className); - $rpath = $this->writeRepositoryClass($className, 'Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository'); + $rpath = $this->writeRepositoryClass($className, DDC3231EntityRepository::class); $this->assertNotNull($rpath); $this->assertFileExists($rpath); @@ -136,7 +133,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $this->assertTrue($repo->inNamespace()); $this->assertSame($className . 'Repository', $repo->getName()); - $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo->getParentClass()->getName()); + $this->assertSame(DDC3231EntityRepository::class, $repo->getParentClass()->getName()); require_once __DIR__ . '/../../Models/DDC3231/DDC3231User2NoNamespace.php'; @@ -144,7 +141,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $className2 = 'DDC3231User2NoNamespaceTmp'; $this->writeEntityClass('DDC3231User2NoNamespace', $className2); - $rpath2 = $this->writeRepositoryClass($className2, 'Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository'); + $rpath2 = $this->writeRepositoryClass($className2, DDC3231EntityRepository::class); $this->assertNotNull($rpath2); $this->assertFileExists($rpath2); @@ -155,13 +152,12 @@ class EntityRepositoryGeneratorTest extends OrmTestCase $this->assertFalse($repo2->inNamespace()); $this->assertSame($className2 . 'Repository', $repo2->getName()); - $this->assertSame('Doctrine\Tests\Models\DDC3231\DDC3231EntityRepository', $repo2->getParentClass()->getName()); + $this->assertSame(DDC3231EntityRepository::class, $repo2->getParentClass()->getName()); } /** * @param string $className * @param string $newClassName - * @return string */ private function writeEntityClass($className, $newClassName) { diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 2cf91c390..e9523b5b1 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -2,17 +2,20 @@ namespace Doctrine\Tests\ORM\Tools\Export; +use Doctrine\Common\EventManager; +use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver; use Doctrine\ORM\Configuration; -use Doctrine\ORM\Tools\Export\ClassMetadataExporter; +use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; +use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory; use Doctrine\ORM\Tools\EntityGenerator; -use Doctrine\Tests\Mocks\MetadataDriverMock; -use Doctrine\Tests\Mocks\EntityManagerMock; +use Doctrine\ORM\Tools\Export\ClassMetadataExporter; 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\Mocks\EntityManagerMock; use Doctrine\Tests\OrmTestCase; use Symfony\Component\Yaml\Parser; @@ -48,10 +51,10 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase protected function _createMetadataDriver($type, $path) { $mappingDriver = [ - 'php' => 'Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', - 'annotation' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver', - 'xml' => 'Doctrine\ORM\Mapping\Driver\XmlDriver', - 'yaml' => 'Doctrine\ORM\Mapping\Driver\YamlDriver', + 'php' => PHPDriver::class, + 'annotation' => AnnotationDriver::class, + 'xml' => XmlDriver::class, + 'yaml' => YamlDriver::class, ]; $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'."); @@ -85,9 +88,9 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase $cmf = $this->_createClassMetadataFactory($em, $type); $metadata = $cmf->getAllMetadata(); - $metadata[0]->name = 'Doctrine\Tests\ORM\Tools\Export\ExportedUser'; + $metadata[0]->name = ExportedUser::class; - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\ExportedUser', $metadata[0]->name); + $this->assertEquals(ExportedUser::class, $metadata[0]->name); $type = $this->_getType(); $cme = new ClassMetadataExporter(); @@ -106,7 +109,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase $exporter->export(); if ($type == 'annotation') { - $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', 'Doctrine\Tests\ORM\Tools\Export\ExportedUser').$this->_extension)); + $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->_extension)); } else { $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension)); } @@ -128,7 +131,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase $class = current($metadata); - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\ExportedUser', $class->name); + $this->assertEquals(ExportedUser::class, $class->name); return $class; } @@ -225,7 +228,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testOneToOneAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['address'])); - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Address', $class->associationMappings['address']['targetEntity']); + $this->assertEquals(Address::class, $class->associationMappings['address']['targetEntity']); $this->assertEquals('address_id', $class->associationMappings['address']['joinColumns'][0]['name']); $this->assertEquals('id', $class->associationMappings['address']['joinColumns'][0]['referencedColumnName']); $this->assertEquals('CASCADE', $class->associationMappings['address']['joinColumns'][0]['onDelete']); @@ -247,7 +250,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testManyToOneAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['mainGroup'])); - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Group', $class->associationMappings['mainGroup']['targetEntity']); + $this->assertEquals(Group::class, $class->associationMappings['mainGroup']['targetEntity']); } /** @@ -257,8 +260,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testOneToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['phonenumbers'])); - //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToManyMapping', $class->associationMappings['phonenumbers']); - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Phonenumber', $class->associationMappings['phonenumbers']['targetEntity']); + $this->assertEquals(Phonenumber::class, $class->associationMappings['phonenumbers']['targetEntity']); $this->assertEquals('user', $class->associationMappings['phonenumbers']['mappedBy']); $this->assertEquals(['number' => 'ASC'], $class->associationMappings['phonenumbers']['orderBy']); @@ -280,8 +282,7 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase public function testManyToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['groups'])); - //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $class->associationMappings['groups']); - $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Group', $class->associationMappings['groups']['targetEntity']); + $this->assertEquals(Group::class, $class->associationMappings['groups']['targetEntity']); $this->assertEquals('cms_users_groups', $class->associationMappings['groups']['joinTable']['name']); $this->assertEquals('user_id', $class->associationMappings['groups']['joinTable']['joinColumns'][0]['name']); @@ -362,9 +363,9 @@ abstract class AbstractClassMetadataExporterTest extends OrmTestCase $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'])); - $this->assertEquals(1, count($value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade'])); - $this->assertEquals('all', $value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade'][0]); + $this->assertTrue(isset($value[ExportedUser::class]['oneToMany']['interests']['cascade'])); + $this->assertEquals(1, count($value[ExportedUser::class]['oneToMany']['interests']['cascade'])); + $this->assertEquals('all', $value[ExportedUser::class]['oneToMany']['interests']['cascade'][0]); } else { $this->markTestSkipped('Test not available for '.$type.' driver'); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php index 8fe7425d9..5c8a0c013 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php @@ -1,6 +1,7 @@ setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE); $metadata->setPrimaryTable( @@ -50,13 +51,13 @@ $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO); $metadata->mapManyToOne( [ 'fieldName' => 'mainGroup', - 'targetEntity' => 'Doctrine\\Tests\\ORM\Tools\\Export\\Group', + 'targetEntity' => Export\Group::class, ] ); $metadata->mapOneToOne( [ 'fieldName' => 'address', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Address', + 'targetEntity' => Export\Address::class, 'inversedBy' => 'user', 'cascade' => [ @@ -79,7 +80,7 @@ $metadata->mapOneToOne( $metadata->mapOneToOne( [ 'fieldName' => 'cart', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Cart', + 'targetEntity' => Export\Cart::class, 'mappedBy' => 'user', 'cascade' => [ @@ -93,7 +94,7 @@ $metadata->mapOneToOne( $metadata->mapOneToMany( [ 'fieldName' => 'phonenumbers', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Phonenumber', + 'targetEntity' => Export\Phonenumber::class, 'cascade' => [ 1 => 'persist', @@ -111,7 +112,7 @@ $metadata->mapOneToMany( $metadata->mapManyToMany( [ 'fieldName' => 'groups', - 'targetEntity' => 'Doctrine\\Tests\\ORM\\Tools\\Export\\Group', + 'targetEntity' => Export\Group::class, 'fetch' => ClassMetadataInfo::FETCH_EXTRA_LAZY, 'cascade' => [ diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php index 691b8ef20..5f999f28a 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Tools\Pagination; use Doctrine\ORM\Query; +use Doctrine\ORM\Tools\Pagination\CountOutputWalker; class CountOutputWalkerTest extends PaginationTestCase { @@ -10,7 +11,7 @@ class CountOutputWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a'); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( @@ -22,7 +23,7 @@ class CountOutputWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( @@ -34,7 +35,7 @@ class CountOutputWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT g, u, count(u.id) AS userCount FROM Doctrine\Tests\ORM\Tools\Pagination\Group g LEFT JOIN g.users u GROUP BY g.id HAVING userCount > 0'); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( @@ -50,7 +51,7 @@ class CountOutputWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p ORDER BY p.id'); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\CountOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $query->setFirstResult(null)->setMaxResults(null); $this->assertEquals( diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php index cb085124d..2aa398d6f 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php @@ -14,7 +14,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -27,7 +27,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -40,7 +40,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost b GROUP BY b.id'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -53,7 +53,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a ORDER BY a.name'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -66,7 +66,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN p.category c JOIN p.author a'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); @@ -80,7 +80,7 @@ class CountWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery( "SELECT g, COUNT(u.id) AS userCount FROM Doctrine\Tests\Models\CMS\CmsGroup g LEFT JOIN g.users u GROUP BY g.id HAVING userCount > 0" ); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setFirstResult(null)->setMaxResults(null); $this->expectException(\RuntimeException::class); @@ -96,7 +96,7 @@ class CountWalkerTest extends PaginationTestCase { $query = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p LEFT JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'); - $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\CountWalker']); + $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CountWalker::class]); $query->setHint(CountWalker::HINT_DISTINCT, true); $query->setFirstResult(null)->setMaxResults(null); diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php index 78fd38e9a..06e21173d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php @@ -6,6 +6,7 @@ use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\PostgreSqlPlatform; use Doctrine\ORM\Query; +use Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker; class LimitSubqueryOutputWalkerTest extends PaginationTestCase { @@ -15,7 +16,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a'); $query->expireQueryCache(true); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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() @@ -30,7 +31,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery( 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a ORDER BY p.title'); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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() @@ -48,7 +49,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT u, g, COUNT(g.id) AS g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity' ); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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", @@ -67,7 +68,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT u, g, COUNT(g.id) AS g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC' ); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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", @@ -86,7 +87,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT u, g, COUNT(g.id) AS hidden g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC' ); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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", @@ -105,7 +106,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase $this->entityManager->getConnection()->setDatabasePlatform($odp); } - + public function testLimitSubqueryWithSortOracle() { $odp = $this->entityManager->getConnection()->getDatabasePlatform(); @@ -115,7 +116,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a ORDER BY p.title'); $query->expireQueryCache(true); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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() @@ -134,7 +135,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $query->expireQueryCache(true); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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", @@ -154,7 +155,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $query->expireQueryCache(true); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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", @@ -173,7 +174,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT p, c, a FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c JOIN p.author a'); $query->expireQueryCache(true); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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() @@ -187,7 +188,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery( 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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() @@ -204,7 +205,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1 FROM Author a0_) dctrn_result ORDER BY (1 - 1000) * 1 DESC', @@ -219,7 +220,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.image AS image_1, a0_.image_height AS image_height_2, a0_.image_width AS image_width_3, a0_.image_alt_desc AS image_alt_desc_4, a0_.user_id AS user_id_5 FROM Avatar a0_) dctrn_result ORDER BY image_height_2 * image_width_3 DESC', @@ -234,7 +235,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT id_0 FROM (SELECT u0_.id AS id_0, a1_.image_height AS image_height_1, a1_.image_width AS image_width_2, a1_.user_id AS user_id_3 FROM User u0_ INNER JOIN Avatar a1_ ON u0_.id = a1_.user_id) dctrn_result ORDER BY image_height_1 * image_width_2 DESC', @@ -249,7 +250,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT id_0 FROM (SELECT u0_.id AS id_0, a1_.id AS id_1, a1_.image_alt_desc AS image_alt_desc_2, a1_.image_height AS image_height_3, a1_.image_width AS image_width_4, a1_.user_id AS user_id_5 FROM User u0_ INNER JOIN Avatar a1_ ON u0_.id = a1_.user_id) dctrn_result ORDER BY image_height_3 * image_width_4 DESC', @@ -264,7 +265,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new OraclePlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT ID_0, MIN(SCLR_5) AS dctrn_minrownum FROM (SELECT a0_.id AS ID_0, a0_.image AS IMAGE_1, a0_.image_height AS IMAGE_HEIGHT_2, a0_.image_width AS IMAGE_WIDTH_3, a0_.image_alt_desc AS IMAGE_ALT_DESC_4, ROW_NUMBER() OVER(ORDER BY a0_.image_height * a0_.image_width DESC) AS SCLR_5, a0_.user_id AS USER_ID_6 FROM Avatar a0_) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC', @@ -281,7 +282,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT a, a.name AS HIDDEN ord FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY ord DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $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', @@ -296,7 +297,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase ); $this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform()); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertSame( 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.image AS image_1, a0_.image_height AS image_height_2, a0_.image_width AS image_width_3, a0_.image_alt_desc AS image_alt_desc_4, a0_.user_id AS user_id_5 FROM Avatar a0_) dctrn_result ORDER BY image_alt_desc_4 DESC', @@ -310,7 +311,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase 'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost b JOIN b.author a ORDER BY a.name ASC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, a1_.name AS name_1, b0_.author_id AS author_id_2, b0_.category_id AS category_id_3 FROM BlogPost b0_ INNER JOIN Author a1_ ON b0_.author_id = a1_.id) dctrn_result ORDER BY name_1 ASC', @@ -326,7 +327,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase WHERE ((SELECT COUNT(simple.id) FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost simple) = 1) ORDER BY b.id DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( '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_ WHERE ((SELECT COUNT(b1_.id) AS dctrn__1 FROM BlogPost b1_) = 1)) dctrn_result ORDER BY id_0 DESC', @@ -342,7 +343,7 @@ ORDER BY b.id DESC' WHERE ((SELECT COUNT(simple.id) FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost simple) = 1) ORDER BY b.id DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT id_0, MIN(sclr_1) AS dctrn_minrownum FROM (SELECT b0_.id AS id_0, ROW_NUMBER() OVER(ORDER BY b0_.id DESC) AS sclr_1, b0_.author_id AS author_id_2, b0_.category_id AS category_id_3 FROM BlogPost b0_ WHERE ((SELECT COUNT(b1_.id) AS dctrn__1 FROM BlogPost b1_) = 1)) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', @@ -361,7 +362,7 @@ ORDER BY b.id DESC' $query = $this->entityManager->createQuery( 'SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\Banner b ORDER BY b.id DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.name AS name_1 FROM Banner b0_) dctrn_result ORDER BY id_0 DESC', @@ -386,7 +387,7 @@ ORDER BY b.id DESC' FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY first_blog_post DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2 FROM Author a0_) dctrn_result ORDER BY sclr_2 DESC', @@ -411,7 +412,7 @@ ORDER BY b.id DESC' FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY first_blog_post DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT id_0, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS dctrn__2 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS sclr_3 FROM Author a0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', @@ -436,7 +437,7 @@ ORDER BY b.id DESC' FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY first_blog_post DESC' ); - $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( 'SELECT DISTINCT ID_0, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT a0_.id AS ID_0, a0_.name AS NAME_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS SCLR_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS dctrn__2 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS SCLR_3 FROM Author a0_) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC', diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php index 5ccec2e75..8ddc158b9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Tools\Pagination; use Doctrine\ORM\Query; +use Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker; /** * @group DDC-1613 @@ -15,7 +16,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $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", @@ -29,7 +30,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $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", @@ -43,7 +44,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $this->assertEquals( "SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", @@ -60,7 +61,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC", @@ -77,7 +78,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $this->assertEquals( "SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)", @@ -91,7 +92,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase $query = $this->entityManager->createQuery($dql); $limitQuery = clone $query; - $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\LimitSubqueryWalker']); + $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $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", diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php index bbe2dcea6..0c7cd48c2 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php @@ -16,7 +16,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -30,7 +30,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -44,7 +44,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -58,7 +58,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -72,7 +72,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 OR 2 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -86,7 +86,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE (1 = 1 OR 2 = 2) AND 3 = 3' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -100,7 +100,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE 1 = 1 AND 2 = 2 OR 3 = 3' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -114,7 +114,7 @@ class WhereInWalkerTest extends PaginationTestCase 'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g WHERE NOT 1 = 2' ); $whereInQuery = clone $query; - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -130,7 +130,7 @@ class WhereInWalkerTest extends PaginationTestCase $whereInQuery = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c' ); - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( @@ -143,7 +143,7 @@ class WhereInWalkerTest extends PaginationTestCase $whereInQuery = $this->entityManager->createQuery( 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c WHERE 1 = 1' ); - $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, ['Doctrine\ORM\Tools\Pagination\WhereInWalker']); + $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]); $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10); $this->assertEquals( diff --git a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php index d089317c9..910df27f8 100644 --- a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php @@ -40,27 +40,19 @@ class ResolveTargetEntityListenerTest extends OrmTestCase public function testResolveTargetEntityListenerCanResolveTargetEntity() { $evm = $this->em->getEventManager(); - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', - 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - [] - ); - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\TargetInterface', - 'Doctrine\Tests\ORM\Tools\TargetEntity', - [] - ); + $this->listener->addResolveTargetEntity(ResolveTargetInterface::class, ResolveTargetEntity::class, []); + $this->listener->addResolveTargetEntity(TargetInterface::class, TargetEntity::class, []); $evm->addEventSubscriber($this->listener); - $cm = $this->factory->getMetadataFor('Doctrine\Tests\ORM\Tools\ResolveTargetEntity'); + $cm = $this->factory->getMetadataFor(ResolveTargetEntity::class); $meta = $cm->associationMappings; - $this->assertSame('Doctrine\Tests\ORM\Tools\TargetEntity', $meta['manyToMany']['targetEntity']); - $this->assertSame('Doctrine\Tests\ORM\Tools\ResolveTargetEntity', $meta['manyToOne']['targetEntity']); - $this->assertSame('Doctrine\Tests\ORM\Tools\ResolveTargetEntity', $meta['oneToMany']['targetEntity']); - $this->assertSame('Doctrine\Tests\ORM\Tools\TargetEntity', $meta['oneToOne']['targetEntity']); + $this->assertSame(TargetEntity::class, $meta['manyToMany']['targetEntity']); + $this->assertSame(ResolveTargetEntity::class, $meta['manyToOne']['targetEntity']); + $this->assertSame(ResolveTargetEntity::class, $meta['oneToMany']['targetEntity']); + $this->assertSame(TargetEntity::class, $meta['oneToOne']['targetEntity']); - $this->assertSame($cm, $this->factory->getMetadataFor('Doctrine\Tests\ORM\Tools\ResolveTargetInterface')); + $this->assertSame($cm, $this->factory->getMetadataFor(ResolveTargetInterface::class)); } /** @@ -70,17 +62,13 @@ class ResolveTargetEntityListenerTest extends OrmTestCase */ public function testResolveTargetEntityListenerCanRetrieveTargetEntityByInterfaceName() { - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', - 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - [] - ); + $this->listener->addResolveTargetEntity(ResolveTargetInterface::class, ResolveTargetEntity::class, []); $this->em->getEventManager()->addEventSubscriber($this->listener); - $cm = $this->factory->getMetadataFor('Doctrine\Tests\ORM\Tools\ResolveTargetInterface'); + $cm = $this->factory->getMetadataFor(ResolveTargetInterface::class); - $this->assertSame($this->factory->getMetadataFor('Doctrine\Tests\ORM\Tools\ResolveTargetEntity'), $cm); + $this->assertSame($this->factory->getMetadataFor(ResolveTargetEntity::class), $cm); } /** @@ -89,22 +77,14 @@ class ResolveTargetEntityListenerTest extends OrmTestCase public function testAssertTableColumnsAreNotAddedInManyToMany() { $evm = $this->em->getEventManager(); - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', - 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - [] - ); - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\TargetInterface', - 'Doctrine\Tests\ORM\Tools\TargetEntity', - [] - ); + $this->listener->addResolveTargetEntity(ResolveTargetInterface::class, ResolveTargetEntity::class, []); + $this->listener->addResolveTargetEntity(TargetInterface::class, TargetEntity::class, []); $evm->addEventListener(Events::loadClassMetadata, $this->listener); - $cm = $this->factory->getMetadataFor('Doctrine\Tests\ORM\Tools\ResolveTargetEntity'); + $cm = $this->factory->getMetadataFor(ResolveTargetEntity::class); $meta = $cm->associationMappings['manyToMany']; - $this->assertSame('Doctrine\Tests\ORM\Tools\TargetEntity', $meta['targetEntity']); + $this->assertSame(TargetEntity::class, $meta['targetEntity']); $this->assertEquals(['resolvetargetentity_id', 'targetinterface_id'], $meta['joinTableColumns']); } @@ -117,11 +97,7 @@ class ResolveTargetEntityListenerTest extends OrmTestCase public function testDoesResolveTargetEntitiesInDQLAlsoWithInterfaces() { $evm = $this->em->getEventManager(); - $this->listener->addResolveTargetEntity( - 'Doctrine\Tests\ORM\Tools\ResolveTargetInterface', - 'Doctrine\Tests\ORM\Tools\ResolveTargetEntity', - [] - ); + $this->listener->addResolveTargetEntity(ResolveTargetInterface::class, ResolveTargetEntity::class, []); $evm->addEventSubscriber($this->listener); diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index 142ddcb2f..7bae933a6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php @@ -2,10 +2,20 @@ namespace Doctrine\Tests\ORM\Tools; +use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs; use Doctrine\ORM\Tools\SchemaTool; use Doctrine\ORM\Tools\ToolEvents; -use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs; -use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsArticle; +use Doctrine\Tests\Models\CMS\CmsComment; +use Doctrine\Tests\Models\CMS\CmsEmployee; +use Doctrine\Tests\Models\CMS\CmsGroup; +use Doctrine\Tests\Models\CMS\CmsPhonenumber; +use Doctrine\Tests\Models\CMS\CmsUser; +use Doctrine\Tests\Models\Forum\ForumAvatar; +use Doctrine\Tests\Models\Forum\ForumUser; +use Doctrine\Tests\Models\NullDefault\NullDefaultColumn; use Doctrine\Tests\OrmTestCase; class SchemaToolTest extends OrmTestCase @@ -16,13 +26,13 @@ class SchemaToolTest extends OrmTestCase $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmployee'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), + $em->getClassMetadata(CmsAddress::class), + $em->getClassMetadata(CmsArticle::class), + $em->getClassMetadata(CmsComment::class), + $em->getClassMetadata(CmsEmployee::class), + $em->getClassMetadata(CmsGroup::class), + $em->getClassMetadata(CmsPhonenumber::class), + $em->getClassMetadata(CmsUser::class), ]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -37,7 +47,7 @@ class SchemaToolTest extends OrmTestCase $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata(__NAMESPACE__ . '\\TestEntityWithAnnotationOptionsAttribute'), + $em->getClassMetadata(TestEntityWithAnnotationOptionsAttribute::class), ]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -58,9 +68,9 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $avatar = $em->getClassMetadata('Doctrine\Tests\Models\Forum\ForumAvatar'); + $avatar = $em->getClassMetadata(ForumAvatar::class); $avatar->fieldMappings['id']['columnDefinition'] = $customColumnDef; - $user = $em->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser'); + $user = $em->getClassMetadata(ForumUser::class); $classes = [$avatar, $user]; @@ -86,13 +96,13 @@ class SchemaToolTest extends OrmTestCase $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsArticle'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsComment'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsEmployee'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsGroup'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), + $em->getClassMetadata(CmsAddress::class), + $em->getClassMetadata(CmsArticle::class), + $em->getClassMetadata(CmsComment::class), + $em->getClassMetadata(CmsEmployee::class), + $em->getClassMetadata(CmsGroup::class), + $em->getClassMetadata(CmsPhonenumber::class), + $em->getClassMetadata(CmsUser::class), ]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -106,11 +116,7 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $classes = [ - $em->getClassMetadata('Doctrine\Tests\Models\NullDefault\NullDefaultColumn'), - ]; - - $customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes) + $customSchemaOptions = $schemaTool->getSchemaFromMetadata([$em->getClassMetadata(NullDefaultColumn::class)]) ->getTable('NullDefaultColumn') ->getColumn('nullDefault') ->getCustomSchemaOptions(); @@ -126,7 +132,7 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata(__NAMESPACE__ . '\\UniqueConstraintAnnotationModel'), + $em->getClassMetadata(UniqueConstraintAnnotationModel::class), ]; $schema = $schemaTool->getSchemaFromMetadata($classes); @@ -144,8 +150,8 @@ class SchemaToolTest extends OrmTestCase $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); $classes = [ - $em->getClassMetadata(__NAMESPACE__ . '\\FirstEntity'), - $em->getClassMetadata(__NAMESPACE__ . '\\SecondEntity') + $em->getClassMetadata(FirstEntity::class), + $em->getClassMetadata(SecondEntity::class) ]; $schema = $schemaTool->getSchemaFromMetadata($classes); diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index 627a7b6a6..ea2826309 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -89,8 +89,8 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidManyToManyJoinColumnSchema() { - $class1 = $this->em->getClassMetadata(__NAMESPACE__ . '\InvalidEntity1'); - $class2 = $this->em->getClassMetadata(__NAMESPACE__ . '\InvalidEntity2'); + $class1 = $this->em->getClassMetadata(InvalidEntity1::class); + $class2 = $this->em->getClassMetadata(InvalidEntity2::class); $ce = $this->validator->validateClass($class1); @@ -108,8 +108,8 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidToOneJoinColumnSchema() { - $class1 = $this->em->getClassMetadata(__NAMESPACE__ . '\InvalidEntity1'); - $class2 = $this->em->getClassMetadata(__NAMESPACE__ . '\InvalidEntity2'); + $class1 = $this->em->getClassMetadata(InvalidEntity1::class); + $class2 = $this->em->getClassMetadata(InvalidEntity2::class); $ce = $this->validator->validateClass($class2); @@ -127,8 +127,8 @@ class SchemaValidatorTest extends OrmTestCase */ public function testValidOneToOneAsIdentifierSchema() { - $class1 = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC1587ValidEntity2'); - $class2 = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC1587ValidEntity1'); + $class1 = $this->em->getClassMetadata(DDC1587ValidEntity2::class); + $class2 = $this->em->getClassMetadata(DDC1587ValidEntity1::class); $ce = $this->validator->validateClass($class1); @@ -140,7 +140,7 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidTripleAssociationAsKeyMapping() { - $classThree = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC1649Three'); + $classThree = $this->em->getClassMetadata(DDC1649Three::class); $ce = $this->validator->validateClass($classThree); $this->assertEquals( @@ -155,7 +155,7 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidBiDirectionalRelationMappingMissingInversedByAttribute() { - $class = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC3274One'); + $class = $this->em->getClassMetadata(DDC3274One::class); $ce = $this->validator->validateClass($class); $this->assertEquals( @@ -173,7 +173,7 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidOrderByInvalidField() { - $class = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC3322One'); + $class = $this->em->getClassMetadata(DDC3322One::class); $ce = $this->validator->validateClass($class); $this->assertEquals( @@ -190,7 +190,7 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidOrderByCollectionValuedAssociation() { - $class = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC3322Two'); + $class = $this->em->getClassMetadata(DDC3322Two::class); $ce = $this->validator->validateClass($class); $this->assertEquals( @@ -207,7 +207,7 @@ class SchemaValidatorTest extends OrmTestCase */ public function testInvalidOrderByAssociationInverseSide() { - $class = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC3322Three'); + $class = $this->em->getClassMetadata(DDC3322Three::class); $ce = $this->validator->validateClass($class); $this->assertEquals( diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index 0709d5256..d69e5b030 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -2,9 +2,13 @@ namespace Doctrine\Tests\ORM\Tools; -use Doctrine\ORM\Tools\Setup; -use Doctrine\Common\Cache\Cache; use Doctrine\Common\Cache\ArrayCache; +use Doctrine\Common\Cache\Cache; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\Mapping\Driver\AnnotationDriver; +use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Tools\Setup; use Doctrine\ORM\Version; use Doctrine\Tests\OrmTestCase; @@ -49,26 +53,26 @@ class SetupTest extends OrmTestCase { $config = Setup::createAnnotationMetadataConfiguration([], true); - $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); + $this->assertInstanceOf(Configuration::class, $config); $this->assertEquals(sys_get_temp_dir(), $config->getProxyDir()); $this->assertEquals('DoctrineProxies', $config->getProxyNamespace()); - $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\AnnotationDriver', $config->getMetadataDriverImpl()); + $this->assertInstanceOf(AnnotationDriver::class, $config->getMetadataDriverImpl()); } public function testXMLConfiguration() { $config = Setup::createXMLMetadataConfiguration([], true); - $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); - $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\XmlDriver', $config->getMetadataDriverImpl()); + $this->assertInstanceOf(Configuration::class, $config); + $this->assertInstanceOf(XmlDriver::class, $config->getMetadataDriverImpl()); } public function testYAMLConfiguration() { $config = Setup::createYAMLMetadataConfiguration([], true); - $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); - $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\YamlDriver', $config->getMetadataDriverImpl()); + $this->assertInstanceOf(Configuration::class, $config); + $this->assertInstanceOf(YamlDriver::class, $config->getMetadataDriverImpl()); } /** diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 42aadd431..72382549e 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -4,12 +4,10 @@ namespace Doctrine\Tests\ORM; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\NotifyPropertyChanged; -use Doctrine\Common\Persistence\Mapping\MappingException; use Doctrine\Common\PropertyChangedListener; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\ORMInvalidArgumentException; use Doctrine\ORM\UnitOfWork; -use Doctrine\ORM\ORMException; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\EntityManagerMock; @@ -77,8 +75,8 @@ class UnitOfWorkTest extends OrmTestCase public function testSavingSingleEntityWithIdentityColumnForcesInsert() { // Setup fake persister and id generator for identity generation - $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumUser', $userPersister); + $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(ForumUser::class)); + $this->_unitOfWork->setEntityPersister(ForumUser::class, $userPersister); $userPersister->setMockIdGeneratorType(ClassMetadata::GENERATOR_TYPE_IDENTITY); // Test @@ -117,12 +115,12 @@ class UnitOfWorkTest extends OrmTestCase { // Setup fake persister and id generator for identity generation //ForumUser - $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumUser', $userPersister); + $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(ForumUser::class)); + $this->_unitOfWork->setEntityPersister(ForumUser::class, $userPersister); $userPersister->setMockIdGeneratorType(ClassMetadata::GENERATOR_TYPE_IDENTITY); // ForumAvatar - $avatarPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumAvatar')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumAvatar', $avatarPersister); + $avatarPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(ForumAvatar::class)); + $this->_unitOfWork->setEntityPersister(ForumAvatar::class, $avatarPersister); $avatarPersister->setMockIdGeneratorType(ClassMetadata::GENERATOR_TYPE_IDENTITY); // Test @@ -148,10 +146,10 @@ class UnitOfWorkTest extends OrmTestCase public function testChangeTrackingNotify() { - $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\ORM\NotifyChangedEntity')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\ORM\NotifyChangedEntity', $persister); - $itemPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\ORM\NotifyChangedRelatedItem')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\ORM\NotifyChangedRelatedItem', $itemPersister); + $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(NotifyChangedEntity::class)); + $this->_unitOfWork->setEntityPersister(NotifyChangedEntity::class, $persister); + $itemPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(NotifyChangedRelatedItem::class)); + $this->_unitOfWork->setEntityPersister(NotifyChangedRelatedItem::class, $itemPersister); $entity = new NotifyChangedEntity; $entity->setData('thedata'); @@ -192,8 +190,8 @@ class UnitOfWorkTest extends OrmTestCase public function testGetEntityStateOnVersionedEntityWithAssignedIdentifier() { - $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\ORM\VersionedAssignedIdentifierEntity')); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\ORM\VersionedAssignedIdentifierEntity', $persister); + $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(VersionedAssignedIdentifierEntity::class)); + $this->_unitOfWork->setEntityPersister(VersionedAssignedIdentifierEntity::class, $persister); $e = new VersionedAssignedIdentifierEntity(); $e->id = 42; @@ -203,8 +201,8 @@ class UnitOfWorkTest extends OrmTestCase 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); + $persister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(CmsPhonenumber::class)); + $this->_unitOfWork->setEntityPersister(CmsPhonenumber::class, $persister); $ph = new CmsPhonenumber(); $ph->phonenumber = '12345'; @@ -230,9 +228,9 @@ class UnitOfWorkTest extends OrmTestCase public function testNoUndefinedIndexNoticeOnScheduleForUpdateWithoutChanges() { // Setup fake persister and id generator - $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser')); + $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata(ForumUser::class)); $userPersister->setMockIdGeneratorType(ClassMetadata::GENERATOR_TYPE_IDENTITY); - $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumUser', $userPersister); + $this->_unitOfWork->setEntityPersister(ForumUser::class, $userPersister); // Create a test user $user = new ForumUser(); @@ -266,10 +264,10 @@ class UnitOfWorkTest extends OrmTestCase public function testRejectsPersistenceOfObjectsWithInvalidAssociationValue($invalidValue) { $this->_unitOfWork->setEntityPersister( - 'Doctrine\Tests\Models\Forum\ForumUser', + ForumUser::class, new EntityPersisterMock( $this->_emMock, - $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser') + $this->_emMock->getClassMetadata(ForumUser::class) ) ); @@ -291,10 +289,10 @@ class UnitOfWorkTest extends OrmTestCase */ public function testRejectsChangeSetComputationForObjectsWithInvalidAssociationValue($invalidValue) { - $metadata = $this->_emMock->getClassMetadata('Doctrine\Tests\Models\Forum\ForumUser'); + $metadata = $this->_emMock->getClassMetadata(ForumUser::class); $this->_unitOfWork->setEntityPersister( - 'Doctrine\Tests\Models\Forum\ForumUser', + ForumUser::class, new EntityPersisterMock($this->_emMock, $metadata) ); diff --git a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php index 384d04328..86b6503d3 100644 --- a/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php +++ b/tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php @@ -37,10 +37,10 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\Flight'), - $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\City') + $this->_em->getClassMetadata(FirstRelatedEntity::class), + $this->_em->getClassMetadata(SecondRelatedEntity::class), + $this->_em->getClassMetadata(Flight::class), + $this->_em->getClassMetadata(City::class) ] ); } catch (ORMException $e) { @@ -65,10 +65,10 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase $this->_em->persist($firstRelatedEntity); $this->_em->flush(); - $firstEntity = $this->_em->getRepository('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity') + $firstEntity = $this->_em->getRepository(FirstRelatedEntity::class) ->findOneBy(['name' => 'Fred']); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity'); + $class = $this->_em->getClassMetadata(FirstRelatedEntity::class); $id = $class->getIdentifierValues($firstEntity); @@ -108,7 +108,7 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase $this->_em->persist($flight); $this->_em->flush(); - $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Cache\Flight'); + $class = $this->_em->getClassMetadata(Flight::class); $id = $class->getIdentifierValues($flight); $this->assertCount(2, $id); diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index b6d2f005c..9a6847853 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -7,13 +7,15 @@ 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\Cache\DefaultCacheFactory; +use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger; use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Tools\DebugUnitOfWorkListener; use Doctrine\ORM\Tools\SchemaTool; +use Doctrine\Tests\DbalTypes\Rot13Type; use Doctrine\Tests\EventListener\CacheMetadataListener; -use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger; -use Doctrine\ORM\Cache\DefaultCacheFactory; +use Doctrine\Tests\Models; /** * Base testcase class for all functional ORM testcases. @@ -86,219 +88,219 @@ abstract class OrmFunctionalTestCase extends OrmTestCase */ protected static $_modelSets = [ 'cms' => [ - 'Doctrine\Tests\Models\CMS\CmsUser', - 'Doctrine\Tests\Models\CMS\CmsPhonenumber', - 'Doctrine\Tests\Models\CMS\CmsAddress', - 'Doctrine\Tests\Models\CMS\CmsEmail', - 'Doctrine\Tests\Models\CMS\CmsGroup', - 'Doctrine\Tests\Models\CMS\CmsTag', - 'Doctrine\Tests\Models\CMS\CmsArticle', - 'Doctrine\Tests\Models\CMS\CmsComment', + Models\CMS\CmsUser::class, + Models\CMS\CmsPhonenumber::class, + Models\CMS\CmsAddress::class, + Models\CMS\CmsEmail::class, + Models\CMS\CmsGroup::class, + Models\CMS\CmsTag::class, + Models\CMS\CmsArticle::class, + Models\CMS\CmsComment::class, ], 'forum' => [], 'company' => [ - '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', - 'Doctrine\Tests\Models\Company\CompanyContract', + Models\Company\CompanyPerson::class, + Models\Company\CompanyEmployee::class, + Models\Company\CompanyManager::class, + Models\Company\CompanyOrganization::class, + Models\Company\CompanyEvent::class, + Models\Company\CompanyAuction::class, + Models\Company\CompanyRaffle::class, + Models\Company\CompanyCar::class, + Models\Company\CompanyContract::class, ], 'ecommerce' => [ - 'Doctrine\Tests\Models\ECommerce\ECommerceCart', - 'Doctrine\Tests\Models\ECommerce\ECommerceCustomer', - 'Doctrine\Tests\Models\ECommerce\ECommerceProduct', - 'Doctrine\Tests\Models\ECommerce\ECommerceShipping', - 'Doctrine\Tests\Models\ECommerce\ECommerceFeature', - 'Doctrine\Tests\Models\ECommerce\ECommerceCategory' + Models\ECommerce\ECommerceCart::class, + Models\ECommerce\ECommerceCustomer::class, + Models\ECommerce\ECommerceProduct::class, + Models\ECommerce\ECommerceShipping::class, + Models\ECommerce\ECommerceFeature::class, + Models\ECommerce\ECommerceCategory::class ], 'generic' => [ - 'Doctrine\Tests\Models\Generic\BooleanModel', - 'Doctrine\Tests\Models\Generic\DateTimeModel', - 'Doctrine\Tests\Models\Generic\DecimalModel', - 'Doctrine\Tests\Models\Generic\SerializationModel', + Models\Generic\BooleanModel::class, + Models\Generic\DateTimeModel::class, + Models\Generic\DecimalModel::class, + Models\Generic\SerializationModel::class, ], 'routing' => [ - 'Doctrine\Tests\Models\Routing\RoutingLeg', - 'Doctrine\Tests\Models\Routing\RoutingLocation', - 'Doctrine\Tests\Models\Routing\RoutingRoute', - 'Doctrine\Tests\Models\Routing\RoutingRouteBooking', + Models\Routing\RoutingLeg::class, + Models\Routing\RoutingLocation::class, + Models\Routing\RoutingRoute::class, + Models\Routing\RoutingRouteBooking::class, ], 'navigation' => [ - 'Doctrine\Tests\Models\Navigation\NavUser', - 'Doctrine\Tests\Models\Navigation\NavCountry', - 'Doctrine\Tests\Models\Navigation\NavPhotos', - 'Doctrine\Tests\Models\Navigation\NavTour', - 'Doctrine\Tests\Models\Navigation\NavPointOfInterest', + Models\Navigation\NavUser::class, + Models\Navigation\NavCountry::class, + Models\Navigation\NavPhotos::class, + Models\Navigation\NavTour::class, + Models\Navigation\NavPointOfInterest::class, ], 'directorytree' => [ - 'Doctrine\Tests\Models\DirectoryTree\AbstractContentItem', - 'Doctrine\Tests\Models\DirectoryTree\File', - 'Doctrine\Tests\Models\DirectoryTree\Directory', + Models\DirectoryTree\AbstractContentItem::class, + Models\DirectoryTree\File::class, + Models\DirectoryTree\Directory::class, ], 'ddc117' => [ - 'Doctrine\Tests\Models\DDC117\DDC117Article', - 'Doctrine\Tests\Models\DDC117\DDC117Reference', - 'Doctrine\Tests\Models\DDC117\DDC117Translation', - 'Doctrine\Tests\Models\DDC117\DDC117ArticleDetails', - 'Doctrine\Tests\Models\DDC117\DDC117ApproveChanges', - 'Doctrine\Tests\Models\DDC117\DDC117Editor', - 'Doctrine\Tests\Models\DDC117\DDC117Link', + Models\DDC117\DDC117Article::class, + Models\DDC117\DDC117Reference::class, + Models\DDC117\DDC117Translation::class, + Models\DDC117\DDC117ArticleDetails::class, + Models\DDC117\DDC117ApproveChanges::class, + Models\DDC117\DDC117Editor::class, + Models\DDC117\DDC117Link::class, ], 'ddc3699' => [ - 'Doctrine\Tests\Models\DDC3699\DDC3699Parent', - 'Doctrine\Tests\Models\DDC3699\DDC3699RelationOne', - 'Doctrine\Tests\Models\DDC3699\DDC3699RelationMany', - 'Doctrine\Tests\Models\DDC3699\DDC3699Child', + Models\DDC3699\DDC3699Parent::class, + Models\DDC3699\DDC3699RelationOne::class, + Models\DDC3699\DDC3699RelationMany::class, + Models\DDC3699\DDC3699Child::class, ], 'stockexchange' => [ - 'Doctrine\Tests\Models\StockExchange\Bond', - 'Doctrine\Tests\Models\StockExchange\Stock', - 'Doctrine\Tests\Models\StockExchange\Market', + Models\StockExchange\Bond::class, + Models\StockExchange\Stock::class, + Models\StockExchange\Market::class, ], 'legacy' => [ - 'Doctrine\Tests\Models\Legacy\LegacyUser', - 'Doctrine\Tests\Models\Legacy\LegacyUserReference', - 'Doctrine\Tests\Models\Legacy\LegacyArticle', - 'Doctrine\Tests\Models\Legacy\LegacyCar', + Models\Legacy\LegacyUser::class, + Models\Legacy\LegacyUserReference::class, + Models\Legacy\LegacyArticle::class, + Models\Legacy\LegacyCar::class, ], 'customtype' => [ - 'Doctrine\Tests\Models\CustomType\CustomTypeChild', - 'Doctrine\Tests\Models\CustomType\CustomTypeParent', - 'Doctrine\Tests\Models\CustomType\CustomTypeUpperCase', + Models\CustomType\CustomTypeChild::class, + Models\CustomType\CustomTypeParent::class, + Models\CustomType\CustomTypeUpperCase::class, ], 'compositekeyinheritance' => [ - 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedRootClass', - 'Doctrine\Tests\Models\CompositeKeyInheritance\JoinedChildClass', - 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleRootClass', - 'Doctrine\Tests\Models\CompositeKeyInheritance\SingleChildClass', + Models\CompositeKeyInheritance\JoinedRootClass::class, + Models\CompositeKeyInheritance\JoinedChildClass::class, + Models\CompositeKeyInheritance\SingleRootClass::class, + Models\CompositeKeyInheritance\SingleChildClass::class, ], 'taxi' => [ - 'Doctrine\Tests\Models\Taxi\PaidRide', - 'Doctrine\Tests\Models\Taxi\Ride', - 'Doctrine\Tests\Models\Taxi\Car', - 'Doctrine\Tests\Models\Taxi\Driver', + Models\Taxi\PaidRide::class, + Models\Taxi\Ride::class, + Models\Taxi\Car::class, + Models\Taxi\Driver::class, ], 'cache' => [ - 'Doctrine\Tests\Models\Cache\Country', - 'Doctrine\Tests\Models\Cache\State', - 'Doctrine\Tests\Models\Cache\City', - 'Doctrine\Tests\Models\Cache\Traveler', - 'Doctrine\Tests\Models\Cache\TravelerProfileInfo', - 'Doctrine\Tests\Models\Cache\TravelerProfile', - 'Doctrine\Tests\Models\Cache\Travel', - 'Doctrine\Tests\Models\Cache\Attraction', - 'Doctrine\Tests\Models\Cache\Restaurant', - 'Doctrine\Tests\Models\Cache\Beach', - 'Doctrine\Tests\Models\Cache\Bar', - 'Doctrine\Tests\Models\Cache\Flight', - 'Doctrine\Tests\Models\Cache\Token', - 'Doctrine\Tests\Models\Cache\Login', - 'Doctrine\Tests\Models\Cache\Client', - 'Doctrine\Tests\Models\Cache\Person', - 'Doctrine\Tests\Models\Cache\Address', - 'Doctrine\Tests\Models\Cache\Action', - 'Doctrine\Tests\Models\Cache\ComplexAction', - 'Doctrine\Tests\Models\Cache\AttractionInfo', - 'Doctrine\Tests\Models\Cache\AttractionContactInfo', - 'Doctrine\Tests\Models\Cache\AttractionLocationInfo' + Models\Cache\Country::class, + Models\Cache\State::class, + Models\Cache\City::class, + Models\Cache\Traveler::class, + Models\Cache\TravelerProfileInfo::class, + Models\Cache\TravelerProfile::class, + Models\Cache\Travel::class, + Models\Cache\Attraction::class, + Models\Cache\Restaurant::class, + Models\Cache\Beach::class, + Models\Cache\Bar::class, + Models\Cache\Flight::class, + Models\Cache\Token::class, + Models\Cache\Login::class, + Models\Cache\Client::class, + Models\Cache\Person::class, + Models\Cache\Address::class, + Models\Cache\Action::class, + Models\Cache\ComplexAction::class, + Models\Cache\AttractionInfo::class, + Models\Cache\AttractionContactInfo::class, + Models\Cache\AttractionLocationInfo::class ], 'tweet' => [ - 'Doctrine\Tests\Models\Tweet\User', - 'Doctrine\Tests\Models\Tweet\Tweet', - 'Doctrine\Tests\Models\Tweet\UserList', + Models\Tweet\User::class, + Models\Tweet\Tweet::class, + Models\Tweet\UserList::class, ], 'ddc2504' => [ - 'Doctrine\Tests\Models\DDC2504\DDC2504RootClass', - 'Doctrine\Tests\Models\DDC2504\DDC2504ChildClass', - 'Doctrine\Tests\Models\DDC2504\DDC2504OtherClass', + Models\DDC2504\DDC2504RootClass::class, + Models\DDC2504\DDC2504ChildClass::class, + Models\DDC2504\DDC2504OtherClass::class, ], 'ddc3346' => [ - 'Doctrine\Tests\Models\DDC3346\DDC3346Author', - 'Doctrine\Tests\Models\DDC3346\DDC3346Article', + Models\DDC3346\DDC3346Author::class, + Models\DDC3346\DDC3346Article::class, ], 'quote' => [ - 'Doctrine\Tests\Models\Quote\Address', - 'Doctrine\Tests\Models\Quote\Group', - 'Doctrine\Tests\Models\Quote\NumericEntity', - 'Doctrine\Tests\Models\Quote\Phone', - 'Doctrine\Tests\Models\Quote\User' + Models\Quote\Address::class, + Models\Quote\Group::class, + Models\Quote\NumericEntity::class, + Models\Quote\Phone::class, + Models\Quote\User::class ], 'vct_onetoone' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity' + Models\ValueConversionType\InversedOneToOneEntity::class, + Models\ValueConversionType\OwningOneToOneEntity::class ], 'vct_onetoone_compositeid' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity' + Models\ValueConversionType\InversedOneToOneCompositeIdEntity::class, + Models\ValueConversionType\OwningOneToOneCompositeIdEntity::class ], 'vct_onetoone_compositeid_foreignkey' => [ - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity' + Models\ValueConversionType\AuxiliaryEntity::class, + Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity::class, + Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity::class ], 'vct_onetomany' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity' + Models\ValueConversionType\InversedOneToManyEntity::class, + Models\ValueConversionType\OwningManyToOneEntity::class ], 'vct_onetomany_compositeid' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity' + Models\ValueConversionType\InversedOneToManyCompositeIdEntity::class, + Models\ValueConversionType\OwningManyToOneCompositeIdEntity::class ], 'vct_onetomany_compositeid_foreignkey' => [ - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity' + Models\ValueConversionType\AuxiliaryEntity::class, + Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity::class, + Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity::class ], 'vct_onetomany_extralazy' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity' + Models\ValueConversionType\InversedOneToManyExtraLazyEntity::class, + Models\ValueConversionType\OwningManyToOneExtraLazyEntity::class ], 'vct_manytomany' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity' + Models\ValueConversionType\InversedManyToManyEntity::class, + Models\ValueConversionType\OwningManyToManyEntity::class ], 'vct_manytomany_compositeid' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity' + Models\ValueConversionType\InversedManyToManyCompositeIdEntity::class, + Models\ValueConversionType\OwningManyToManyCompositeIdEntity::class ], 'vct_manytomany_compositeid_foreignkey' => [ - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity' + Models\ValueConversionType\AuxiliaryEntity::class, + Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity::class, + Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity::class ], 'vct_manytomany_extralazy' => [ - 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity' + Models\ValueConversionType\InversedManyToManyExtraLazyEntity::class, + Models\ValueConversionType\OwningManyToManyExtraLazyEntity::class ], 'geonames' => [ - 'Doctrine\Tests\Models\GeoNames\Country', - 'Doctrine\Tests\Models\GeoNames\Admin1', - 'Doctrine\Tests\Models\GeoNames\Admin1AlternateName', - 'Doctrine\Tests\Models\GeoNames\City' + Models\GeoNames\Country::class, + Models\GeoNames\Admin1::class, + Models\GeoNames\Admin1AlternateName::class, + Models\GeoNames\City::class ], 'custom_id_object_type' => [ - 'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeParent', - 'Doctrine\Tests\Models\CustomType\CustomIdObjectTypeChild', + Models\CustomType\CustomIdObjectTypeParent::class, + Models\CustomType\CustomIdObjectTypeChild::class, ], 'pagination' => [ - 'Doctrine\Tests\Models\Pagination\Company', - 'Doctrine\Tests\Models\Pagination\Logo', - 'Doctrine\Tests\Models\Pagination\Department', - 'Doctrine\Tests\Models\Pagination\User', - 'Doctrine\Tests\Models\Pagination\User1', + Models\Pagination\Company::class, + Models\Pagination\Logo::class, + Models\Pagination\Department::class, + Models\Pagination\User::class, + Models\Pagination\User1::class, ], 'versioned_many_to_one' => [ - 'Doctrine\Tests\Models\VersionedManyToOne\Category', - 'Doctrine\Tests\Models\VersionedManyToOne\Article', + Models\VersionedManyToOne\Category::class, + Models\VersionedManyToOne\Article::class, ], 'issue5989' => [ - 'Doctrine\Tests\Models\Issue5989\Issue5989Person', - 'Doctrine\Tests\Models\Issue5989\Issue5989Employee', - 'Doctrine\Tests\Models\Issue5989\Issue5989Manager', + Models\Issue5989\Issue5989Person::class, + Models\Issue5989\Issue5989Employee::class, + Models\Issue5989\Issue5989Manager::class, ], ]; @@ -810,9 +812,9 @@ abstract class OrmFunctionalTestCase extends OrmTestCase protected function setUpDBALTypes() { if (Type::hasType('rot13')) { - Type::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type'); + Type::overrideType('rot13', Rot13Type::class); } else { - Type::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type'); + Type::addType('rot13', Rot13Type::class); } } } diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 9d6e9b5ac..46e8ea143 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -10,7 +10,7 @@ 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; +use Doctrine\Tests\Mocks; /** * Base testcase class for all ORM testcases. @@ -149,8 +149,8 @@ abstract class OrmTestCase extends DoctrineTestCase if ($conn === null) { $conn = [ - 'driverClass' => 'Doctrine\Tests\Mocks\DriverMock', - 'wrapperClass' => 'Doctrine\Tests\Mocks\ConnectionMock', + 'driverClass' => Mocks\DriverMock::class, + 'wrapperClass' => Mocks\ConnectionMock::class, 'user' => 'john', 'password' => 'wayne' ]; @@ -160,7 +160,7 @@ abstract class OrmTestCase extends DoctrineTestCase $conn = DriverManager::getConnection($conn, $config, $eventManager); } - return EntityManagerMock::create($conn, $config, $eventManager); + return Mocks\EntityManagerMock::create($conn, $config, $eventManager); } protected function enableSecondLevelCache($log = true) From 62d122bd5416209413769102bdcb082d51cc01e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 8 Dec 2016 18:15:48 +0100 Subject: [PATCH 7/8] Remove old "CLASSNAME" constants from test models --- .../Tests/DbalTypes/CustomIdObjectType.php | 1 - tests/Doctrine/Tests/Models/Cache/Action.php | 2 -- tests/Doctrine/Tests/Models/Cache/Address.php | 2 -- .../Doctrine/Tests/Models/Cache/Attraction.php | 2 -- .../Models/Cache/AttractionContactInfo.php | 2 -- .../Tests/Models/Cache/AttractionInfo.php | 2 -- .../Models/Cache/AttractionLocationInfo.php | 2 -- tests/Doctrine/Tests/Models/Cache/Bar.php | 3 +-- tests/Doctrine/Tests/Models/Cache/Beach.php | 3 +-- tests/Doctrine/Tests/Models/Cache/City.php | 2 -- tests/Doctrine/Tests/Models/Cache/Client.php | 2 -- .../Tests/Models/Cache/ComplexAction.php | 2 -- tests/Doctrine/Tests/Models/Cache/Country.php | 2 -- tests/Doctrine/Tests/Models/Cache/Flight.php | 2 -- tests/Doctrine/Tests/Models/Cache/Login.php | 2 -- tests/Doctrine/Tests/Models/Cache/Person.php | 2 -- .../Doctrine/Tests/Models/Cache/Restaurant.php | 3 +-- tests/Doctrine/Tests/Models/Cache/State.php | 2 -- tests/Doctrine/Tests/Models/Cache/Token.php | 2 -- tests/Doctrine/Tests/Models/Cache/Travel.php | 2 -- tests/Doctrine/Tests/Models/Cache/Traveler.php | 2 -- .../Tests/Models/Cache/TravelerProfile.php | 2 -- .../Tests/Models/Cache/TravelerProfileInfo.php | 2 -- .../CustomType/CustomIdObjectTypeChild.php | 2 -- .../CustomType/CustomIdObjectTypeParent.php | 2 -- .../Tests/Models/DDC2504/DDC2504ChildClass.php | 1 - .../Tests/Models/DDC2504/DDC2504OtherClass.php | 2 -- .../Models/DDC2825/ExplicitSchemaAndTable.php | 2 -- .../DDC2825/SchemaAndTableInTableName.php | 4 +--- .../Tests/Models/DDC3346/DDC3346Article.php | 2 -- .../Tests/Models/DDC3346/DDC3346Author.php | 2 -- .../Tests/Models/DDC3597/DDC3597Image.php | 2 -- .../Tests/Models/DDC3597/DDC3597Media.php | 4 +--- .../Tests/Models/DDC3597/DDC3597Root.php | 2 -- .../Tests/Models/DDC3699/DDC3699Child.php | 2 -- .../Tests/Models/DDC3699/DDC3699Parent.php | 4 +--- .../Models/DDC3699/DDC3699RelationMany.php | 2 -- .../Models/DDC3699/DDC3699RelationOne.php | 2 -- .../DirectoryTree/AbstractContentItem.php | 2 -- .../Tests/Models/DirectoryTree/File.php | 2 -- .../Tests/Models/Generic/DateTimeModel.php | 2 -- .../EntityWithArrayDefaultArrayValueM2M.php | 2 -- .../Tests/Models/Hydration/SimpleEntity.php | 2 -- .../CompositeToOneKeyState.php | 2 -- .../Models/MixedToOneIdentity/Country.php | 2 -- .../Tests/Models/NonPublicSchemaJoins/User.php | 2 -- .../OneToOneSingleTableInheritance/Cat.php | 2 -- .../LitterBox.php | 4 +--- .../OneToOneSingleTableInheritance/Pet.php | 2 -- .../Reflection/ClassWithMixedProperties.php | 2 -- .../Tests/Models/Reflection/ParentClass.php | 2 -- tests/Doctrine/Tests/Models/Tweet/Tweet.php | 2 -- tests/Doctrine/Tests/Models/Tweet/User.php | 2 -- tests/Doctrine/Tests/Models/Tweet/UserList.php | 2 -- .../Models/VersionedManyToOne/Article.php | 2 -- .../Models/VersionedManyToOne/Category.php | 2 -- .../ORM/Functional/Ticket/DDC2494Test.php | 4 ---- .../ORM/Functional/Ticket/DDC2579Test.php | 10 ---------- .../ORM/Functional/Ticket/DDC2825Test.php | 2 -- .../ORM/Functional/Ticket/DDC2862Test.php | 4 ---- .../ORM/Functional/Ticket/DDC3192Test.php | 4 ---- .../ORM/Functional/Ticket/DDC3300Test.php | 6 ------ .../ORM/Functional/Ticket/DDC3582Test.php | 8 -------- .../ORM/Functional/Ticket/DDC3634Test.php | 5 ----- .../ORM/Functional/Ticket/DDC5684Test.php | 6 ------ .../Tests/ORM/Functional/ValueObjectsTest.php | 18 ------------------ .../AttachEntityListenersListenerTest.php | 8 -------- 67 files changed, 7 insertions(+), 189 deletions(-) diff --git a/tests/Doctrine/Tests/DbalTypes/CustomIdObjectType.php b/tests/Doctrine/Tests/DbalTypes/CustomIdObjectType.php index f59ab151c..0ebae5dff 100644 --- a/tests/Doctrine/Tests/DbalTypes/CustomIdObjectType.php +++ b/tests/Doctrine/Tests/DbalTypes/CustomIdObjectType.php @@ -8,7 +8,6 @@ use Doctrine\DBAL\Types\Type; class CustomIdObjectType extends Type { const NAME = 'CustomIdObject'; - const CLASSNAME = __CLASS__; /** * {@inheritdoc} diff --git a/tests/Doctrine/Tests/Models/Cache/Action.php b/tests/Doctrine/Tests/Models/Cache/Action.php index d23ab494b..72bbba4c1 100644 --- a/tests/Doctrine/Tests/Models/Cache/Action.php +++ b/tests/Doctrine/Tests/Models/Cache/Action.php @@ -10,8 +10,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class Action { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="string") diff --git a/tests/Doctrine/Tests/Models/Cache/Address.php b/tests/Doctrine/Tests/Models/Cache/Address.php index fa5363560..5ccb349d0 100644 --- a/tests/Doctrine/Tests/Models/Cache/Address.php +++ b/tests/Doctrine/Tests/Models/Cache/Address.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Address { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Attraction.php b/tests/Doctrine/Tests/Models/Cache/Attraction.php index 31f3d3069..f53786dde 100644 --- a/tests/Doctrine/Tests/Models/Cache/Attraction.php +++ b/tests/Doctrine/Tests/Models/Cache/Attraction.php @@ -17,8 +17,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ abstract class Attraction { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php index 4b4b37f3b..e25665528 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionContactInfo.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Cache; */ class AttractionContactInfo extends AttractionInfo { - const CLASSNAME = __CLASS__; - /** * @Column(unique=true) */ diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php index d257a53f3..978d8587e 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionInfo.php @@ -14,8 +14,6 @@ namespace Doctrine\Tests\Models\Cache; */ abstract class AttractionInfo { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php b/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php index 66f2633f5..e7419fb4a 100644 --- a/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/AttractionLocationInfo.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Cache; */ class AttractionLocationInfo extends AttractionInfo { - const CLASSNAME = __CLASS__; - /** * @Column(unique=true) */ diff --git a/tests/Doctrine/Tests/Models/Cache/Bar.php b/tests/Doctrine/Tests/Models/Cache/Bar.php index f0d093127..cc54d547c 100644 --- a/tests/Doctrine/Tests/Models/Cache/Bar.php +++ b/tests/Doctrine/Tests/Models/Cache/Bar.php @@ -7,5 +7,4 @@ namespace Doctrine\Tests\Models\Cache; */ class Bar extends Attraction { - const CLASSNAME = __CLASS__; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/Beach.php b/tests/Doctrine/Tests/Models/Cache/Beach.php index 61e623dc5..dcabe5935 100644 --- a/tests/Doctrine/Tests/Models/Cache/Beach.php +++ b/tests/Doctrine/Tests/Models/Cache/Beach.php @@ -7,5 +7,4 @@ namespace Doctrine\Tests\Models\Cache; */ class Beach extends Attraction { - const CLASSNAME = __CLASS__; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/City.php b/tests/Doctrine/Tests/Models/Cache/City.php index 40369728d..b3769fbe7 100644 --- a/tests/Doctrine/Tests/Models/Cache/City.php +++ b/tests/Doctrine/Tests/Models/Cache/City.php @@ -11,8 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class City { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Client.php b/tests/Doctrine/Tests/Models/Cache/Client.php index 70544256b..dfbc60e30 100644 --- a/tests/Doctrine/Tests/Models/Cache/Client.php +++ b/tests/Doctrine/Tests/Models/Cache/Client.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Client { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/ComplexAction.php b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php index 5f5faf6dd..9c0a0abd9 100644 --- a/tests/Doctrine/Tests/Models/Cache/ComplexAction.php +++ b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php @@ -10,8 +10,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class ComplexAction { - const CLASSNAME = __CLASS__; - /** * @Column */ diff --git a/tests/Doctrine/Tests/Models/Cache/Country.php b/tests/Doctrine/Tests/Models/Cache/Country.php index 11d094038..f4179f63e 100644 --- a/tests/Doctrine/Tests/Models/Cache/Country.php +++ b/tests/Doctrine/Tests/Models/Cache/Country.php @@ -9,8 +9,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Country { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Flight.php b/tests/Doctrine/Tests/Models/Cache/Flight.php index ce2f3476f..f109c34da 100644 --- a/tests/Doctrine/Tests/Models/Cache/Flight.php +++ b/tests/Doctrine/Tests/Models/Cache/Flight.php @@ -9,8 +9,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Flight { - const CLASSNAME = __CLASS__; - /** * @Id * @Cache diff --git a/tests/Doctrine/Tests/Models/Cache/Login.php b/tests/Doctrine/Tests/Models/Cache/Login.php index 8de766d38..24e5b133d 100644 --- a/tests/Doctrine/Tests/Models/Cache/Login.php +++ b/tests/Doctrine/Tests/Models/Cache/Login.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Login { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Person.php b/tests/Doctrine/Tests/Models/Cache/Person.php index 9cbe00c57..01ab416aa 100644 --- a/tests/Doctrine/Tests/Models/Cache/Person.php +++ b/tests/Doctrine/Tests/Models/Cache/Person.php @@ -9,8 +9,6 @@ namespace Doctrine\Tests\Models\Cache; */ class Person { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Restaurant.php b/tests/Doctrine/Tests/Models/Cache/Restaurant.php index 00d3ac061..c4bf94cbc 100644 --- a/tests/Doctrine/Tests/Models/Cache/Restaurant.php +++ b/tests/Doctrine/Tests/Models/Cache/Restaurant.php @@ -7,5 +7,4 @@ namespace Doctrine\Tests\Models\Cache; */ class Restaurant extends Attraction { - const CLASSNAME = __CLASS__; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Cache/State.php b/tests/Doctrine/Tests/Models/Cache/State.php index e59ecb2b1..77dd0122c 100644 --- a/tests/Doctrine/Tests/Models/Cache/State.php +++ b/tests/Doctrine/Tests/Models/Cache/State.php @@ -11,8 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class State { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Token.php b/tests/Doctrine/Tests/Models/Cache/Token.php index ba3fdb182..bcfbb1b91 100644 --- a/tests/Doctrine/Tests/Models/Cache/Token.php +++ b/tests/Doctrine/Tests/Models/Cache/Token.php @@ -10,8 +10,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class Token { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="string") diff --git a/tests/Doctrine/Tests/Models/Cache/Travel.php b/tests/Doctrine/Tests/Models/Cache/Travel.php index b25744dd6..1e0240066 100644 --- a/tests/Doctrine/Tests/Models/Cache/Travel.php +++ b/tests/Doctrine/Tests/Models/Cache/Travel.php @@ -11,8 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class Travel { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/Traveler.php b/tests/Doctrine/Tests/Models/Cache/Traveler.php index 3f720b465..c8b68565b 100644 --- a/tests/Doctrine/Tests/Models/Cache/Traveler.php +++ b/tests/Doctrine/Tests/Models/Cache/Traveler.php @@ -11,8 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class Traveler { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php b/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php index fbffa8b70..03b9c7d3d 100644 --- a/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php +++ b/tests/Doctrine/Tests/Models/Cache/TravelerProfile.php @@ -9,8 +9,6 @@ namespace Doctrine\Tests\Models\Cache; */ class TravelerProfile { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php b/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php index e78162849..154ce9600 100644 --- a/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php +++ b/tests/Doctrine/Tests/Models/Cache/TravelerProfileInfo.php @@ -9,8 +9,6 @@ namespace Doctrine\Tests\Models\Cache; */ class TravelerProfileInfo { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php index 334ad17c7..8e5ec73d5 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php @@ -10,8 +10,6 @@ use Doctrine\Tests\DbalTypes\CustomIdObject; */ class CustomIdObjectTypeChild { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="CustomIdObject") * diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php index 0460676fc..21ce535b8 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php @@ -11,8 +11,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class CustomIdObjectTypeParent { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="CustomIdObject") * diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504ChildClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504ChildClass.php index 08a4605b6..a43de5bbf 100644 --- a/tests/Doctrine/Tests/Models/DDC2504/DDC2504ChildClass.php +++ b/tests/Doctrine/Tests/Models/DDC2504/DDC2504ChildClass.php @@ -7,5 +7,4 @@ namespace Doctrine\Tests\Models\DDC2504; */ class DDC2504ChildClass extends DDC2504RootClass { - const CLASSNAME = __CLASS__; } diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php index a855cdf8a..c90ff2a0c 100644 --- a/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php +++ b/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php @@ -9,8 +9,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class DDC2504OtherClass { - const CLASSNAME = __CLASS__; - /** * @Column(type="integer") * @Id @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php index 60b5d5625..3b6957653 100644 --- a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php +++ b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\DDC2825; /** @Entity @Table(name="explicit_table", schema="explicit_schema") */ class ExplicitSchemaAndTable { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; } diff --git a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php index bd22c2b23..151e577ec 100644 --- a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php +++ b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php @@ -10,8 +10,6 @@ namespace Doctrine\Tests\Models\DDC2825; */ class SchemaAndTableInTableName { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php index dc8a876c5..8b26c6397 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Article.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\DDC3346; */ class DDC3346Article { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="integer") diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php index e284532c0..4611bbdd7 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\DDC3346; */ class DDC3346Author { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="integer") * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php index cc0b92cfb..5d1acfeb6 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php @@ -12,8 +12,6 @@ use Doctrine\Tests\Models\DDC3597\Embeddable\DDC3597Dimension; */ class DDC3597Image extends DDC3597Media { - const CLASSNAME = __CLASS__; - /** * @var DDC3597Dimension * @Embedded(class = "Doctrine\Tests\Models\DDC3597\Embeddable\DDC3597Dimension", columnPrefix = false) diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php index da6f60cd0..c285b3c40 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php @@ -4,14 +4,12 @@ namespace Doctrine\Tests\Models\DDC3597; /** * Description of Media - * + * * @author Volker von Hoesslin * @Entity */ abstract class DDC3597Media extends DDC3597Root { - const CLASSNAME = __CLASS__; - /** * @var string * diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php index 2f24c933a..3bdb67f13 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php @@ -15,8 +15,6 @@ use Doctrine\ORM\Mapping\DiscriminatorMap; */ abstract class DDC3597Root { - const CLASSNAME = __CLASS__; - /** * @var int * diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php index dc2222ef1..dc2ccfddd 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\DDC3699; /** @Entity @Table(name="ddc3699_child") */ class DDC3699Child extends DDC3699Parent { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php index 09cfedaef..2e5e7ab36 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\DDC3699; /** @MappedSuperclass */ abstract class DDC3699Parent { - const CLASSNAME = __CLASS__; - /** @Column(type="string") */ public $parentField; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationMany.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationMany.php index 3e0c06a67..1b907bb98 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationMany.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationMany.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\DDC3699; */ class DDC3699RelationMany { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationOne.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationOne.php index c63558d35..22807aafc 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationOne.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699RelationOne.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\DDC3699; */ class DDC3699RelationOne { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/Models/DirectoryTree/AbstractContentItem.php b/tests/Doctrine/Tests/Models/DirectoryTree/AbstractContentItem.php index 166f86cb0..41798724b 100644 --- a/tests/Doctrine/Tests/Models/DirectoryTree/AbstractContentItem.php +++ b/tests/Doctrine/Tests/Models/DirectoryTree/AbstractContentItem.php @@ -7,8 +7,6 @@ namespace Doctrine\Tests\Models\DirectoryTree; */ abstract class AbstractContentItem { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="integer") @GeneratedValue */ diff --git a/tests/Doctrine/Tests/Models/DirectoryTree/File.php b/tests/Doctrine/Tests/Models/DirectoryTree/File.php index 2e18a06cf..f6cbace23 100644 --- a/tests/Doctrine/Tests/Models/DirectoryTree/File.php +++ b/tests/Doctrine/Tests/Models/DirectoryTree/File.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\DirectoryTree; */ class File extends AbstractContentItem { - const CLASSNAME = __CLASS__; - /** @Column(type="string") */ protected $extension = "html"; diff --git a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php index c7035ff68..7ef61ea27 100644 --- a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php +++ b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Generic; */ class DateTimeModel { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="integer") * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Hydration/EntityWithArrayDefaultArrayValueM2M.php b/tests/Doctrine/Tests/Models/Hydration/EntityWithArrayDefaultArrayValueM2M.php index 8ba57db68..ff927968e 100644 --- a/tests/Doctrine/Tests/Models/Hydration/EntityWithArrayDefaultArrayValueM2M.php +++ b/tests/Doctrine/Tests/Models/Hydration/EntityWithArrayDefaultArrayValueM2M.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\Hydration; /** @Entity */ class EntityWithArrayDefaultArrayValueM2M { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/Hydration/SimpleEntity.php b/tests/Doctrine/Tests/Models/Hydration/SimpleEntity.php index dda00eb3b..7ec75174d 100644 --- a/tests/Doctrine/Tests/Models/Hydration/SimpleEntity.php +++ b/tests/Doctrine/Tests/Models/Hydration/SimpleEntity.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\Hydration; /** @Entity */ class SimpleEntity { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; } diff --git a/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php index 1ff583058..09bab229e 100644 --- a/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php +++ b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\MixedToOneIdentity; /** @Entity */ class CompositeToOneKeyState { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="string") diff --git a/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php b/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php index bbdc237f7..629cde160 100644 --- a/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php +++ b/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\MixedToOneIdentity; /** @Entity */ class Country { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */ public $country; } diff --git a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php index 1c40a5e43..be80cea33 100644 --- a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php +++ b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php @@ -10,8 +10,6 @@ namespace Doctrine\Tests\Models\NonPublicSchemaJoins; */ class User { - const CLASSNAME = __CLASS__; - /** * @Column(type="integer") * @Id diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php index 1e7eee014..993ae3949 100644 --- a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php +++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php @@ -5,8 +5,6 @@ namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance; /** @Entity */ class Cat extends Pet { - const CLASSNAME = __CLASS__; - /** * @OneToOne(targetEntity="LitterBox") * diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php index 7195a83ae..c347d2bed 100644 --- a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php +++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance; */ class LitterBox { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php index e779ddb09..ed541b983 100644 --- a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php +++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php @@ -10,8 +10,6 @@ namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance; */ abstract class Pet { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; } diff --git a/tests/Doctrine/Tests/Models/Reflection/ClassWithMixedProperties.php b/tests/Doctrine/Tests/Models/Reflection/ClassWithMixedProperties.php index 72899959a..80f480866 100644 --- a/tests/Doctrine/Tests/Models/Reflection/ClassWithMixedProperties.php +++ b/tests/Doctrine/Tests/Models/Reflection/ClassWithMixedProperties.php @@ -4,8 +4,6 @@ namespace Doctrine\Tests\Models\Reflection; class ClassWithMixedProperties extends ParentClass { - const CLASSNAME = __CLASS__; - public static $staticProperty = 'staticProperty'; public $publicProperty = 'publicProperty'; diff --git a/tests/Doctrine/Tests/Models/Reflection/ParentClass.php b/tests/Doctrine/Tests/Models/Reflection/ParentClass.php index bcc64ce92..f0e58f8d9 100644 --- a/tests/Doctrine/Tests/Models/Reflection/ParentClass.php +++ b/tests/Doctrine/Tests/Models/Reflection/ParentClass.php @@ -4,7 +4,5 @@ namespace Doctrine\Tests\Models\Reflection; class ParentClass { - const CLASSNAME = __CLASS__; - private $privatePropertyOverride = 'privatePropertyOverride'; } diff --git a/tests/Doctrine/Tests/Models/Tweet/Tweet.php b/tests/Doctrine/Tests/Models/Tweet/Tweet.php index 8a315df9e..5455452c2 100644 --- a/tests/Doctrine/Tests/Models/Tweet/Tweet.php +++ b/tests/Doctrine/Tests/Models/Tweet/Tweet.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Tweet; */ class Tweet { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Tweet/User.php b/tests/Doctrine/Tests/Models/Tweet/User.php index 68cf137f2..4efd6193e 100644 --- a/tests/Doctrine/Tests/Models/Tweet/User.php +++ b/tests/Doctrine/Tests/Models/Tweet/User.php @@ -10,8 +10,6 @@ use Doctrine\Common\Collections\ArrayCollection; */ class User { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/Tweet/UserList.php b/tests/Doctrine/Tests/Models/Tweet/UserList.php index 1eb3e141f..0f20f94b9 100644 --- a/tests/Doctrine/Tests/Models/Tweet/UserList.php +++ b/tests/Doctrine/Tests/Models/Tweet/UserList.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\Tweet; */ class UserList { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php b/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php index 0e5b1683f..16a5d743a 100644 --- a/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php +++ b/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\VersionedManyToOne; */ class Article { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(name="id", type="integer") diff --git a/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php b/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php index cb8840672..e29593a81 100644 --- a/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php +++ b/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php @@ -8,8 +8,6 @@ namespace Doctrine\Tests\Models\VersionedManyToOne; */ class Category { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(name="id", type="integer") diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php index 33109ddd7..4aa30e950 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2494Test.php @@ -76,8 +76,6 @@ class DDC2494Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC2494Currency { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="integer", type="ddc2494_tinyint") @@ -124,8 +122,6 @@ class DDC2494Currency */ class DDC2494Campaign { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php index 53ab6550b..e7ba77759 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2579Test.php @@ -67,9 +67,6 @@ class DDC2579Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC2579Entity { - - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="ddc2579") @@ -102,8 +99,6 @@ class DDC2579Entity */ class DDC2579EntityAssoc { - const CLASSNAME = __CLASS__; - /** * @Id * @ManyToOne(targetEntity="DDC2579AssocAssoc") @@ -122,8 +117,6 @@ class DDC2579EntityAssoc */ class DDC2579AssocAssoc { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="ddc2579") @@ -140,7 +133,6 @@ class DDC2579AssocAssoc class DDC2579Type extends StringType { const NAME = 'ddc2579'; - const CLASSNAME = __CLASS__; /** * {@inheritdoc} @@ -166,8 +158,6 @@ class DDC2579Type extends StringType class DDC2579Id { - const CLASSNAME = __CLASS__; - private $val; public function __construct($val) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php index 179fff8d0..7aeba002a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php @@ -100,8 +100,6 @@ class DDC2825Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName { - const CLASSNAME = __CLASS__; - /** * @Id @GeneratedValue * @Column(type="integer") diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php index 9a5bccd58..c4b2fb227 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php @@ -119,8 +119,6 @@ class DDC2862Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC2862Driver { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue @@ -196,8 +194,6 @@ class DDC2862Driver */ class DDC2862User { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php index 0c4def045..1262bce45 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php @@ -72,8 +72,6 @@ class DDC3192Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC3192Currency { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="ddc3192_currency_code") @@ -99,8 +97,6 @@ class DDC3192Currency */ class DDC3192Transaction { - const CLASSNAME = __CLASS__; - /** * @Id * @GeneratedValue diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php index 0f31ecedf..17de7d217 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3300Test.php @@ -58,30 +58,24 @@ class DDC3300Test extends \Doctrine\Tests\OrmFunctionalTestCase */ abstract class DDC3300Person { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */ public $id; } interface DDC3300BossInterface { - const INTERFACENAME = __CLASS__; } /** @Entity */ class DDC3300Boss extends DDC3300Person implements DDC3300BossInterface { - const CLASSNAME = __CLASS__; } interface DDC3300EmployeeInterface { - const INTERFACENAME = __CLASS__; } /** @Entity */ class DDC3300Employee extends DDC3300Person implements DDC3300EmployeeInterface { - const CLASSNAME = __CLASS__; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php index 2f10adcee..17b4bed85 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3582Test.php @@ -23,8 +23,6 @@ class DDC3582Test extends \Doctrine\Tests\OrmFunctionalTestCase /** @Entity */ class DDC3582Entity { - const CLASSNAME = __CLASS__; - /** @Column @Id */ private $id; @@ -41,8 +39,6 @@ class DDC3582Entity /** @Embeddable */ class DDC3582Embeddable1 { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3582Embeddable2") @var DDC3582Embeddable2 */ public $embeddable2; @@ -52,8 +48,6 @@ class DDC3582Embeddable1 /** @Embeddable */ class DDC3582Embeddable2 { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3582Embeddable3") @var DDC3582Embeddable3 */ public $embeddable3; @@ -63,8 +57,6 @@ class DDC3582Embeddable2 /** @Embeddable */ class DDC3582Embeddable3 { - const CLASSNAME = __CLASS__; - /** @Column */ public $embeddedValue = 'foo'; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php index 2f499f2d2..01f42bb93 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php @@ -74,8 +74,6 @@ class DDC3634Test extends OrmFunctionalTestCase { /** @Entity */ class DDC3634Entity { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="bigint") @GeneratedValue(strategy="AUTO") */ public $id; } @@ -90,8 +88,6 @@ class DDC3634Entity */ class DDC3634JTIBaseEntity { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="bigint") @GeneratedValue(strategy="AUTO") */ public $id; } @@ -99,7 +95,6 @@ class DDC3634JTIBaseEntity /** @Entity */ class DDC3634JTIChildEntity extends DDC3634JTIBaseEntity { - const CLASSNAME = __CLASS__; } class DDC3634LastInsertIdMockingConnection extends Connection diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php index 2e9fb8a8c..e525ae134 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php @@ -60,8 +60,6 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC5684ObjectIdType extends DBALTypes\IntegerType { - const CLASSNAME = __CLASS__; - public function convertToPHPValue($value, AbstractPlatform $platform) { return new DDC5684ObjectId($value); @@ -85,8 +83,6 @@ class DDC5684ObjectIdType extends DBALTypes\IntegerType class DDC5684ObjectId { - const CLASSNAME = __CLASS__; - public $value; public function __construct($value) @@ -106,8 +102,6 @@ class DDC5684ObjectId */ class DDC5684Object { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type=Doctrine\Tests\ORM\Functional\Ticket\DDC5684ObjectIdType::class) diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php index 7df4171b4..ff5de971a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php @@ -336,8 +336,6 @@ class ValueObjectsTest extends OrmFunctionalTestCase */ class DDC93Person { - const CLASSNAME = __CLASS__; - /** @Id @GeneratedValue @Column(type="integer") */ public $id; @@ -407,8 +405,6 @@ class DDC93Car extends DDC93Vehicle */ class DDC93Country { - const CLASSNAME = __CLASS__; - /** * @Column(type="string", nullable=true) */ @@ -425,8 +421,6 @@ class DDC93Country */ class DDC93Address { - const CLASSNAME = __CLASS__; - /** * @Column(type="string") */ @@ -464,8 +458,6 @@ class DDC93Customer /** @Embeddable */ class DDC93ContactInfo { - const CLASSNAME = __CLASS__; - /** * @Column(type="string") */ @@ -479,8 +471,6 @@ class DDC93ContactInfo */ class DDC3028PersonWithPrefix { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3028Id", columnPrefix = "foobar_") */ public $id; @@ -499,8 +489,6 @@ class DDC3028PersonWithPrefix */ class DDC3028PersonEmptyPrefix { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3028Id", columnPrefix = "") */ public $id; @@ -519,8 +507,6 @@ class DDC3028PersonEmptyPrefix */ class DDC3028PersonPrefixFalse { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3028Id", columnPrefix = false) */ public $id; @@ -535,8 +521,6 @@ class DDC3028PersonPrefixFalse */ class DDC3028Id { - const CLASSNAME = __CLASS__; - /** * @Id @Column(type="string") */ @@ -553,8 +537,6 @@ class DDC3028Id */ class DDC3028NestedEmbeddable { - const CLASSNAME = __CLASS__; - /** @Embedded(class="DDC3028Id", columnPrefix = "foo_") */ public $nestedWithPrefix; diff --git a/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php index 5008470fe..db4da0b5d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/AttachEntityListenersListenerTest.php @@ -117,8 +117,6 @@ class AttachEntityListenersListenerTest extends OrmTestCase */ class AttachEntityListenersListenerTestFooEntity { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="integer") @@ -133,8 +131,6 @@ class AttachEntityListenersListenerTestFooEntity */ class AttachEntityListenersListenerTestBarEntity { - const CLASSNAME = __CLASS__; - /** * @Id * @Column(type="integer") @@ -145,8 +141,6 @@ class AttachEntityListenersListenerTestBarEntity class AttachEntityListenersListenerTestListener { - const CLASSNAME = __CLASS__; - public $calls; public function prePersist() @@ -167,8 +161,6 @@ class AttachEntityListenersListenerTestListener class AttachEntityListenersListenerTestListener2 { - const CLASSNAME = __CLASS__; - public $calls; public function prePersist() From ba9fecc43fcf1e6776888854691b287d84429516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 8 Dec 2016 18:16:11 +0100 Subject: [PATCH 8/8] Remove commented code that seems to not be important --- .../ORM/Functional/BasicFunctionalTest.php | 10 --- .../Functional/ClassTableInheritanceTest.php | 1 - .../Tests/ORM/Functional/NotifyPolicyTest.php | 2 - .../PersistentCollectionCriteriaTest.php | 24 ------- .../ORM/Functional/Ticket/DDC144Test.php | 1 - .../ORM/Functional/Ticket/DDC3330Test.php | 7 -- .../ORM/Functional/Ticket/DDC425Test.php | 1 - .../ORM/Functional/Ticket/DDC522Test.php | 2 - .../ORM/Hydration/ObjectHydratorTest.php | 64 ------------------- .../Tests/ORM/Mapping/ClassMetadataTest.php | 1 - 10 files changed, 113 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index a0ac9a3a7..eec4844d1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -50,7 +50,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->flush(); $this->assertTrue($this->_em->contains($ph)); $this->assertTrue($this->_em->contains($user)); - //$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->phonenumbers); // Update name $user->name = 'guilherme'; @@ -96,8 +95,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->_em->persist($user); $this->_em->flush(); - //$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->phonenumbers); - // Remove the first element from the collection unset($user->phonenumbers[0]); $ph1->user = null; // owning side! @@ -283,7 +280,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $this->assertInstanceOf(PersistentCollection::class, $users[0]->phonenumbers); $this->assertTrue($users[0]->phonenumbers->isInitialized()); $this->assertEquals(0, $users[0]->phonenumbers->count()); - //$this->assertNull($users[0]->articles); } public function testBasicRefresh() @@ -512,9 +508,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase // that address to the user without actually loading it, using getReference(). $addressRef = $this->_em->getReference(CmsAddress::class, $address->getId()); - //$addressRef->getId(); - //\Doctrine\Common\Util\Debug::dump($addressRef); - $user->setAddress($addressRef); // Ugh! Initializes address 'cause of $address->setUser($user)! $this->_em->flush(); @@ -761,7 +754,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase */ public function testNewAssociatedEntityDuringFlushThrowsException2() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $user = new CmsUser(); $user->username = "beberlei"; $user->name = "Benjamin E."; @@ -796,7 +788,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase */ public function testNewAssociatedEntityDuringFlushThrowsException3() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $art = new CmsArticle(); $art->topic = 'topic'; $art->text = 'the text'; @@ -954,7 +945,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase */ public function testOneToOneMergeSetNull() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $user = new CmsUser(); $user->username = "beberlei"; $user->name = "Benjamin E."; diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 3553f9ad2..2698c3252 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -137,7 +137,6 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->assertEquals(100000, $person->getSalary()); $this->assertEquals('CTO', $person->getTitle()); $this->assertTrue(is_numeric($person->getId())); - //$this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyCar', $person->getCar()); } public function testSelfReferencingOneToOne() { diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php index 24dc6fd24..5444af671 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php @@ -31,8 +31,6 @@ class NotifyPolicyTest extends OrmFunctionalTestCase public function testChangeTracking() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $user = new NotifyUser(); $group = new NotifyGroup(); $user->setName('roman'); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php index a02f4091a..4e0f442d8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php @@ -95,28 +95,4 @@ class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase $this->assertCount(1, $tweets); $this->assertFalse($tweets->isInitialized()); } - - /*public function testCanCountWithoutLoadingManyToManyPersistentCollection() - { - $this->loadQuoteFixture(); - - $repository = $this->_em->getRepository('Doctrine\Tests\Models\Quote\User'); - - $user = $repository->findOneBy(array('name' => 'mgal')); - $groups = $user->groups->matching(new Criteria()); - - $this->assertInstanceOf('Doctrine\ORM\LazyManyToManyCriteriaCollection', $groups); - $this->assertFalse($groups->isInitialized()); - $this->assertCount(2, $groups); - $this->assertFalse($groups->isInitialized()); - - // Make sure it works with constraints - $criteria = new Criteria(Criteria::expr()->eq('name', 'quote1')); - $groups = $user->groups->matching($criteria); - - $this->assertInstanceOf('Doctrine\ORM\LazyManyToManyCriteriaCollection', $groups); - $this->assertFalse($groups->isInitialized()); - $this->assertCount(1, $groups); - $this->assertFalse($groups->isInitialized()); - }*/ } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index 78276f0dd..f85df4a7e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -13,7 +13,6 @@ class DDC144Test extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ $this->_em->getClassMetadata(DDC144FlowElement::class), - // $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC144Expression'), $this->_em->getClassMetadata(DDC144Operand::class), ] ); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php index c6a2f4ab1..a03c3172c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php @@ -42,13 +42,6 @@ class DDC3330Test extends OrmFunctionalTestCase $paginator = new Paginator($query, true); - /*foreach ($paginator as $building) { - echo 'BUILDING ID: '.$building->id."\n"; - foreach ($building->halls as $hall) { - echo ' - HALL: '.$hall->id.' - '.$hall->name."\n"; - } - }*/ - $this->assertEquals(3, count(iterator_to_array($paginator)), 'Count is not correct for pagination'); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php index 9c06160c7..8d91119a2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php @@ -11,7 +11,6 @@ class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_schemaTool->createSchema( [ $this->_em->getClassMetadata(DDC425Entity::class), - //$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC425Other') ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index 91860e8b0..9818e60aa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -31,8 +31,6 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testJoinColumnWithSameNameAsAssociationField() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $cust = new DDC522Customer; $cust->name = "name"; $cart = new DDC522Cart; diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index 83e398836..c7d82a0dc 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -1223,70 +1223,6 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(0, $result[1]['user']->articles->count()); } - /** - * SELECT PARTIAL u.{id,status}, a.id, a.topic, c.id as cid, c.topic as ctopic - * FROM CmsUser u - * LEFT JOIN u.articles a - * LEFT JOIN a.comments c - * - * @group bubu - * @dataProvider provideDataForUserEntityResult - */ - /*public function testChainedJoinWithScalars($userEntityKey) - { - $rsm = new ResultSetMapping; - $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsUser', 'u', $userEntityKey ?: null); - $rsm->addFieldResult('u', 'u__id', 'id'); - $rsm->addFieldResult('u', 'u__status', 'status'); - $rsm->addScalarResult('a__id', 'id'); - $rsm->addScalarResult('a__topic', 'topic'); - $rsm->addScalarResult('c__id', 'cid'); - $rsm->addScalarResult('c__topic', 'ctopic'); - - // Faked result set - $resultSet = array( - //row1 - array( - 'u__id' => '1', - 'u__status' => 'developer', - 'a__id' => '1', - 'a__topic' => 'The First', - 'c__id' => '1', - 'c__topic' => 'First Comment' - ), - array( - 'u__id' => '1', - 'u__status' => 'developer', - 'a__id' => '1', - 'a__topic' => 'The First', - 'c__id' => '2', - 'c__topic' => 'Second Comment' - ), - array( - 'u__id' => '1', - 'u__status' => 'developer', - 'a__id' => '42', - 'a__topic' => 'The Answer', - 'c__id' => null, - 'c__topic' => null - ), - ); - - $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); - - \Doctrine\Common\Util\Debug::dump($result, 3); - - $this->assertEquals(1, count($result)); - - $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][$userEntityKey]); // User object - $this->assertEquals(42, $result[0]['id']); - $this->assertEquals('The First', $result[0]['topic']); - $this->assertEquals(1, $result[0]['cid']); - $this->assertEquals('First Comment', $result[0]['ctopic']); - }*/ - /** * SELECT PARTIAL u.{id, name} * FROM Doctrine\Tests\Models\CMS\CmsUser u diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 1dac953c2..3e9148b4d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -127,7 +127,6 @@ class ClassMetadataTest extends OrmTestCase ); $assoc = $cm->associationMappings['groups']; - //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $assoc); $this->assertEquals( [ 'name' => 'cmsuser_cmsgroup',