[WIP] Add Puli Discovery integration

CmfResourceBundle.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Compiler\RegistryPass;
+use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Compiler\DiscoveryPass;
 use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Compiler\CompositeRepositoryPass;
 
 class CmfResourceBundle extends Bundle
@@ -22,6 +23,8 @@ public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new RegistryPass());
         $container->addCompilerPass(new CompositeRepositoryPass());
+        $container->addCompilerPass(new DiscoveryPass());
+
         parent::build($container);
     }
 }

DependencyInjection/CmfResourceExtension.php

@@ -36,6 +36,10 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $processor->processConfiguration($configuration, $configs);
 
         $this->loadRepositories($config['repositories'], $container);
+
+        if ($this->isConfigEnabled($container, $config['discovery'])) {
+            $this->loadDiscovery($config['discovery'], $container, $loader);
+        }
     }
 
     private function loadRepositories(array $repositories, ContainerBuilder $container)
@@ -64,6 +68,19 @@ private function loadRepositories(array $repositories, ContainerBuilder $contain
         $container->setAlias('cmf_resource.registry', 'cmf_resource.registry.container');
     }
 
+    private function loadDiscovery(array $discovery, ContainerBuilder $container, XmlFileLoader $loader)
+    {
+        if (!class_exists('Puli\Discovery\Api\Discovery')) {
+            throw new InvalidConfigurationException(
+                'The puli/discovery package must be installed when enabling discovery. The package is not found.'
+            );
+        }
+
+        $loader->load('discovery.xml');
+
+        $container->setParameter('cmf_resource.discovery.bindings', $discovery['bindings']);
+    }
+
     private function createDoctrinePhpcrOdmRepository(array $options, $alias)
     {
         if (!isset($options['basepath'])) {
@@ -104,7 +121,7 @@ private function createCompositeRepository(array $options, $alias)
             throw new InvalidConfigurationException('The composite repository type requires a "mounts" option to be set.');
         }
 
-        $definition = new Definition('Puli\Repository\CompositeRepository');
+        $definition = new Definition('Symfony\Cmf\Component\Resource\Repository\CompositeRepository');
 
         foreach ($options['mounts'] as $mount) {
             if (!isset($mount['mountpoint']) || !isset($mount['repository'])) {

DependencyInjection/Compiler/DiscoveryPass.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * @author Wouter de Jong <[email protected]>
+ */
+class DiscoveryPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('cmf_resource.discovery')) {
+            return;
+        }
+
+        $discovery = $container->findDefinition('cmf_resource.discovery');
+
+        $this->registerBindingTypes($container, $discovery);
+        $this->registerBindings($container, $discovery);
+    }
+
+    private function registerBindings(ContainerBuilder $container, Definition $discovery)
+    {
+        if (!$container->hasParameter('cmf_resource.discovery.bindings')) {
+            return;
+        }
+
+        $bindings = $container->getParameter('cmf_resource.discovery.bindings');
+        foreach ($bindings as $binding) {
+            $discovery->addMethodCall('addBinding', array(
+                new Definition(
+                    'Puli\Discovery\Binding\ResourceBinding',
+                    array($binding['path'], $binding['type'])
+                )
+            ));
+        }
+    }
+
+    private function registerBindingTypes(ContainerBuilder $container, Definition $discovery)
+    {
+        $types = $container->findTaggedServiceIds('cmf_resource.binding_type');
+        foreach ($types as $id => $tags) {
+            $discovery->addMethodCall('addBindingType', array(new Reference($id)));
+        }
+    }
+}

DependencyInjection/Configuration.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class Configuration implements ConfigurationInterface
@@ -24,7 +25,17 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $treeBuilder->root('cmf_resource')
+        $root = $treeBuilder->root('cmf_resource');
+
+        $this->addRepositoriesSection($root);
+        $this->addDiscoverySection($root);
+
+        return $treeBuilder;
+    }
+
+    public function addRepositoriesSection(ArrayNodeDefinition $root)
+    {
+        $root
             ->fixXmlConfig('repository', 'repositories')
             ->children()
                 ->arrayNode('repositories')
@@ -89,7 +100,30 @@ public function getConfigTreeBuilder()
                     ->end()
                 ->end() // repositories
             ->end();
+    }
 
-        return $treeBuilder;
+    public function addDiscoverySection(ArrayNodeDefinition $root)
+    {
+        $root
+            ->children()
+                ->arrayNode('discovery')
+                    ->canBeEnabled()
+                    ->fixXmlConfig('type')
+                    ->fixXmlConfig('binding')
+                    ->children()
+                        ->arrayNode('types')
+                            ->prototype('scalar')->end()
+                        ->end() // types
+                        ->arrayNode('bindings')
+                            ->prototype('array')
+                                ->children()
+                                    ->scalarNode('path')->isRequired()->end()
+                                    ->scalarNode('type')->isRequired()->end()
+                                ->end()
+                            ->end()
+                        ->end() // bindings
+                    ->end()
+                ->end() // discovery
+            ->end();
     }
 }

Resources/config/discovery.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter id="cmf_resource.discovery.bindings" type="collection"/>
+    </parameters>
+
+    <services>
+
+        <service id="cmf_resource.discovery" class="Puli\Discovery\InMemoryDiscovery">
+            <argument type="collection">
+                <argument type="service" id="cmf_resource.discovery.binding_initializer"/>
+            </argument>
+        </service>
+
+        <service id="cmf_resource.discovery.binding_initializer"
+            class="Puli\Discovery\Binding\Initializer\ResourceBindingInitializer"
+            public="false">
+            <argument type="service" id="cmf_resource.repository"/>
+        </service>
+
+    </services>
+
+</container>

Resources/config/resource.xml

@@ -18,5 +18,7 @@
             <argument type="collection" />
         </service>
 
+        <service id="cmf_resource.repository" alias="cmf_resource.repository.default"/>
+
     </services>
 </container>

composer.json

@@ -19,11 +19,13 @@
         "symfony-cmf/testing": "^1.3",
         "matthiasnoback/symfony-dependency-injection-test": "0.*",
         "matthiasnoback/symfony-config-test": "0.*",
-        "doctrine/phpcr-odm": "^1.2"
+        "doctrine/phpcr-odm": "^1.2",
+        "puli/discovery": "^1.0.0-beta8"
     },
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.2)",
-        "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents"
+        "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
+        "puli/discovery": "To integrate Puli Discovery (^1.0.0-beta8)"
     },
     "autoload": {
         "psr-4": {