Merge pull request #181 from symfony-cmf/prepare-1.1

Prepare 1.1 release

Author: wouterj

CHANGELOG.md

@@ -1,8 +1,14 @@
 Changelog
 =========
 
-dev-master
-----------
+1.1.0
+-----
+
+* **2016-03-31**: Added SymfonyContainerParameterTokenProvider for retrieving
+                  path elements from the DI container
+
+1.1.0-RC1
+---------
 
 * Convert non-managed intermediate nodes into AutoRoute documents #165
 

Resources/config/token_providers.xml

@@ -8,7 +8,7 @@
         <parameter key="cmf_routing_auto.token_provider.content_method.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentMethodProvider</parameter>
         <parameter key="cmf_routing_auto.token_provider.content_datetime.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentDateTimeProvider</parameter>
         <parameter key="cmf_routing_auto.token_provider.content_locale.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentLocaleProvider</parameter>
-        <parameter key="cmf_routing_auto.token_provider.container.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\SymfonyContainerParameterProvider</parameter>
+        <parameter key="cmf_routing_auto.token_provider.container.class">Symfony\Cmf\Bundle\RoutingAutoBundle\TokenProvider\SymfonyContainerParameterProvider</parameter>
 
     </parameters>
 

Tests/Unit/DependencyInjection/CmfRoutingAutoExtensionTest.php

@@ -30,7 +30,7 @@ public function setUp()
      * implicitly configured.
      *
      * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage No adapter has been configured, you either need to 
+     * @expectedExceptionMessage No adapter has been configured, you either need to
      */
     public function testLoad()
     {

Tests/Unit/TokenProvider/SymfonyContainerParameterProviderTest.php

@@ -0,0 +1,58 @@
+<?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\RoutingAutoBundle\Tests\Unit\TokenProvider;
+
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\TokenProvider\SymfonyContainerParameterProvider;
+
+class SymfonyContainerParameterProviderTest extends \PHPUnit_Framework_TestCase
+{
+    private $uriContext;
+    private $container;
+
+    public function setUp()
+    {
+        $this->uriContext = $this->prophesize('Symfony\Cmf\Component\RoutingAuto\UriContext');
+        $this->container = $this->prophesize('Symfony\Component\DependencyInjection\ContainerInterface');
+        $this->provider = new SymfonyContainerParameterProvider($this->container->reveal());
+    }
+
+    public function provideParameterValue()
+    {
+        return array(
+            array(array('parameter' => 'foobar'), null),
+            array(array('foobar' => 'barfoo'), 'InvalidArgumentException'), // This is deliberately generic to preserve BC from SF 2.5 > 2.6
+            array(array(), 'Symfony\Component\OptionsResolver\Exception\MissingOptionsException'),
+        );
+    }
+
+    /**
+     * @dataProvider provideParameterValue
+     */
+    public function testParameterValue($options, $expectedException)
+    {
+        if (null !== $expectedException) {
+            $this->setExpectedException($expectedException);
+        }
+
+        $this->container->getParameter('foobar')->willReturn('barfoo');
+
+        $optionsResolver = new OptionsResolver();
+        $this->provider->configureOptions($optionsResolver);
+        $options = $optionsResolver->resolve($options);
+
+        $res = $this->provider->provideValue($this->uriContext->reveal(), $options);
+
+        $this->assertEquals('barfoo', $res);
+    }
+}
+

TokenProvider/SymfonyContainerParameterProvider.php

@@ -0,0 +1,56 @@
+<?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\RoutingAutoBundle\TokenProvider;
+
+use Symfony\Cmf\Component\RoutingAuto\TokenProviderInterface;
+use Symfony\Cmf\Component\RoutingAuto\UriContext;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provide values parameters from a Symfony DI container.
+ *
+ * @author Daniel Leech <[email protected]>
+ */
+class SymfonyContainerParameterProvider implements TokenProviderInterface
+{
+    protected $container;
+
+    /**
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function provideValue(UriContext $uriContext, $options)
+    {
+        $parameterName = $options['parameter'];
+
+        return $this->container->getParameter($parameterName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolverInterface $optionsResolver)
+    {
+        $optionsResolver->setRequired(array(
+            'parameter',
+        ));
+    }
+}
+

composer.json

@@ -11,19 +11,19 @@
     ],
     "require": {
         "php": "^5.3.9|^7.0",
-        "symfony-cmf/routing-auto": "^1.1@RC",
+        "symfony-cmf/routing-auto": "^1.1",
         "symfony-cmf/routing-bundle": "^1.2.0",
         "symfony-cmf/core-bundle": "^1.2",
-        "aferrandini/urlizer": "1.0.*",
+        "aferrandini/urlizer": "~1.0.0",
         "symfony/config": "^2.2",
-        "jms/metadata": "1.5.*"
+        "jms/metadata": "~1.5.0"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.3@RC",
-        "symfony-cmf/slugifier-api": "@RC",
+        "symfony-cmf/testing": "^1.3",
+        "symfony-cmf/slugifier-api": "^1.0",
         "symfony/yaml": "^2.1",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
-        "matthiasnoback/symfony-config-test": "0.*",
+        "matthiasnoback/symfony-config-test": "~0.1",
         "doctrine/phpcr-odm": "^1.3",
         "phpunit/phpunit": "^4.5",
         "symfony/phpunit-bridge": "^2.7"