cleanup service definitions

Author: dbu

CHANGELOG.md

@@ -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
 -----
 

composer.json

@@ -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",

src/DependencyInjection/Configuration.php

@@ -123,12 +123,6 @@ private function getPHPCRSessionsNode(): NodeDefinition
                             ->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 @@ private function getPHPCRSessionsNode(): NodeDefinition
                         ->fixXmlConfig('parameter')
                         ->children()
                             ->enumNode('type')
-                                ->values(['jackrabbit', 'doctrinedbal', 'prismic'])
+                                ->values(['jackrabbit', 'doctrinedbal'])
                                 ->defaultValue('jackrabbit')
                             ->end()
                             // all jackalope

src/DependencyInjection/DoctrinePHPCRExtension.php

@@ -126,7 +126,6 @@ private function sessionLoad(array $config, ContainerBuilder $container): void
 
             $type = $session['backend']['type'];
             switch ($type) {
-                case 'prismic':
                 case 'doctrinedbal':
                 case 'jackrabbit':
                     if (empty($loaded['jackalope'])) {
@@ -210,10 +209,6 @@ private function loadJackalopeSession(array $session, ContainerBuilder $containe
                     }
                 }
 
-                break;
-            case 'prismic':
-                $backendParameters['jackalope.prismic_uri'] = $session['backend']['url'];
-
                 break;
             case 'jackrabbit':
                 $backendParameters['jackalope.jackrabbit_uri'] = $session['backend']['url'];

src/Mapping/Driver/XmlDriver.php

@@ -10,6 +10,8 @@
  *
  * @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
 {

src/Mapping/Driver/YamlDriver.php

@@ -10,6 +10,8 @@
  *
  * @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
 {

src/Resources/config/commands.php

@@ -4,7 +4,6 @@
 
 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');

src/Resources/config/jackalope.php

@@ -4,7 +4,6 @@
 
 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 @@
         ->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([

src/Resources/config/jackalope_doctrine_dbal-commands.php

@@ -4,8 +4,10 @@
 
 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);
 };

src/Resources/config/jackalope_doctrine_dbal.php

@@ -4,7 +4,6 @@
 
 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([