[DoctrineBridge] Allow bundles to define a driver type "attribute"

beberlei · beberlei · commit cecaa7815ae6 · 2021-04-16T15:04:32.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -151,7 +151,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
         }
 
         if (!$bundleConfig['dir']) {
-            if (\in_array($bundleConfig['type'], ['annotation', 'staticphp'])) {
+            if (\in_array($bundleConfig['type'], ['annotation', 'staticphp', 'attribute'])) {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
             } else {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
@@ -193,6 +193,10 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
                     $args[0] = array_merge(array_values($driverPaths), $args[0]);
                 }
                 $mappingDriverDef->setArguments($args);
+            } elseif ('attribute' === $driverType) {
+                $mappingDriverDef = new Definition($this->getMetadataDriverClass($driverType), [
+                    array_values($driverPaths),
+                ]);
             } elseif ('annotation' == $driverType) {
                 $mappingDriverDef = new Definition($this->getMetadataDriverClass($driverType), [
                     new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
@@ -236,8 +240,8 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
             throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
         }
 
-        if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {
-            throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or "staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. You can register them by adding a new driver to the "%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')));
+        if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp', 'attribute'])) {
+            throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php", "staticphp" or "attribute" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. You can register them by adding a new driver to the "%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')));
         }
     }
 
@@ -437,7 +441,7 @@ protected function getMetadataDriverClass(string $driverType): string
     {
         @trigger_error(sprintf('Not declaring the "%s" method in class "%s" is deprecated since Symfony 4.4. This method will be abstract in Symfony 5.0.', __METHOD__, static::class), \E_USER_DEPRECATED);
 
-        return '%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%');
+        return '%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class').'%';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`if (!$bundleConfig['dir']) {`
`154`		`- if (\in_array($bundleConfig['type'], ['annotation', 'staticphp'])) {`
	`154`	`+ if (\in_array($bundleConfig['type'], ['annotation', 'staticphp', 'attribute'])) {`
`155`	`155`	`$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();`
`156`	`156`	`} else {`
`157`	`157`	`$bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();`
`@@ -193,6 +193,10 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont`
`193`	`193`	`$args[0] = array_merge(array_values($driverPaths), $args[0]);`
`194`	`194`	`}`
`195`	`195`	`$mappingDriverDef->setArguments($args);`
	`196`	`+ } elseif ('attribute' === $driverType) {`
	`197`	`+ $mappingDriverDef = new Definition($this->getMetadataDriverClass($driverType), [`
	`198`	`+ array_values($driverPaths),`
	`199`	`+ ]);`
`196`	`200`	`} elseif ('annotation' == $driverType) {`
`197`	`201`	`$mappingDriverDef = new Definition($this->getMetadataDriverClass($driverType), [`
`198`	`202`	`new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),`
`@@ -236,8 +240,8 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object`
`236`	`240`	`throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));`
`237`	`241`	`}`
`238`	`242`
`239`		`- if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp'])) {`
`240`		`- throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or "staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. You can register them by adding a new driver to the "%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')));`
	`243`	`+ if (!\in_array($mappingConfig['type'], ['xml', 'yml', 'annotation', 'php', 'staticphp', 'attribute'])) {`
	`244`	`+ throw new \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php", "staticphp" or "attribute" through the DoctrineBundle. Use your own bundle to configure other metadata drivers. You can register them by adding a new driver to the "%s" service definition.', $this->getObjectManagerElementName($objectManagerName.'_metadata_driver')));`
`241`	`245`	`}`
`242`	`246`	`}`
`243`	`247`
`@@ -437,7 +441,7 @@ protected function getMetadataDriverClass(string $driverType): string`
`437`	`441`	`{`
`438`	`442`	`@trigger_error(sprintf('Not declaring the "%s" method in class "%s" is deprecated since Symfony 4.4. This method will be abstract in Symfony 5.0.', __METHOD__, static::class), \E_USER_DEPRECATED);`
`439`	`443`
`440`		`- return '%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%');`
	`444`	`+ return '%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class').'%';`
`441`	`445`	`}`
`442`	`446`
`443`	`447`	`/**`