Skip to content

Commit 6a441fa

Browse files
greg0iregreg0ire
authored
Merge pull request #2050 from greg0ire/remove-dot-class
Remove .class parameters
2 parents a8d5057 + 25efc53 commit 6a441fa

File tree

6 files changed

+104
-138
lines changed

6 files changed

+104
-138
lines changed

‎UPGRADE-3.0.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,47 @@ When using the `doctrine.dbal.url` configuration option, you can no longer
103103
specify other configuration options that would conflict with it, such as
104104
`dbname`, `host`, etc.
105105

106+
### Service class parameters removed
107+
108+
The following service class parameters have been removed:
109+
110+
- `doctrine.class`
111+
- `doctrine.data_collector.class`
112+
- `doctrine.dbal.configuration.class`
113+
- `doctrine.dbal.connection.event_manager.class`
114+
- `doctrine.dbal.connection_factory.class`
115+
- `doctrine.orm.configuration.class`
116+
- `doctrine.orm.entity_listener_resolver.class`
117+
- `doctrine.orm.entity_manager.class`
118+
- `doctrine.orm.listeners.attach_entity_listeners.class`
119+
- `doctrine.orm.listeners.resolve_target_entity.class`
120+
- `doctrine.orm.manager_configurator.class`
121+
- `doctrine.orm.metadata.attribute.class`
122+
- `doctrine.orm.metadata.driver_chain.class`
123+
- `doctrine.orm.metadata.php.class`
124+
- `doctrine.orm.metadata.staticphp.class`
125+
- `doctrine.orm.metadata.xml.class`
126+
- `doctrine.orm.naming_strategy.default.class`
127+
- `doctrine.orm.naming_strategy.underscore.class`
128+
- `doctrine.orm.quote_strategy.ansi.class`
129+
- `doctrine.orm.quote_strategy.default.class`
130+
- `doctrine.orm.second_level_cache.cache_configuration.class`
131+
- `doctrine.orm.second_level_cache.default_cache_factory.class`
132+
- `doctrine.orm.second_level_cache.default_region.class`
133+
- `doctrine.orm.second_level_cache.filelock_region.class`
134+
- `doctrine.orm.second_level_cache.logger_chain.class`
135+
- `doctrine.orm.second_level_cache.logger_statistics.class`
136+
- `doctrine.orm.second_level_cache.regions_configuration.class`
137+
- `doctrine.orm.security.user.provider.class`
138+
- `doctrine.orm.typed_field_mapper.default.class`
139+
- `doctrine.orm.validator.unique.class`
140+
- `doctrine.orm.validator_initializer.class`
141+
- `form.type_guesser.doctrine.class`
142+
143+
If your application was relying on these parameters, you should update your
144+
service definitions to use the class names directly instead of parameter
145+
references.
146+
106147
ConnectionFactory::createConnection() signature change
107148
------------------------------------------------------
108149

‎config/dbal.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424

2525
return static function (ContainerConfigurator $container): void {
2626
$container->parameters()
27-
->set('doctrine.dbal.configuration.class', Configuration::class)
28-
->set('doctrine.data_collector.class', DoctrineDataCollector::class)
29-
->set('doctrine.dbal.connection.event_manager.class', ContainerAwareEventManager::class)
30-
->set('doctrine.dbal.connection_factory.class', ConnectionFactory::class)
31-
->set('doctrine.class', Registry::class)
3227
->set('doctrine.entity_managers', [])
3328
->set('doctrine.default_entity_manager', '');
3429

@@ -37,15 +32,15 @@
3732
->alias(Connection::class, 'database_connection')
3833
->alias(ManagerRegistry::class, 'doctrine')
3934

40-
->set('data_collector.doctrine', (string) param('doctrine.data_collector.class'))
35+
->set('data_collector.doctrine', DoctrineDataCollector::class)
4136
->args([
4237
service('doctrine'),
4338
true,
4439
service('doctrine.debug_data_holder')->nullOnInvalid(),
4540
])
4641
->tag('data_collector', ['template' => '@Doctrine/Collector/db.html.twig', 'id' => 'db', 'priority' => 250])
4742

48-
->set('doctrine.dbal.connection_factory', (string) param('doctrine.dbal.connection_factory.class'))
43+
->set('doctrine.dbal.connection_factory', ConnectionFactory::class)
4944
->args([
5045
(string) param('doctrine.dbal.connection_factory.types'),
5146
service('doctrine.dbal.connection_factory.dsn_parser'),
@@ -60,16 +55,16 @@
6055
->abstract()
6156
->factory([service('doctrine.dbal.connection_factory'), 'createConnection'])
6257

63-
->set('doctrine.dbal.connection.event_manager', (string) param('doctrine.dbal.connection.event_manager.class'))
58+
->set('doctrine.dbal.connection.event_manager', ContainerAwareEventManager::class)
6459
->abstract()
6560
->args([
6661
service('service_container'),
6762
])
6863

69-
->set('doctrine.dbal.connection.configuration', (string) param('doctrine.dbal.configuration.class'))
64+
->set('doctrine.dbal.connection.configuration', Configuration::class)
7065
->abstract()
7166

72-
->set('doctrine', (string) param('doctrine.class'))
67+
->set('doctrine', Registry::class)
7368
->public()
7469
->args([
7570
service('service_container'),

‎config/orm.php‎

Lines changed: 18 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,16 @@
55
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
66

77
use Doctrine\Bundle\DoctrineBundle\ManagerConfigurator;
8-
use Doctrine\Bundle\DoctrineBundle\Mapping\ContainerEntityListenerResolver;
98
use Doctrine\Bundle\DoctrineBundle\Orm\ManagerRegistryAwareEntityManagerProvider;
109
use Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory;
11-
use Doctrine\ORM\Cache\CacheConfiguration;
12-
use Doctrine\ORM\Cache\DefaultCacheFactory;
13-
use Doctrine\ORM\Cache\Logging\CacheLoggerChain;
14-
use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger;
15-
use Doctrine\ORM\Cache\Region\DefaultRegion;
16-
use Doctrine\ORM\Cache\Region\FileLockRegion;
17-
use Doctrine\ORM\Cache\RegionsConfiguration;
1810
use Doctrine\ORM\Configuration;
1911
use Doctrine\ORM\EntityManager;
2012
use Doctrine\ORM\EntityManagerInterface;
2113
use Doctrine\ORM\Mapping\AnsiQuoteStrategy;
2214
use Doctrine\ORM\Mapping\DefaultNamingStrategy;
2315
use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
2416
use Doctrine\ORM\Mapping\DefaultTypedFieldMapper;
25-
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
26-
use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
2717
use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
28-
use Doctrine\ORM\Tools\AttachEntityListenersListener;
2918
use Doctrine\ORM\Tools\Console\Command\ClearCache\CollectionRegionCommand;
3019
use Doctrine\ORM\Tools\Console\Command\ClearCache\EntityRegionCommand;
3120
use Doctrine\ORM\Tools\Console\Command\ClearCache\MetadataCommand;
@@ -40,12 +29,11 @@
4029
use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
4130
use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
4231
use Doctrine\ORM\Tools\ResolveTargetEntityListener;
43-
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
44-
use Doctrine\Persistence\Mapping\Driver\PHPDriver;
45-
use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
4632
use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
4733
use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
4834
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
35+
use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;
36+
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
4937
use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaListener;
5038
use Symfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
5139
use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaListener;
@@ -59,60 +47,11 @@
5947
use const CASE_LOWER;
6048

6149
return static function (ContainerConfigurator $container): void {
62-
$container->parameters()
63-
->set('doctrine.orm.configuration.class', Configuration::class)
64-
->set('doctrine.orm.entity_manager.class', EntityManager::class)
65-
->set('doctrine.orm.manager_configurator.class', ManagerConfigurator::class)
66-
67-
// metadata drivers
68-
->set('doctrine.orm.metadata.driver_chain.class', MappingDriverChain::class)
69-
->set('doctrine.orm.metadata.xml.class', SimplifiedXmlDriver::class)
70-
->set('doctrine.orm.metadata.php.class', PHPDriver::class)
71-
->set('doctrine.orm.metadata.staticphp.class', StaticPHPDriver::class)
72-
->set('doctrine.orm.metadata.attribute.class', AttributeDriver::class)
73-
74-
// form field factory guesser
75-
->set('form.type_guesser.doctrine.class', DoctrineOrmTypeGuesser::class)
76-
77-
// validator
78-
->set('doctrine.orm.validator.unique.class', UniqueEntityValidator::class)
79-
->set('doctrine.orm.validator_initializer.class', DoctrineInitializer::class)
80-
81-
// security
82-
->set('doctrine.orm.security.user.provider.class', EntityUserProvider::class)
83-
84-
// listeners
85-
->set('doctrine.orm.listeners.resolve_target_entity.class', ResolveTargetEntityListener::class)
86-
->set('doctrine.orm.listeners.attach_entity_listeners.class', AttachEntityListenersListener::class)
87-
88-
// naming strategy
89-
->set('doctrine.orm.naming_strategy.default.class', DefaultNamingStrategy::class)
90-
->set('doctrine.orm.naming_strategy.underscore.class', UnderscoreNamingStrategy::class)
91-
92-
// quote strategy
93-
->set('doctrine.orm.quote_strategy.default.class', DefaultQuoteStrategy::class)
94-
->set('doctrine.orm.quote_strategy.ansi.class', AnsiQuoteStrategy::class)
95-
96-
// typed field mapper
97-
->set('doctrine.orm.typed_field_mapper.default.class', DefaultTypedFieldMapper::class)
98-
99-
// entity listener resolver
100-
->set('doctrine.orm.entity_listener_resolver.class', ContainerEntityListenerResolver::class)
101-
102-
// second level cache
103-
->set('doctrine.orm.second_level_cache.default_cache_factory.class', DefaultCacheFactory::class)
104-
->set('doctrine.orm.second_level_cache.default_region.class', DefaultRegion::class)
105-
->set('doctrine.orm.second_level_cache.filelock_region.class', FileLockRegion::class)
106-
->set('doctrine.orm.second_level_cache.logger_chain.class', CacheLoggerChain::class)
107-
->set('doctrine.orm.second_level_cache.logger_statistics.class', StatisticsCacheLogger::class)
108-
->set('doctrine.orm.second_level_cache.cache_configuration.class', CacheConfiguration::class)
109-
->set('doctrine.orm.second_level_cache.regions_configuration.class', RegionsConfiguration::class);
110-
11150
$container->services()
11251

11352
->alias(EntityManagerInterface::class, 'doctrine.orm.entity_manager')
11453

115-
->set('form.type_guesser.doctrine', (string) param('form.type_guesser.doctrine.class'))
54+
->set('form.type_guesser.doctrine', DoctrineOrmTypeGuesser::class)
11655
->tag('form.type_guesser')
11756
->args([
11857
service('doctrine'),
@@ -124,10 +63,9 @@
12463
service('doctrine'),
12564
])
12665

127-
->set('doctrine.orm.configuration', (string) param('doctrine.orm.configuration.class'))
128-
->abstract()
66+
->set('doctrine.orm.configuration', Configuration::class)->abstract()
12967

130-
->set('doctrine.orm.entity_manager.abstract', (string) param('doctrine.orm.entity_manager.class'))
68+
->set('doctrine.orm.entity_manager.abstract', EntityManager::class)
13169
->abstract()
13270
->lazy()
13371

@@ -138,32 +76,32 @@
13876
]),
13977
])
14078

141-
->set('doctrine.orm.manager_configurator.abstract', (string) param('doctrine.orm.manager_configurator.class'))
79+
->set('doctrine.orm.manager_configurator.abstract', ManagerConfigurator::class)
14280
->abstract()
14381
->args([
14482
[],
14583
[],
14684
])
14785

148-
->set('doctrine.orm.validator.unique', (string) param('doctrine.orm.validator.unique.class'))
86+
->set('doctrine.orm.validator.unique', UniqueEntityValidator::class)
14987
->tag('validator.constraint_validator', ['alias' => 'doctrine.orm.validator.unique'])
15088
->args([
15189
service('doctrine'),
15290
])
15391

154-
->set('doctrine.orm.validator_initializer', (string) param('doctrine.orm.validator_initializer.class'))
92+
->set('doctrine.orm.validator_initializer', DoctrineInitializer::class)
15593
->tag('validator.initializer')
15694
->args([
15795
service('doctrine'),
15896
])
15997

160-
->set('doctrine.orm.security.user.provider', (string) param('doctrine.orm.security.user.provider.class'))
98+
->set('doctrine.orm.security.user.provider', EntityUserProvider::class)
16199
->abstract()
162100
->args([
163101
service('doctrine'),
164102
])
165103

166-
->set('doctrine.orm.listeners.resolve_target_entity', (string) param('doctrine.orm.listeners.resolve_target_entity.class'))
104+
->set('doctrine.orm.listeners.resolve_target_entity', ResolveTargetEntityListener::class)
167105

168106
->set('doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', DoctrineDbalCacheAdapterSchemaListener::class)
169107
->args([
@@ -189,29 +127,29 @@
189127
])
190128
->tag('doctrine.event_listener', ['event' => 'postGenerateSchema'])
191129

192-
->set('doctrine.orm.naming_strategy.default', (string) param('doctrine.orm.naming_strategy.default.class'))
130+
->set('doctrine.orm.naming_strategy.default', DefaultNamingStrategy::class)
193131

194-
->set('doctrine.orm.naming_strategy.underscore', (string) param('doctrine.orm.naming_strategy.underscore.class'))
132+
->set('doctrine.orm.naming_strategy.underscore', UnderscoreNamingStrategy::class)
195133

196-
->set('doctrine.orm.naming_strategy.underscore_number_aware', (string) param('doctrine.orm.naming_strategy.underscore.class'))
134+
->set('doctrine.orm.naming_strategy.underscore_number_aware', UnderscoreNamingStrategy::class)
197135
->args([
198136
CASE_LOWER,
199137
true,
200138
])
201139

202-
->set('doctrine.orm.quote_strategy.default', (string) param('doctrine.orm.quote_strategy.default.class'))
140+
->set('doctrine.orm.quote_strategy.default', DefaultQuoteStrategy::class)
203141

204-
->set('doctrine.orm.quote_strategy.ansi', (string) param('doctrine.orm.quote_strategy.ansi.class'))
142+
->set('doctrine.orm.quote_strategy.ansi', AnsiQuoteStrategy::class)
205143

206-
->set('doctrine.orm.typed_field_mapper.default', (string) param('doctrine.orm.typed_field_mapper.default.class'))
144+
->set('doctrine.orm.typed_field_mapper.default', DefaultTypedFieldMapper::class)
207145

208-
->set('doctrine.ulid_generator', 'Symfony\\Bridge\\Doctrine\\IdGenerator\\UlidGenerator')
146+
->set('doctrine.ulid_generator', UlidGenerator::class)
209147
->args([
210148
service('ulid.factory')->ignoreOnInvalid(),
211149
])
212150
->tag('doctrine.id_generator')
213151

214-
->set('doctrine.uuid_generator', 'Symfony\\Bridge\\Doctrine\\IdGenerator\\UuidGenerator')
152+
->set('doctrine.uuid_generator', UuidGenerator::class)
215153
->args([
216154
service('uuid.factory')->ignoreOnInvalid(),
217155
])

0 commit comments

Comments
 (0)