doctrine/archived-DoctrinePHPCRBundle
1
0
Fork 0
mirror of https://github.com/doctrine/DoctrinePHPCRBundle.git synced 2026-03-23 22:32:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup service definitions

Browse Source
This commit is contained in:
David Buchmann
2026-03-18 11:44:23 +01:00
parent a19873cc24
commit dd3e3ac450
14 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -4,6 +4,16 @@ Changelog
Version 3
=========
3.1.0
-----
* Support for Symfony 8
* Rewrote service definitions from XML to PHP
* Removed traces of prismic - which could not be installed with DoctrinePHPCRBundle 3 anyway.
* Renamed InitDoctrineDbalCommand and JackrabbitCommand services because they did not match the class name.
(Added an alias with deprecation for BC.)
* Deprecated XmlDriver and YamlDriver in the bundle, as the ones from phpcr-odm are used directly.
3.0.3
-----

3
composer.json
View File

@@ -41,10 +41,11 @@
"require-dev": {
"ext-libxml": "*",
"doctrine/data-fixtures": "^2.0",
"doctrine/doctrine-bundle": "^2.0.3",
"doctrine/doctrine-bundle": "^2.0.3 || ^3.0",
"doctrine/phpcr-odm": "^2.0",
"doctrine/orm": "^2.0 || ^3.0",
"jackalope/jackalope-doctrine-dbal": "^2.0",
"jackalope/jackalope-jackrabbit": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
"phpcr/phpcr-shell": "^1.6",
"phpstan/phpstan": "^2.0",

8
src/DependencyInjection/Configuration.php
View File

@@ -123,12 +123,6 @@ final class Configuration implements ConfigurationInterface
->always()
->then(function ($v) {
switch ($v['type']) {
case 'prismic':
if (!isset($v['url'])) {
throw new InvalidConfigurationException('prismic backend requires the url argument.');
}
break;
case 'jackrabbit':
if (!isset($v['url'])) {
throw new InvalidConfigurationException('jackrabbit backend requires the url argument.');
@@ -145,7 +139,7 @@ final class Configuration implements ConfigurationInterface
->fixXmlConfig('parameter')
->children()
->enumNode('type')
->values(['jackrabbit', 'doctrinedbal', 'prismic'])
->values(['jackrabbit', 'doctrinedbal'])
->defaultValue('jackrabbit')
->end()
// all jackalope

5
src/DependencyInjection/DoctrinePHPCRExtension.php
View File

@@ -126,7 +126,6 @@ final class DoctrinePHPCRExtension extends AbstractDoctrineExtension
$type = $session['backend']['type'];
switch ($type) {
case 'prismic':
case 'doctrinedbal':
case 'jackrabbit':
if (empty($loaded['jackalope'])) {
@@ -210,10 +209,6 @@ final class DoctrinePHPCRExtension extends AbstractDoctrineExtension
}
}
break;
case 'prismic':
$backendParameters['jackalope.prismic_uri'] = $session['backend']['url'];
break;
case 'jackrabbit':
$backendParameters['jackalope.jackrabbit_uri'] = $session['backend']['url'];

2
src/Mapping/Driver/XmlDriver.php
View File

@@ -10,6 +10,8 @@ use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*
* @deprecated The mapping pass uses the base class in doctrine/phpcr-odm directly
*/
class XmlDriver extends BaseXmlDriver
{

2
src/Mapping/Driver/YamlDriver.php
View File

@@ -10,6 +10,8 @@ use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*
* @deprecated The mapping pass uses the base class in doctrine/phpcr-odm directly
*/
class YamlDriver extends BaseYamlDriver
{

1
src/Resources/config/commands.php
View File

@@ -4,7 +4,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set(\Doctrine\Bundle\PHPCRBundle\Command\WorkspaceQueryCommand::class, \Doctrine\Bundle\PHPCRBundle\Command\WorkspaceQueryCommand::class)
->tag('console.command');

7
src/Resources/config/jackalope.php
View File

@@ -4,7 +4,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set('doctrine_phpcr.jackalope.repository.factory.service.jackrabbit', \Jackalope\RepositoryFactoryJackrabbit::class);
@@ -18,12 +17,6 @@ return static function (ContainerConfigurator $container) {
->args([[]])
->factory([service('doctrine_phpcr.jackalope.repository.factory.service.doctrinedbal'), 'getRepository']);
$services->set('doctrine_phpcr.jackalope.repository.factory.service.prismic', \Jackalope\RepositoryFactoryPrismic::class);
$services->set('doctrine_phpcr.jackalope.repository.factory.prismic', \Jackalope\Repository::class)
->args([[]])
->factory([service('doctrine_phpcr.jackalope.repository.factory.service.prismic'), 'getRepository']);
$services->set('doctrine_phpcr.jackalope.session', \Jackalope\Session::class)
->abstract()
->args([

6
src/Resources/config/jackalope_doctrine_dbal-commands.php
View File

@@ -4,8 +4,10 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\InitDoctrineDbalCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class)
$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class)
->tag('console.command');
$services->alias('Doctrine\Bundle\PHPCRBundle\OptionalCommand\InitDoctrineDbalCommand', \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class)
->deprecate('doctrine/phpcr-bundle', '3.1.0', 'Service %alias_id% was misnamed, use the correct class name instead '.\Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\InitDoctrineDbalCommand::class);
};

1
src/Resources/config/jackalope_doctrine_dbal.php
View File

@@ -4,7 +4,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set('doctrine_phpcr.jackalope_doctrine_dbal.schema', \Jackalope\Transport\DoctrineDBAL\RepositorySchema::class)
->args([

6
src/Resources/config/jackrabbit-commands.php
View File

@@ -4,12 +4,14 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\JackrabbitCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class)
$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class)
->args([
'%doctrine_phpcr.jackrabbit_jar%',
'%doctrine_phpcr.workspace_dir%',
])
->tag('console.command');
$services->alias('Doctrine\Bundle\PHPCRBundle\OptionalCommand\JackrabbitCommand', \Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class)
->deprecate('doctrine/phpcr-bundle', '3.1.0', 'Service %alias_id% was misnamed, use the correct class name instead '.\Doctrine\Bundle\PHPCRBundle\OptionalCommand\Jackalope\JackrabbitCommand::class);
};

18
src/Resources/config/odm.php
View File

@@ -5,17 +5,21 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$parameters->set('doctrine_phpcr.odm.cache.array.class', \Doctrine\Common\Cache\ArrayCache::class);
$parameters->set('doctrine_phpcr.odm.cache.apc.class', \Doctrine\Common\Cache\ApcCache::class);
$parameters->set('doctrine_phpcr.odm.cache.memcache.class', \Doctrine\Common\Cache\MemcacheCache::class);
// cache (keep classes as strings to avoid legacy class resolution issues)
$parameters->set('doctrine_phpcr.odm.cache.array.class', 'Doctrine\Common\Cache\ArrayCache');
$parameters->set('doctrine_phpcr.odm.cache.apc.class', 'Doctrine\Common\Cache\ApcCache');
$parameters->set('doctrine_phpcr.odm.cache.memcache.class', 'Doctrine\Common\Cache\MemcacheCache');
$parameters->set('doctrine_phpcr.odm.cache.memcache_host', 'localhost');
$parameters->set('doctrine_phpcr.odm.cache.memcache_port', 11211);
$parameters->set('doctrine_phpcr.odm.cache.memcache_instance.class', 'Memcache');
$parameters->set('doctrine_phpcr.odm.cache.memcached.class', \Doctrine\Common\Cache\MemcachedCache::class);
$parameters->set('doctrine_phpcr.odm.cache.memcached.class', 'Doctrine\Common\Cache\MemcachedCache');
$parameters->set('doctrine_phpcr.odm.cache.memcached_host', 'localhost');
$parameters->set('doctrine_phpcr.odm.cache.memcached_port', 11211);
$parameters->set('doctrine_phpcr.odm.cache.memcached_instance.class', 'Memcached');
$parameters->set('doctrine_phpcr.odm.cache.xcache.class', \Doctrine\Common\Cache\XcacheCache::class);
$parameters->set('doctrine_phpcr.odm.cache.xcache.class', 'Doctrine\Common\Cache\XcacheCache');
// drivers (unused, keep classes to avoid legacy issues)
$parameters->set('doctrine_phpcr.odm.metadata.xml.class', \Doctrine\Bundle\PHPCRBundle\Mapping\Driver\XmlDriver::class);
$parameters->set('doctrine_phpcr.odm.metadata.yml.class', \Doctrine\Bundle\PHPCRBundle\Mapping\Driver\YamlDriver::class);
$parameters->set('doctrine_phpcr.odm.metadata.php.class', \Doctrine\Persistence\Mapping\Driver\StaticPHPDriver::class);
@@ -69,7 +73,9 @@ return static function (ContainerConfigurator $container) {
$services->set('doctrine_phpcr.odm.translation.strategy.child', \Doctrine\ODM\PHPCR\Translation\TranslationStrategy\ChildTranslationStrategy::class)
->args(['']);
$services->set(\Doctrine\Bundle\PHPCRBundle\Command\LoadFixtureCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class)
$services->set(\Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class, \Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class)
->args([service('doctrine_phpcr.initializer_manager')])
->tag('console.command');
$services->alias('Doctrine\Bundle\PHPCRBundle\Command\LoadFixtureCommand', \Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class)
->deprecate('doctrine/phpcr-bundle', '3.1.0', 'Service %alias_id% was misnamed, use the correct class name instead '.\Doctrine\Bundle\PHPCRBundle\OptionalCommand\ODM\LoadFixtureCommand::class);
};

1
src/Resources/config/odm_multilang.php
View File

@@ -4,7 +4,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set('doctrine_phpcr.odm.locale_chooser', \Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooser::class)
->args([

1
src/Resources/config/phpcr.php
View File

@@ -4,7 +4,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return static function (ContainerConfigurator $container) {
$services = $container->services();
$parameters = $container->parameters();
$services->set('doctrine_phpcr.session.event_manager', \Symfony\Bridge\Doctrine\ContainerAwareEventManager::class)
->private()