From c0de6313c5014a9e0376998dcc28b8d6781b647c Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 6 Oct 2014 17:30:09 +0200 Subject: [PATCH 1/3] Simplified the parameters.yml file --- app/config/config_dev.yml | 6 +++--- app/config/parameters.yml.dist | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index a840c64b2c..10e550487b 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -8,8 +8,8 @@ framework: profiler: { only_exceptions: false } web_profiler: - toolbar: "%debug_toolbar%" - intercept_redirects: "%debug_redirects%" + toolbar: true + intercept_redirects: false monolog: handlers: @@ -42,7 +42,7 @@ monolog: # level: info assetic: - use_controller: "%use_assetic_controller%" + use_controller: "%kernel.debug%" #swiftmailer: # delivery_address: me@example.com diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 122c22f02a..1da778f412 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -18,7 +18,3 @@ parameters: # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt - - debug_toolbar: true - debug_redirects: false - use_assetic_controller: true From d892c0770910ad434d4d892f82c02873d78c2ba7 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 6 Oct 2014 18:08:59 +0200 Subject: [PATCH 2/3] Don't rely on %kernel.debug% for assetic.use_controller option --- app/config/config_dev.yml | 2 +- app/config/config_prod.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 10e550487b..efaf396e93 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -42,7 +42,7 @@ monolog: # level: info assetic: - use_controller: "%kernel.debug%" + use_controller: true #swiftmailer: # delivery_address: me@example.com diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 342837a031..ffb92bb1a4 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -23,3 +23,6 @@ monolog: level: debug console: type: console + +assetic: + use_controller: false From b3d26c0ce93735307a1d13c12187b5dec2e9228c Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 7 Oct 2014 11:48:04 +0200 Subject: [PATCH 3/3] Removed a param from the prod config file because its default value is already defined elsewhere --- app/config/config_prod.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index ffb92bb1a4..342837a031 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -23,6 +23,3 @@ monolog: level: debug console: type: console - -assetic: - use_controller: false