Merge pull request #14 from dylan-qton/master

Added ability to configure multiple mapping sources

Author: nilportugues

Diff for: README.md

@@ -72,7 +72,9 @@ It can be also be customized and placed elsewhere by editing the `app/config/con
 # app/config/config.yml
 
 nilportugues_json_api:
-    mappings: "%kernel.root_dir%/config/serializer/"
+    mappings: 
+        - "%kernel.root_dir%/config/serializer/"
+        - @AppBundle/Product/config/Mappings
 
 ```
 

Diff for: src/DependencyInjection/Configuration.php

@@ -22,10 +22,11 @@ public function getConfigTreeBuilder()
 
         $treeBuilder
             ->root('nilportugues_json_api')
-                ->children()
-                    ->scalarNode('mappings')->isRequired()->cannotBeEmpty()->defaultValue(self::DEFAULT_PATH)->end()
-                ->end()
-        ;
+            ->children()
+            ->arrayNode('mappings')->prototype('scalar')
+            ->isRequired()
+            ->cannotBeEmpty()
+            ->end();
 
         return $treeBuilder;
     }

Diff for: src/DependencyInjection/NilPortuguesSymfonyJsonApiExtension.php

@@ -36,26 +36,53 @@ public function load(array $configs, ContainerBuilder $container)
      */
     private function setMappings(ContainerBuilder $container, $config)
     {
-        if (true === \file_exists($config['mappings'])) {
-            $finder = new Finder();
-            $finder->files()->in($config['mappings']);
-            $loadedMappings = [];
+        $definition = new Definition();
+        $definition->setClass('NilPortugues\Api\Mapping\Mapper');
+        $args = $this->resolveMappings($container, $config['mappings']);
+        $definition->setArguments($args);
+        $definition->setLazy(true);
 
-            foreach ($finder as $file) {
-                /* @var \Symfony\Component\Finder\SplFileInfo $file */
-                $mapping = \file_get_contents($file->getPathname());
-                $mapping = Yaml::parse($mapping);
-                $loadedMappings[] = $mapping['mapping'];
+        $container->setDefinition('nil_portugues.api.mapping.mapper', $definition);
+    }
+
+    private function resolveMappings(ContainerBuilder $container, $mappings)
+    {
+        $loadedMappings = [];
+
+        foreach ($mappings as $mapping) {
+            if (0 === strpos($mapping, '@')) {
+                $name = substr($mapping, 1, strpos($mapping, '/') - 1);
+
+                $dir = $this->resolveBundle($container, $name);
+                $mapping = str_replace('@'.$name, $dir, $mapping);
+            }
+
+            if (true === \file_exists($mapping)) {
+                $finder = new Finder();
+                $finder->files()->in($mapping);
+                foreach ($finder as $file) {
+                    /* @var \Symfony\Component\Finder\SplFileInfo $file */
+                    $mapping = \file_get_contents($file->getPathname());
+                    $mapping = Yaml::parse($mapping);
+                    $loadedMappings[] = $mapping['mapping'];
+                }
             }
+        }
+
+        return [$loadedMappings];
+    }
 
-            $definition = new Definition();
-            $definition->setClass('NilPortugues\Api\Mapping\Mapper');
-            $args = array($loadedMappings);
-            $definition->setArguments($args);
-            $definition->setLazy(true);
+    private function resolveBundle(ContainerBuilder $container, $name)
+    {
+        $bundles = $container->getParameter('kernel.bundles');
 
-            $container->setDefinition('nil_portugues.api.mapping.mapper', $definition);
+        if (!isset($bundles[$name])) {
+            return null;
         }
+
+        $class = $bundles[$name];
+        $refClass = new \ReflectionClass($class);
+        return dirname($refClass->getFileName());
     }
 
     /**