aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-12 16:33:12 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-12 16:39:47 +0200
commit3b792787d741932acc4d1e35124d38886bad11d7 (patch)
treec794606b49761ec35891ef4b3258a07dcc42f4f2
parent06568b15bb9e9116fa4d4a42246e1b0e497bbf25 (diff)
downloadwallabag-3b792787d741932acc4d1e35124d38886bad11d7.tar.gz
wallabag-3b792787d741932acc4d1e35124d38886bad11d7.tar.zst
wallabag-3b792787d741932acc4d1e35124d38886bad11d7.zip
Upgraded CraueConfigBundle to 2.0
-rw-r--r--app/Resources/CraueConfigBundle/views/Settings/modify.html.twig10
-rw-r--r--app/config/config.yml1
-rw-r--r--app/config/services.yml8
-rw-r--r--composer.json2
-rw-r--r--var/SymfonyRequirements.php6
5 files changed, 14 insertions, 13 deletions
diff --git a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
index c4e735ee..b81b8651 100644
--- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
+++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
@@ -20,12 +20,10 @@
20 20
21 {% for section in sections | craue_sortSections %} 21 {% for section in sections | craue_sortSections %}
22 <div id="set-{{ section }}" class="col s12"> 22 <div id="set-{{ section }}" class="col s12">
23 {% for setting in form.settings if setting.section.vars.value == section %} 23 {% for setting in form.settings if setting.vars.value.section == section %}
24 {{ form_row(setting.name) }} 24 {{ form_row(setting.value, {
25 {{ form_row(setting.section) }} 25 'label': setting.vars.value.name | trans({}, 'CraueConfigBundle'),
26 {{ form_row(setting.value, { 26 }) }}
27 'label': setting.name.vars.value | trans({}, 'CraueConfigBundle'),
28 }) }}
29 {% endfor %} 27 {% endfor %}
30 </div> 28 </div>
31 {% endfor %} 29 {% endfor %}
diff --git a/app/config/config.yml b/app/config/config.yml
index 116bb04c..28abe734 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -6,6 +6,7 @@ imports:
6parameters: 6parameters:
7 # Allows to use the live reload feature for changes in assets 7 # Allows to use the live reload feature for changes in assets
8 use_webpack_dev_server: false 8 use_webpack_dev_server: false
9 craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
9 10
10framework: 11framework:
11 #esi: ~ 12 #esi: ~
diff --git a/app/config/services.yml b/app/config/services.yml
index 9a1ce80b..7b85d846 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -42,3 +42,11 @@ services:
42 arguments: ["@session"] 42 arguments: ["@session"]
43 tags: 43 tags:
44 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } 44 - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
45
46 craue_config_cache_provider:
47 class: Symfony\Component\Cache\Adapter\FilesystemAdapter
48 public: false
49 arguments:
50 - 'craue_config'
51 - 0
52 - '%kernel.cache_dir%'
diff --git a/composer.json b/composer.json
index bfd42339..02a79853 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
75 "guzzlehttp/guzzle": "^5.3.1", 75 "guzzlehttp/guzzle": "^5.3.1",
76 "doctrine/doctrine-migrations-bundle": "^1.0", 76 "doctrine/doctrine-migrations-bundle": "^1.0",
77 "paragonie/random_compat": "~1.0", 77 "paragonie/random_compat": "~1.0",
78 "craue/config-bundle": "~1.4", 78 "craue/config-bundle": "~2.0",
79 "mnapoli/piwik-twig-extension": "^1.0", 79 "mnapoli/piwik-twig-extension": "^1.0",
80 "ocramius/proxy-manager": "1.*", 80 "ocramius/proxy-manager": "1.*",
81 "white-october/pagerfanta-bundle": "^1.0", 81 "white-october/pagerfanta-bundle": "^1.0",
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 7e7a99de..3b14a402 100644
--- a/var/SymfonyRequirements.php
+++ b/var/SymfonyRequirements.php
@@ -634,12 +634,6 @@ class SymfonyRequirements extends RequirementCollection
634 ); 634 );
635 635
636 $this->addRecommendation( 636 $this->addRecommendation(
637 function_exists('iconv'),
638 'iconv() should be available',
639 'Install and enable the <strong>iconv</strong> extension.'
640 );
641
642 $this->addRecommendation(
643 function_exists('utf8_decode'), 637 function_exists('utf8_decode'),
644 'utf8_decode() should be available', 638 'utf8_decode() should be available',
645 'Install and enable the <strong>XML</strong> extension.' 639 'Install and enable the <strong>XML</strong> extension.'