Move default configuration out of parameters

These default configuration value shouldn't be in parameters.yml.

diff --git a/app/config/config.yml b/app/config/config.yml
index a6cfc67d63e118ac363290b5789120a619c36f16..943365e87b893ecbd793ad315ce7a3fd0d5282bc 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -33,6 +33,10 @@ wallabag_core:
         fr: 'Français'
         de: 'Deutsch'
         tr: 'Türkçe'
+    items_on_page: 12
+    theme: material
+    language: en
+    rss_limit: 50
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index e4fcbd743c1d3f710ea821caef1c07ddf0524859..f9555676e4ca2492dcd596c2fe3d2ad0602b7b7f 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -68,12 +68,5 @@ parameters:
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
     # pocket import
     pocket_consumer_key: xxxxxxxx

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index f902f239522942d7e3fa17d7bb7a77bc88727ebd..e0e92760b7f3ee4802cb41c10ffe550d1bbe1864 100644 (file)
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -58,12 +58,5 @@ parameters:
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
     # pocket import
     pocket_consumer_key: xxxxxxxx

diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 76685b141c42e0ddc642aa1a8b6a54d5f2ccd491..e6e7636c139dba50993f0ba9bf07f0ecd6477c2b 100644 (file)
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -58,12 +58,5 @@ parameters:
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
     # pocket import
     pocket_consumer_key: xxxxxxxx

diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index cdafb1b1bb6bcb0ec58926a3a1863d16617b0dbb..c47392a38537afde568a43bedf73d82a0b83dd78 100644 (file)
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -58,12 +58,5 @@ parameters:
     wallabag_url: http://v2.wallabag.org
     wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
     # pocket import
     pocket_consumer_key: xxxxxxxx

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index da099a19bb8e0a003b5c0fc99fb80d87c02b6b6c..7a7e3a643f63271d2017cc24ef09dea96f9ca326 100644 (file)
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -205,10 +205,10 @@ class InstallCommand extends ContainerAwareCommand
         $em->persist($user);
 
         $config = new Config($user);
-        $config->setTheme($this->getContainer()->getParameter('theme'));
-        $config->setItemsPerPage($this->getContainer()->getParameter('items_on_page'));
-        $config->setRssLimit($this->getContainer()->getParameter('rss_limit'));
-        $config->setLanguage($this->getContainer()->getParameter('language'));
+        $config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
+        $config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
+        $config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
+        $config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
 
         $em->persist($config);
 

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 6c375909c9ee7e810f1d5bb3e8ef4696175ef443..4ece64312b66b0de467a8b6e9de338460d362c22 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -133,10 +133,10 @@ class ConfigController extends Controller
             $userManager->updateUser($newUser, true);
 
             $config = new Config($newUser);
-            $config->setTheme($this->container->getParameter('theme'));
-            $config->setItemsPerPage($this->container->getParameter('items_on_page'));
-            $config->setRssLimit($this->container->getParameter('rss_limit'));
-            $config->setLanguage($this->container->getParameter('language'));
+            $config->setTheme($this->container->getParameter('wallabag_core.theme'));
+            $config->setItemsPerPage($this->container->getParameter('wallabag_core.items_on_page'));
+            $config->setRssLimit($this->container->getParameter('wallabag_core.rss_limit'));
+            $config->setLanguage($this->container->getParameter('wallabag_core.language'));
 
             $em->persist($config);
 

diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
index 32acd1f17f315db1641266bc52fe861ea2fef996..4d5a63f86cbc6c01e2b48728a7207d0eacfa879b 100644 (file)
--- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
@@ -17,6 +17,18 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('languages')
                     ->prototype('scalar')->end()
                 ->end()
+                ->integerNode('items_on_page')
+                    ->defaultValue(12)
+                ->end()
+                ->scalarNode('theme')
+                    ->defaultValue('material')
+                ->end()
+                ->scalarNode('language')
+                    ->defaultValue('en')
+                ->end()
+                ->integerNode('rss_limit')
+                    ->defaultValue(50)
+                ->end()
             ->end()
         ;
 

diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index 9ff9b732f0b972d99ce287e17b1fc757bfe2beca..73bbffe11bfeb350d7124580ed2d95007e6fa7e8 100644 (file)
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -13,7 +13,12 @@ class WallabagCoreExtension extends Extension
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
+
         $container->setParameter('wallabag_core.languages', $config['languages']);
+        $container->setParameter('wallabag_core.items_on_page', $config['items_on_page']);
+        $container->setParameter('wallabag_core.theme', $config['theme']);
+        $container->setParameter('wallabag_core.language', $config['language']);
+        $container->setParameter('wallabag_core.rss_limit', $config['rss_limit']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 25d71cba07a5bf608b3512958146f6fc92d5c5d1..6a1afcc0032461a812317fb9895e70a14226b9ce 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -76,10 +76,10 @@ services:
         class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
         arguments:
             - "@doctrine.orm.entity_manager"
-            - %theme%
-            - %items_on_page%
-            - %rss_limit%
-            - %language%
+            - %wallabag_core.theme%
+            - %wallabag_core.items_on_page%
+            - %wallabag_core.rss_limit%
+            - %wallabag_core.language%
         tags:
             - { name: kernel.event_subscriber }