Merge pull request #4 from flint/configuration-loader

add loader that processes configuration as symfony does
flint · Nov 18, 2014 · 6aadb3a · 6aadb3a
2 parents 4263445 + 02333a3
commit 6aadb3a
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 8 deletions.
diff --git a/spec/Tacker/ConfiguratorSpec.php b/spec/Tacker/ConfiguratorSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Tacker;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class ConfiguratorSpec extends ObjectBehavior
 {

diff --git a/spec/Tacker/Loader/CacheLoaderSpec.php b/spec/Tacker/Loader/CacheLoaderSpec.php
@@ -8,7 +8,6 @@ class CacheLoaderSpec extends \PhpSpec\ObjectBehavior
 {
     /**
      * @param Symfony\Component\Config\Loader\LoaderInterface $loader
-     * @param Tacker\Normalizer $normalizer
      * @param Tacker\ResourceCollection $resources
      */
     function let($loader, $resources)

diff --git a/spec/Tacker/Loader/IniFileLoaderSpec.php b/spec/Tacker/Loader/IniFileLoaderSpec.php
@@ -2,7 +2,6 @@
 
 namespace spec\Tacker\Loader;
 
-use Prophecy\Argument;
 use Symfony\Component\Config\FileLocator;
 
 class IniFileLoaderSpec extends \PhpSpec\ObjectBehavior

diff --git a/spec/Tacker/Loader/JsonFileLoaderSpec.php b/spec/Tacker/Loader/JsonFileLoaderSpec.php
@@ -2,7 +2,6 @@
 
 namespace spec\Tacker\Loader;
 
-use Prophecy\Argument;
 use Symfony\Component\Config\FileLocator;
 
 class JsonFileLoaderSpec extends \PhpSpec\ObjectBehavior

diff --git a/spec/Tacker/Loader/NormalizerLoaderSpec.php b/spec/Tacker/Loader/NormalizerLoaderSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Tacker\Loader;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class NormalizerLoaderSpec extends ObjectBehavior
 {

diff --git a/spec/Tacker/Loader/ProcessorLoaderSpec.php b/spec/Tacker/Loader/ProcessorLoaderSpec.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace spec\Tacker\Loader;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+
+class ProcessorLoaderSpec extends \PhpSpec\ObjectBehavior
+{
+    /**
+     * @param Symfony\Component\Config\Loader\LoaderInterface $loader
+     * @param Symfony\Component\Config\Definition\ConfigurationInterface $configuration
+     */
+    function let($loader, $configuration)
+    {
+        $this->beConstructedWith($loader, $configuration);
+    }
+
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Tacker\Loader\ProcessorLoader');
+    }
+
+    function it_processes_configuration($loader, $configuration)
+    {
+        $builder = new TreeBuilder;
+        $root = $builder->root('');
+        $root
+            ->children()
+                ->booleanNode('auto_connect')
+                    ->defaultTrue()
+                ->end()
+            ->end()
+        ;
+
+
+        $configuration->getConfigTreeBuilder()->willReturn($builder);
+
+        $loader->load('file', null)->willReturn([]);
+
+        $this->load('file')->shouldReturn(['auto_connect' => true]);
+    }
+
+    function it_delegates_supports_to_loader($loader)
+    {
+        $loader->supports('php', null)->willReturn(false)->shouldBeCalled();
+        $loader->supports('yml', null)->willReturn(true)->shouldBeCalled();
+
+        $this->supports('php')->shouldReturn(false);
+        $this->supports('yml')->shouldReturn(true);
+    }
+}
diff --git a/spec/Tacker/Loader/YamlFileLoaderSpec.php b/spec/Tacker/Loader/YamlFileLoaderSpec.php
@@ -2,7 +2,6 @@
 
 namespace spec\Tacker\Loader;
 
-use Prophecy\Argument;
 use Symfony\Component\Config\FileLocator;
 
 class YamlFileLoaderSpec extends \PhpSpec\ObjectBehavior

diff --git a/spec/Tacker/LoaderBuilderSpec.php b/spec/Tacker/LoaderBuilderSpec.php
@@ -3,7 +3,6 @@
 namespace spec\Tacker;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class LoaderBuilderSpec extends ObjectBehavior
 {

diff --git a/src/Loader/CacheLoader.php b/src/Loader/CacheLoader.php
@@ -32,6 +32,9 @@ public function getCacheDir()
         return $this->cacheDir;
     }
 
+    /**
+     * @param boolean $debug
+     */
     public function setDebug($debug)
     {
         $this->debug = $debug;

diff --git a/src/Loader/ProcessorLoader.php b/src/Loader/ProcessorLoader.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tacker\Loader;
+
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class ProcessorLoader extends \Symfony\Component\Config\Loader\Loader
+{
+    private $loader;
+    private $configuration;
+
+    public function __construct(LoaderInterface $loader, ConfigurationInterface $configuration)
+    {
+        $this->loader = $loader;
+        $this->configuration = $configuration;
+    }
+
+    public function load($resource, $type = null)
+    {
+        $parameters = $this->loader->load($resource, $type);
+
+        return $this->processConfiguration($parameters);
+    }
+
+    public function supports($resource, $type = null)
+    {
+        return $this->loader->supports($resource, $type);
+    }
+
+    private function processConfiguration(array $parameters)
+    {
+        $processor = new Processor;
+
+        return $processor->processConfiguration($this->configuration, [$parameters]);
+    }
+}
diff --git a/src/LoaderBuilder.php b/src/LoaderBuilder.php
@@ -3,12 +3,14 @@
 namespace Tacker;
 
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Tacker\Loader\CacheLoader;
 use Tacker\Loader\IniFileLoader;
 use Tacker\Loader\JsonFileLoader;
 use Tacker\Loader\NormalizerLoader;
+use Tacker\Loader\ProcessorLoader;
 use Tacker\Loader\PhpFileLoader;
 use Tacker\Loader\YamlFileLoader;
 use Tacker\Normalizer\ChainNormalizer;
@@ -25,6 +27,7 @@ final class LoaderBuilder
     private $normalizer;
     private $resolver;
     private $resources;
+    private $configuration;
     private $locator;
     private $debug;
     private $cacheDir;
@@ -85,6 +88,11 @@ public function setDebug($debug)
         return $this;
     }
 
+    public function setConfiguration(ConfigurationInterface $configuration)
+    {
+        $this->configuration = $configuration;
+    }
+
     public function build()
     {
         if (false == $this->resolverConfigured) {
@@ -95,7 +103,7 @@ public function build()
             $this->addDefaultNormalizers();
         }
 
-        $loader = new CacheLoader($this->createNormalizerLoader(), $this->resources);
+        $loader = new CacheLoader($this->createLoaderGraph(), $this->resources);
         $loader->setCacheDir($this->cacheDir);
         $loader->setDebug($this->debug);
 
@@ -127,6 +135,17 @@ public function addDefaultNormalizers()
         return $this;
     }
 
+    private function createLoaderGraph()
+    {
+        $loader = $this->createNormalizerLoader();
+
+        if ($this->configuration) {
+            return new ProcessorLoader($loader, $this->configuration);
+        }
+
+        return $loader;
+    }
+
     private function createNormalizerLoader()
     {
         return new NormalizerLoader(new DelegatingLoader($this->resolver), $this->normalizer);