From 77a7752a592af9ac821621a34d9955533baf40a0 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 30 Dec 2015 10:06:45 +0100
Subject: Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
---
 .../CoreBundle/DependencyInjection/Configuration.php        | 13 -------------
 .../DependencyInjection/WallabagCoreExtension.php           |  1 -
 2 files changed, 14 deletions(-)

(limited to 'src/Wallabag/CoreBundle/DependencyInjection')

diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
index fb1941b8..32acd1f1 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
@@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
 class Configuration implements ConfigurationInterface
 {
@@ -18,21 +17,9 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('languages')
                     ->prototype('scalar')->end()
                 ->end()
-                ->arrayNode('import')
-                    ->append($this->getAllowMimetypes())
-                ->end()
             ->end()
         ;
 
         return $treeBuilder;
     }
-
-    private function getAllowMimetypes()
-    {
-        $node = new ArrayNodeDefinition('allow_mimetypes');
-
-        $node->prototype('scalar')->end();
-
-        return $node;
-    }
 }
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index e2a3ad55..330cc957 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -14,7 +14,6 @@ class WallabagCoreExtension extends Extension
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
         $container->setParameter('wallabag_core.languages', $config['languages']);
-        $container->setParameter('wallabag_core.import', $config['import']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
-- 
cgit v1.2.3