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)