Skip to content

Commit a4d3bcb

Browse files
rela589nrela589n
committed
Feature: add support for ClassLocator
In the scope of doctrine/persistence#433 (available from `doctrine/persistence` >= 4.1) there was added `ColocatedMappingDriver::$classLocator` property, which allows passing any instance of `ClassLocator` for the mapping driver to use. This commit integrates those changes into `AttributeDriver`. Since `doctrine/orm` maintains the support for `doctrine/persistence` of older versions, tests ensure that `ClassLocator` actually exists. The old paths behaviour can be adapted into the new by using `FileClassLocator::createFromDirectories($directoryPaths)` and passing it as a class locator to `AttributeDriver`. # Conflicts: # tests/Tests/ORM/Persisters/BinaryIdPersisterTest.php
1 parent c1f7a60 commit a4d3bcb

File tree

16 files changed

+158
-56
lines changed

16 files changed

+158
-56
lines changed

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
},
3939
"require-dev": {
4040
"doctrine/coding-standard": "^13.0",
41+
"doctrine/persistence": "^3.3.1 || ^4@dev",
4142
"phpbench/phpbench": "^1.0",
4243
"phpdocumentor/guides-cli": "^1.4",
4344
"phpstan/extension-installer": "^1.4",

‎docs/en/reference/advanced-configuration.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps of configuration.
2929
3030
$config = new Configuration;
3131
$config->setMetadataCache($metadataCache);
32-
$driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities'], true);
32+
$driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
3333
$config->setMetadataDriverImpl($driverImpl);
3434
$config->setQueryCache($queryCache);
3535
@@ -154,7 +154,7 @@ The attribute driver can be injected in the ``Doctrine\ORM\Configuration``:
154154
<?php
155155
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
156156
157-
$driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities'], true);
157+
$driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
158158
$config->setMetadataDriverImpl($driverImpl);
159159
160160
The path information to the entities is required for the attribute

‎phpstan-baseline.neon‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,6 +1314,20 @@ parameters:
13141314
count: 1
13151315
path: src/Mapping/DefaultQuoteStrategy.php
13161316

1317+
-
1318+
message: '#^Access to an undefined property Doctrine\\ORM\\Mapping\\Driver\\AttributeDriver\:\:\$classLocator\.$#'
1319+
identifier: property.notFound
1320+
count: 1
1321+
path: src/Mapping/Driver/AttributeDriver.php
1322+
reportUnmatched: false
1323+
1324+
-
1325+
message: '#^Class Doctrine\\Persistence\\Mapping\\Driver\\ClassLocator not found\.$#'
1326+
identifier: class.notFound
1327+
count: 1
1328+
path: src/Mapping/Driver/AttributeDriver.php
1329+
reportUnmatched: false
1330+
13171331
-
13181332
message: '#^Method Doctrine\\ORM\\Mapping\\Driver\\AttributeDriver\:\:isRepeatedPropertyDeclaration\(\) has parameter \$metadata with generic class Doctrine\\ORM\\Mapping\\ClassMetadata but does not specify its types\: T$#'
13191333
identifier: missingType.generics
@@ -1326,6 +1340,13 @@ parameters:
13261340
count: 1
13271341
path: src/Mapping/Driver/AttributeDriver.php
13281342

1343+
-
1344+
message: '#^Parameter \$paths of method Doctrine\\ORM\\Mapping\\Driver\\AttributeDriver\:\:__construct\(\) has invalid type Doctrine\\Persistence\\Mapping\\Driver\\ClassLocator\.$#'
1345+
identifier: class.notFound
1346+
count: 2
1347+
path: src/Mapping/Driver/AttributeDriver.php
1348+
reportUnmatched: false
1349+
13291350
-
13301351
message: '#^Unable to resolve the template type C in call to method Doctrine\\ORM\\Mapping\\ClassMetadata\<T of object\>\:\:fullyQualifiedClassName\(\)$#'
13311352
identifier: argument.templateType
@@ -1650,6 +1671,20 @@ parameters:
16501671
count: 1
16511672
path: src/ORMInvalidArgumentException.php
16521673

1674+
-
1675+
message: '#^Parameter \$paths of method Doctrine\\ORM\\ORMSetup\:\:createAttributeMetadataConfig\(\) has invalid type Doctrine\\Persistence\\Mapping\\Driver\\ClassLocator\.$#'
1676+
identifier: class.notFound
1677+
count: 2
1678+
path: src/ORMSetup.php
1679+
reportUnmatched: false
1680+
1681+
-
1682+
message: '#^Parameter \$paths of method Doctrine\\ORM\\ORMSetup\:\:createAttributeMetadataConfiguration\(\) has invalid type Doctrine\\Persistence\\Mapping\\Driver\\ClassLocator\.$#'
1683+
identifier: class.notFound
1684+
count: 2
1685+
path: src/ORMSetup.php
1686+
reportUnmatched: false
1687+
16531688
-
16541689
message: '#^Call to method Doctrine\\ORM\\Mapping\\AssociationMapping\:\:isToMany\(\) will always evaluate to true\.$#'
16551690
identifier: method.alreadyNarrowedType

‎src/Mapping/Driver/AttributeDriver.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\ClassMetadata;
1111
use Doctrine\ORM\Mapping\MappingException;
1212
use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata;
13+
use Doctrine\Persistence\Mapping\Driver\ClassLocator;
1314
use Doctrine\Persistence\Mapping\Driver\ColocatedMappingDriver;
1415
use Doctrine\Persistence\Mapping\Driver\MappingDriver;
1516
use InvalidArgumentException;
@@ -35,10 +36,10 @@ class AttributeDriver implements MappingDriver
3536
private readonly AttributeReader $reader;
3637

3738
/**
38-
* @param array<string> $paths
39-
* @param true $reportFieldsWhereDeclared no-op, to be removed in 4.0
39+
* @param string[]|ClassLocator $paths a ClassLocator, or an array of directories.
40+
* @param true $reportFieldsWhereDeclared no-op, to be removed in 4.0
4041
*/
41-
public function __construct(array $paths, bool $reportFieldsWhereDeclared = true)
42+
public function __construct(array|ClassLocator $paths, bool $reportFieldsWhereDeclared = true)
4243
{
4344
if (! $reportFieldsWhereDeclared) {
4445
throw new InvalidArgumentException(sprintf(
@@ -48,7 +49,12 @@ public function __construct(array $paths, bool $reportFieldsWhereDeclared = true
4849
}
4950

5051
$this->reader = new AttributeReader();
51-
$this->addPaths($paths);
52+
53+
if ($paths instanceof ClassLocator) {
54+
$this->classLocator = $paths;
55+
} else {
56+
$this->addPaths($paths);
57+
}
5258
}
5359

5460
public function isTransient(string $className): bool

‎src/ORMSetup.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\Deprecations\Deprecation;
88
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
99
use Doctrine\ORM\Mapping\Driver\XmlDriver;
10+
use Doctrine\Persistence\Mapping\Driver\ClassLocator;
1011
use Psr\Cache\CacheItemPoolInterface;
1112
use Redis;
1213
use RuntimeException;
@@ -28,10 +29,10 @@ final class ORMSetup
2829
/**
2930
* Creates a configuration with an attribute metadata driver.
3031
*
31-
* @param string[] $paths
32+
* @param string[]|ClassLocator $paths
3233
*/
3334
public static function createAttributeMetadataConfiguration(
34-
array $paths,
35+
array|ClassLocator $paths,
3536
bool $isDevMode = false,
3637
string|null $proxyDir = null,
3738
CacheItemPoolInterface|null $cache = null,
@@ -47,24 +48,24 @@ public static function createAttributeMetadataConfiguration(
4748
}
4849

4950
$config = self::createConfiguration($isDevMode, $proxyDir, $cache);
50-
$config->setMetadataDriverImpl(new AttributeDriver($paths));
51+
$config->setMetadataDriverImpl(new AttributeDriver($paths, true));
5152

5253
return $config;
5354
}
5455

5556
/**
5657
* Creates a configuration with an attribute metadata driver.
5758
*
58-
* @param string[] $paths
59+
* @param string[]|ClassLocator $paths
5960
*/
6061
public static function createAttributeMetadataConfig(
61-
array $paths,
62+
array|ClassLocator $paths,
6263
bool $isDevMode = false,
6364
string|null $cacheNamespaceSeed = null,
6465
CacheItemPoolInterface|null $cache = null,
6566
): Configuration {
6667
$config = self::createConfig($isDevMode, $cacheNamespaceSeed, $cache);
67-
$config->setMetadataDriverImpl(new AttributeDriver($paths));
68+
$config->setMetadataDriverImpl(new AttributeDriver($paths, true));
6869

6970
return $config;
7071
}

‎tests/Performance/EntityManagerFactory.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
use Doctrine\ORM\Configuration;
1414
use Doctrine\ORM\EntityManager;
1515
use Doctrine\ORM\EntityManagerInterface;
16-
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
1716
use Doctrine\ORM\Proxy\ProxyFactory;
1817
use Doctrine\ORM\Tools\SchemaTool;
1918
use Doctrine\Tests\Mocks\ArrayResultFactory;
19+
use Doctrine\Tests\Mocks\AttributeDriverFactory;
2020
use Doctrine\Tests\TestUtil;
2121

2222
use function array_map;
23-
use function realpath;
2423

2524
final class EntityManagerFactory
2625
{
@@ -30,9 +29,9 @@ public static function getEntityManager(array $schemaClassNames): EntityManagerI
3029

3130
TestUtil::configureProxies($config);
3231
$config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
33-
$config->setMetadataDriverImpl(new AttributeDriver([
34-
realpath(__DIR__ . '/Models/Cache'),
35-
realpath(__DIR__ . '/Models/GeoNames'),
32+
$config->setMetadataDriverImpl(AttributeDriverFactory::createAttributeDriver([
33+
__DIR__ . '/../Tests/Models/Cache',
34+
__DIR__ . '/../Tests/Models/GeoNames',
3635
]));
3736

3837
$entityManager = new EntityManager(
@@ -55,10 +54,10 @@ public static function makeEntityManagerWithNoResultsConnection(): EntityManager
5554

5655
TestUtil::configureProxies($config);
5756
$config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
58-
$config->setMetadataDriverImpl(new AttributeDriver([
59-
realpath(__DIR__ . '/Models/Cache'),
60-
realpath(__DIR__ . '/Models/Generic'),
61-
realpath(__DIR__ . '/Models/GeoNames'),
57+
$config->setMetadataDriverImpl(AttributeDriverFactory::createAttributeDriver([
58+
__DIR__ . '/../Tests/Models/Cache',
59+
__DIR__ . '/../Tests/Models/Generic',
60+
__DIR__ . '/../Tests/Models/GeoNames',
6261
]));
6362

6463
// A connection that doesn't really do anything

‎tests/Tests/Mocks/AttributeDriverFactory.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Doctrine\Tests\Mocks;
6+
7+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
8+
use Doctrine\Persistence\Mapping\Driver\ClassLocator;
9+
use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
10+
11+
use function interface_exists;
12+
13+
final class AttributeDriverFactory
14+
{
15+
/** @param list<string> $paths */
16+
public static function createAttributeDriver(array $paths = []): AttributeDriver
17+
{
18+
if (! self::isClassLocatorSupported()) {
19+
return new AttributeDriver($paths, true);
20+
}
21+
22+
$classLocator = FileClassLocator::createFromDirectories($paths);
23+
24+
return new AttributeDriver($classLocator, true);
25+
}
26+
27+
/** Supported since doctrine/persistence 4.1 */
28+
public static function isClassLocatorSupported(): bool
29+
{
30+
return interface_exists(ClassLocator::class);
31+
}
32+
}

‎tests/Tests/Mocks/EntityManagerMock.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Doctrine\DBAL\Connection;
99
use Doctrine\ORM\Configuration;
1010
use Doctrine\ORM\EntityManager;
11-
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
1211
use Doctrine\ORM\Proxy\ProxyFactory;
1312
use Doctrine\ORM\UnitOfWork;
1413
use Doctrine\Tests\TestUtil;
@@ -26,7 +25,7 @@ public function __construct(Connection $conn, Configuration|null $config = null,
2625
if ($config === null) {
2726
$config = new Configuration();
2827
TestUtil::configureProxies($config);
29-
$config->setMetadataDriverImpl(new AttributeDriver([]));
28+
$config->setMetadataDriverImpl(AttributeDriverFactory::createAttributeDriver());
3029
}
3130

3231
parent::__construct($conn, $config, $eventManager);

‎tests/Tests/ORM/Functional/EnumTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
use Doctrine\DBAL\Types\EnumType;
88
use Doctrine\ORM\AbstractQuery;
99
use Doctrine\ORM\Mapping\Column;
10-
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
1110
use Doctrine\ORM\Mapping\MappingException;
1211
use Doctrine\ORM\Query\Expr\Func;
1312
use Doctrine\ORM\Tools\SchemaTool;
13+
use Doctrine\Tests\Mocks\AttributeDriverFactory;
1414
use Doctrine\Tests\Models\DataTransferObjects\DtoWithArrayOfEnums;
1515
use Doctrine\Tests\Models\DataTransferObjects\DtoWithEnum;
1616
use Doctrine\Tests\Models\Enums\Card;
@@ -28,7 +28,6 @@
2828
use PHPUnit\Framework\Attributes\DataProvider;
2929

3030
use function class_exists;
31-
use function dirname;
3231
use function sprintf;
3332
use function uniqid;
3433

@@ -38,7 +37,9 @@ public function setUp(): void
3837
{
3938
parent::setUp();
4039

41-
$this->_em = $this->getEntityManager(null, new AttributeDriver([dirname(__DIR__, 2) . '/Models/Enums'], true));
40+
$mappingDriver = AttributeDriverFactory::createAttributeDriver([__DIR__ . '/../../Models/Enums']);
41+
42+
$this->_em = $this->getEntityManager(null, $mappingDriver);
4243
$this->_schemaTool = new SchemaTool($this->_em);
4344

4445
if ($this->isSecondLevelCacheEnabled) {

‎tests/Tests/ORM/Functional/Locking/LockAgentWorker.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Configuration;
1010
use Doctrine\ORM\EntityManager;
1111
use Doctrine\ORM\EntityManagerInterface;
12+
use Doctrine\Tests\Mocks\AttributeDriverFactory;
1213
use Doctrine\Tests\ORM\Functional\Locking\Doctrine\ORM\Query;
1314
use Doctrine\Tests\TestUtil;
1415
use GearmanWorker;
@@ -116,8 +117,8 @@ protected function createEntityManager(Connection $conn): EntityManagerInterface
116117
TestUtil::configureProxies($config);
117118
$config->setAutoGenerateProxyClasses(true);
118119

119-
$annotDriver = new AttributeDriver([__DIR__ . '/../../../Models/']);
120-
$config->setMetadataDriverImpl($annotDriver);
120+
$attributeDriver = AttributeDriverFactory::createAttributeDriver([__DIR__ . '/../../../Models']);
121+
$config->setMetadataDriverImpl($attributeDriver);
121122
$config->setMetadataCache(new ArrayAdapter());
122123

123124
$config->setQueryCache(new ArrayAdapter());

0 commit comments

Comments
 (0)