Accept yaml extension

Author: Jeremiah VALERIE

Config/Parser/YmlParser.php renamed to Config/Parser/YamlParser.php

@@ -16,9 +16,9 @@
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Parser as YamlParser;
+use Symfony\Component\Yaml\Parser;
 
-class YmlParser implements ParserInterface
+class YamlParser implements ParserInterface
 {
     private static $yamlParser;
 
@@ -31,7 +31,7 @@ class YmlParser implements ParserInterface
     public static function parse(SplFileInfo $file, ContainerBuilder $container)
     {
         if (null === self::$yamlParser) {
-            self::$yamlParser = new YamlParser();
+            self::$yamlParser = new Parser();
         }
 
         try {

DependencyInjection/Compiler/ConfigTypesPass.php

@@ -36,6 +36,7 @@ public function process(ContainerBuilder $container)
             $aliases = call_user_func($class.'::getAliases');
             $this->setTypeServiceDefinition($container, $class, $aliases);
         }
+        $container->getParameterBag()->remove('overblog_graphql_types.config');
     }
 
     private function setTypeServiceDefinition(ContainerBuilder $container, $class, array $aliases)

DependencyInjection/Compiler/MutationTaggedServiceMappingTaggedPass.php

@@ -18,11 +18,6 @@ protected function getTagName()
         return 'overblog_graphql.mutation';
     }
 
-    protected function getParameterName()
-    {
-        return 'overblog_graphql.mutations_mapping';
-    }
-
     protected function getResolverServiceID()
     {
         return 'overblog_graphql.mutation_resolver';

DependencyInjection/Compiler/ResolverTaggedServiceMappingPass.php

@@ -18,11 +18,6 @@ protected function getTagName()
         return 'overblog_graphql.resolver';
     }
 
-    protected function getParameterName()
-    {
-        return 'overblog_graphql.resolvers_mapping';
-    }
-
     protected function checkRequirements($id, array $tag)
     {
         parent::checkRequirements($id, $tag);

DependencyInjection/Compiler/TaggedServiceMappingPass.php

@@ -54,7 +54,6 @@ private function getTaggedServiceMapping(ContainerBuilder $container, $tagName)
     public function process(ContainerBuilder $container)
     {
         $mapping = $this->getTaggedServiceMapping($container, $this->getTagName());
-        $container->setParameter($this->getParameterName(), $mapping);
         $resolverDefinition = $container->findDefinition($this->getResolverServiceID());
 
         foreach ($mapping as $name => $options) {
@@ -101,6 +100,4 @@ protected function checkRequirements($id, array $tag)
     abstract protected function getTagName();
 
     abstract protected function getResolverServiceID();
-
-    abstract protected function getParameterName();
 }

DependencyInjection/Compiler/TypeTaggedServiceMappingPass.php

@@ -18,11 +18,6 @@ protected function getTagName()
         return 'overblog_graphql.type';
     }
 
-    protected function getParameterName()
-    {
-        return 'overblog_graphql.types_mapping';
-    }
-
     protected function getResolverServiceID()
     {
         return 'overblog_graphql.type_resolver';

DependencyInjection/Configuration.php

@@ -98,8 +98,18 @@ public function getConfigTreeBuilder()
                                 ->arrayNode('types')
                                     ->prototype('array')
                                         ->addDefaultsIfNotSet()
+                                        ->beforeNormalization()
+                                            ->ifTrue(function ($v) {
+                                                return isset($v['type']) && $v['type'] === 'yml';
+                                            })
+                                            ->then(function ($v) {
+                                                $v['type'] = 'yaml';
+
+                                                return $v;
+                                            })
+                                        ->end()
                                         ->children()
-                                            ->enumNode('type')->isRequired()->values(['yml', 'xml'])->end()
+                                            ->enumNode('type')->isRequired()->values(['yaml', 'xml'])->end()
                                             ->scalarNode('dir')->defaultNull()->end()
                                         ->end()
                                     ->end()

DependencyInjection/OverblogGraphQLTypesExtension.php

@@ -19,7 +19,9 @@
 
 class OverblogGraphQLTypesExtension extends Extension
 {
-    private static $configTypes = ['yml', 'xml'];
+    private static $configTypes = ['yaml', 'xml'];
+
+    private static $typeExtensions = ['yaml' => '{yaml,yml}', 'xml' => 'xml'];
 
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -112,7 +114,7 @@ private function detectFilesByType(ContainerBuilder $container, $path, $type = n
 
         foreach ($types as $type) {
             try {
-                $finder->files()->in($path)->name('*.types.'.$type);
+                $finder->files()->in($path)->name('*.types.'.self::$typeExtensions[$type]);
             } catch (\InvalidArgumentException $e) {
                 continue;
             }

Resources/doc/definitions/type-system/index.md

@@ -27,7 +27,7 @@ Types can be define 3 different ways:
             mappings:
                 types:
                     -
-                        type: yml # or xml
+                        type: yaml # or xml
                         dir: "%kernel.root_dir%/.../mapping"
     ```
 

Tests/DependencyInjection/OverblogGraphQLTypesExtensionTest.php

@@ -61,7 +61,7 @@ public function testDuplicatedType()
      */
     public function testBrokenYmlOnPrepend()
     {
-        $this->extension->containerPrependExtensionConfig($this->getBrokenMappingConfig('yml'), $this->container);
+        $this->extension->containerPrependExtensionConfig($this->getBrokenMappingConfig('yaml'), $this->container);
     }
 
     /**