Merge pull request #204 from doctrine/remove_midgard

remove Midgard support since its not maintained
doctrine · Jun 10, 2015 · fbf561e · fbf561e
2 parents d021ddf + 8ba62f7
commit fbf561e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 105 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -142,11 +142,6 @@ private function getPHPCRSessionsNode()
                                         break;
                                     case 'doctrinedbal':
                                         break;
-                                    case 'midgard2':
-                                        if (! (isset($v['db_name']) || isset($v['config']))) {
-                                            throw new InvalidConfigurationException('midgard2 backend requires either the db_name or the config argument.');
-                                        }
-                                        break;
                                 }
 
                                 return $v;
@@ -155,7 +150,7 @@ private function getPHPCRSessionsNode()
                         ->fixXmlConfig('parameter')
                         ->children()
                             ->enumNode('type')
-                                ->values(array('jackrabbit', 'doctrinedbal', 'prismic', 'midgard2'))
+                                ->values(array('jackrabbit', 'doctrinedbal', 'prismic'))
                                 ->defaultValue('jackrabbit')
                             ->end()
                             // all jackalope
@@ -178,16 +173,6 @@ private function getPHPCRSessionsNode()
                                     ->scalarNode('nodes')->end()
                                 ->end()
                             ->end()
-                            // midgard
-                            ->scalarNode('config')->end()
-                            ->scalarNode('db_type')->end()
-                            ->scalarNode('db_name')->end()
-                            ->scalarNode('db_host')->end()
-                            ->scalarNode('db_port')->end()
-                            ->scalarNode('db_username')->end()
-                            ->scalarNode('db_password')->end()
-                            ->scalarNode('db_init')->end()
-                            ->scalarNode('blobdir')->end()
                         ->end()
                     ->end()
                     ->arrayNode('options')

diff --git a/DependencyInjection/DoctrinePHPCRExtension.php b/DependencyInjection/DoctrinePHPCRExtension.php
@@ -147,13 +147,6 @@ private function sessionLoad($config, ContainerBuilder $container)
                     }
                     $this->loadJackalopeSession($session, $container, $type);
                     break;
-                case 'midgard2':
-                    if (empty($loaded['midgard2'])) {
-                        $this->loader->load('midgard2.xml');
-                        $loaded['midgard2'] = true;
-                    }
-                    $this->loadMidgard2Session($session, $container);
-                    break;
                 default:
                     throw new InvalidArgumentException(sprintf('You set an unsupported transport type "%s" for session "%s"', $type, $name));
             }
@@ -311,52 +304,6 @@ private function loadJackalopeSession(array $session, ContainerBuilder $containe
         $container->setDefinition($eventManagerServiceId, new DefinitionDecorator('doctrine_phpcr.session.event_manager'));
     }
 
-    private function loadMidgard2Session(array $session, ContainerBuilder $container)
-    {
-        $parameters = array();
-        if (isset($session['backend']['config'])) {
-            // Starting repository with a Midgard2 INI file
-            $parameters['midgard2.configuration.file'] = $session['backend']['config'];
-        } else if (isset($session['backend']['db_name'])) {
-            // Manually configured Midgard2 session
-            foreach ($session['backend'] as $key => $value) {
-                if (substr($key, 0, 3) !== 'db_') {
-                    continue;
-                }
-                $dbkey = substr($key, 3);
-                $parameters["midgard2.configuration.db.{$dbkey}"] = $value;
-            }
-
-            if (isset($session['backend']['blobdir'])) {
-                $parameters['midgard2.configuration.blobdir'] = $session['backend']['blobdir'];
-            }
-            if (isset($session['backend']['loglevel'])) {
-                $parameters['midgard2.configuration.loglevel'] = $session['backend']['loglevel'];
-            }
-        } else {
-            throw new InvalidArgumentException(
-                sprintf('You set an invalid Midgard2 PHPCR configuration for session "%s". Please provide a "config" or "db_name" key', $session['name'])
-            );
-        }
-
-        $factory = $container
-            ->setDefinition('doctrine_phpcr.midgard2.repository', new DefinitionDecorator('doctrine_phpcr.midgard2.repository.factory'))
-        ;
-        $factory->replaceArgument(0, $parameters);
-
-        $container
-            ->setDefinition(sprintf('doctrine_phpcr.%s_credentials', $session['name']), new DefinitionDecorator('doctrine_phpcr.credentials'))
-            ->replaceArgument(0, $session['username'])
-            ->replaceArgument(1, $session['password'])
-        ;
-
-        $container
-            ->setDefinition($session['service_name'], new DefinitionDecorator('doctrine_phpcr.midgard2.session'))
-            ->replaceArgument(0, new Reference(sprintf('doctrine_phpcr.%s_credentials', $session['name'])))
-            ->replaceArgument(1, $session['workspace'])
-        ;
-    }
-
     private function loadOdm(array $config, ContainerBuilder $container)
     {
         $this->loader->load('odm.xml');

diff --git a/Resources/config/midgard2.xml b/Resources/config/midgard2.xml