Added type option for the configured resources

Author: wouterj

AutoRoute/Mapping/MetadataFactoryBuilder.php

@@ -31,7 +31,7 @@ public function getMetadataFactory()
         $mappingFactory = new MetadataFactory();
 
         foreach ($this->resources as $resource) {
-            $mappingFactory->addMetadatas($this->loader->load($resource));
+            $mappingFactory->addMetadatas($this->loader->load($resource['path'], $resource['type']));
         }
 
         return $mappingFactory;

DependencyInjection/Configuration.php

@@ -31,7 +31,16 @@ public function getConfigTreeBuilder()
                     ->fixXmlConfig('path')
                     ->children()
                         ->arrayNode('paths')
-                            ->prototype('scalar')->end()
+                            ->prototype('array')
+                                ->beforeNormalization()
+                                    ->ifString()
+                                    ->then(function ($v) { return array('path' => $v); })
+                                ->end()
+                                ->children()
+                                    ->scalarNode('path')->isRequired()->end()
+                                    ->scalarNode('type')->defaultNull()->end()
+                                ->end()
+                            ->end()
                         ->end() // directories
                     ->end()
                 ->end() // mapping

Resources/config/schema/routing-auto-1.0.xsd

@@ -17,7 +17,16 @@
 
     <xsd:complexType name="mapping">
         <xsd:sequence>
-            <xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="path" type="path" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
+
+    <xsd:complexType name="path">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="path" type="xsd:string" />
+                <xsd:attribute name="type" type="xsd:string" />
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
 </xsd:schema>

Tests/Resources/Fixtures/config/config.php

@@ -5,7 +5,8 @@
     'mapping' => array(
         'paths' => array(
             'Resources/config/SpecificObject.yml',
-            'Resources/config/foo.xml',
+            array('path' => 'Document/Post.php', 'type' => 'annotation'),
+            array('path' => 'Resources/config/foo.xml'),
         ),
     ),
 ));

Tests/Resources/Fixtures/config/config.xml

@@ -6,7 +6,8 @@
 
         <mapping>
             <path>Resources/config/SpecificObject.yml</path>
-            <path>Resources/config/foo.xml</path>
+            <path path="Document/Post.php" type="annotation" />
+            <path path="Resources/config/foo.xml" />
         </mapping>
     </config>
 </container>

Tests/Resources/Fixtures/config/config.yml

@@ -3,4 +3,5 @@ cmf_routing_auto:
     mapping:
         paths:
             - Resources/config/SpecificObject.yml
-            - Resources/config/foo.xml
+            - { path: Document/Post.php, type: annotation }
+            - { path: Resources/config/foo.xml }

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2013 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\DependencyInjection;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\DependencyInjection\Configuration;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\DependencyInjection\CmfRoutingAutoExtension;
+use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionConfigurationTestCase;
+
+class ConfigurationTest extends AbstractExtensionConfigurationTestCase
+{
+    protected function getContainerExtension()
+    {
+        return new CmfRoutingAutoExtension();
+    }
+
+    protected function getConfiguration()
+    {
+        return new Configuration();
+    }
+
+    public function testSupportsAllConfigFormats()
+    {
+        $expectedConfiguration = array(
+            'auto_mapping' => false,
+            'mapping' => array(
+                'paths' => array(
+                    array('path' => 'Resources/config/SpecificObject.yml', 'type' => null),
+                    array('path' => 'Document/Post.php', 'type' => 'annotation'),
+                    array('path' => 'Resources/config/foo.xml', 'type' => null),
+                ),
+            ),
+        );
+
+        $sources = array_map(function ($path) {
+            return __DIR__.'/../../Resources/Fixtures/'.$path;
+        }, array(
+            'config/config.yml',
+            'config/config.xml',
+            'config/config.php',
+        ));
+
+        foreach ($sources as $source) {
+            $this->assertProcessedConfigurationEquals($expectedConfiguration, array($source));
+        }
+    }
+}

Tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2013 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\DependencyInjection;
+
+use Symfony\Cmf\Component\Testing\Unit\XmlSchemaTestCase;
+
+class XmlSchemaTest extends XmlSchemaTestCase
+{
+    public function testSchema()
+    {
+        $xmlFiles = array_map(function ($file) {
+            return __DIR__.'/../../Resources/Fixtures/config/'.$file;
+        }, array(
+            'config1.xml',
+            'config.xml',
+        ));
+
+        $this->assertSchemaAcceptsXml($xmlFiles, __DIR__.'/../../../Resources/config/schema/routing-auto-1.0.xsd');
+    }
+}