From 59eef135356c47a330b52d890b6309101b7e3c2c Mon Sep 17 00:00:00 2001 From: Gerry Vandermaesen Date: Fri, 23 Jan 2015 15:43:09 +0100 Subject: [PATCH 1/3] Move %locale% to config.yml --- app/config/config.yml | 3 +++ app/config/parameters.yml.dist | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 25f6647196..cac37e4f5c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,9 @@ imports: - { resource: security.yml } - { resource: services.yml } +parameters: + locale: en + framework: #esi: ~ #translator: { fallback: "%locale%" } diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 1da778f412..a92b49edd2 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -14,7 +14,5 @@ parameters: mailer_user: ~ mailer_password: ~ - locale: en - # A secret key that's used to generate certain security-related tokens secret: ThisTokenIsNotSoSecretChangeIt From 5ab0c3e0dbf2fd23213ec784e4157e8fe7c2817a Mon Sep 17 00:00:00 2001 From: Gerry Vandermaesen Date: Mon, 26 Jan 2015 10:17:29 +0100 Subject: [PATCH 2/3] Added some comments for the parameter declaration --- app/config/config.yml | 2 ++ app/config/parameters.yml.dist | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index cac37e4f5c..d1d29d4107 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,8 @@ imports: - { resource: security.yml } - { resource: services.yml } +# Put parameters here that don't need to change on each machine where the app is deployed +# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration parameters: locale: en diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index a92b49edd2..69a7581a58 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,4 +1,6 @@ # This file is a "template" of what your parameters.yml file should look like +# Set parameters here that may be different on each machine where the app is deployed +# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration parameters: database_driver: pdo_mysql database_host: 127.0.0.1 From 4f534c5510ff2de538b6e7b3b973881bd1ce9f03 Mon Sep 17 00:00:00 2001 From: Gerry Vandermaesen Date: Wed, 1 Apr 2015 10:47:05 +0200 Subject: [PATCH 3/3] Changed comment, removed %database_driver% --- app/config/config.yml | 2 +- app/config/parameters.yml.dist | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index d1d29d4107..be5187d0a3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -51,7 +51,7 @@ assetic: # Doctrine Configuration doctrine: dbal: - driver: "%database_driver%" + driver: pdo_mysql host: "%database_host%" port: "%database_port%" dbname: "%database_name%" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 69a7581a58..886c92bb8c 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,8 +1,7 @@ # This file is a "template" of what your parameters.yml file should look like -# Set parameters here that may be different on each machine where the app is deployed +# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production. # http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration parameters: - database_driver: pdo_mysql database_host: 127.0.0.1 database_port: ~ database_name: symfony