From f63ce95261f95c31b58acdf718a9ee540e7bc3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 24 Feb 2017 16:09:26 +0100 Subject: [PATCH] Uniformize config files and fix deprecations --- app/config/config.yml | 64 +++++++++++++++++----------------- app/config/config_dev.yml | 18 +++++----- app/config/config_prod.yml | 10 +++--- app/config/parameters.yml.dist | 20 +++++------ app/config/routing.yml | 4 +-- app/config/routing_dev.yml | 16 ++++----- app/config/security.yml | 4 +-- app/config/services.yml | 8 ++--- 8 files changed, 72 insertions(+), 72 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index b8957fa1d4..b2f00d42c1 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -9,71 +9,71 @@ parameters: locale: en framework: - #esi: ~ - #translator: { fallbacks: ["%locale%"] } - secret: "%secret%" + #esi: ~ + #translator: { fallbacks: ['%locale%'] } + secret: '%secret%' router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: '%kernel.root_dir%/config/routing.yml' strict_requirements: ~ - form: ~ + form: ~ csrf_protection: ~ - validation: { enable_annotations: true } - #serializer: { enable_annotations: true } + validation: { enable_annotations: true } + #serializer: { enable_annotations: true } templating: engines: ['twig'] - default_locale: "%locale%" - trusted_hosts: ~ + default_locale: '%locale%' + trusted_hosts: ~ trusted_proxies: ~ session: # handler_id set to null will use default session handler from php.ini - handler_id: ~ - fragments: ~ + handler_id: ~ + fragments: ~ http_method_override: true # Twig Configuration twig: - debug: "%kernel.debug%" - strict_variables: "%kernel.debug%" + debug: '%kernel.debug%' + strict_variables: '%kernel.debug%' # Assetic Configuration assetic: - debug: "%kernel.debug%" + debug: '%kernel.debug%' use_controller: false - bundles: [ ] + bundles: [] #java: /usr/bin/java filters: cssrewrite: ~ #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" + # jar: '%kernel.root_dir%/Resources/java/compiler.jar' #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" + # jar: '%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar' # Doctrine Configuration doctrine: dbal: - driver: pdo_mysql - host: "%database_host%" - port: "%database_port%" - dbname: "%database_name%" - user: "%database_user%" - password: "%database_password%" - charset: UTF8 + driver: pdo_mysql + host: '%database_host%' + port: '%database_port%' + dbname: '%database_name%' + user: '%database_user%' + password: '%database_password%' + charset: UTF8 # if using pdo_sqlite as your database driver: # 1. add the path in parameters.yml - # e.g. database_path: "%kernel.root_dir%/data/data.db3" + # e.g. database_path: '%kernel.root_dir%/data/data.db3' # 2. Uncomment database_path in parameters.yml.dist # 3. Uncomment next line: - #path: "%database_path%" + #path: '%database_path%' orm: - auto_generate_proxy_classes: "%kernel.debug%" + auto_generate_proxy_classes: '%kernel.debug%' naming_strategy: doctrine.orm.naming_strategy.underscore auto_mapping: true # Swiftmailer Configuration swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" - spool: { type: memory } + transport: '%mailer_transport%' + host: '%mailer_host%' + username: '%mailer_user%' + password: '%mailer_password%' + spool: { type: memory } diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index b91b77de86..20f57db766 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -3,7 +3,7 @@ imports: framework: router: - resource: "%kernel.root_dir%/config/routing_dev.yml" + resource: '%kernel.root_dir%/config/routing_dev.yml' strict_requirements: true profiler: { only_exceptions: false } @@ -15,20 +15,20 @@ monolog: handlers: main: type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + path: '%kernel.logs_dir%/%kernel.environment%.log' level: debug - channels: [!event] + channels: ['!event'] console: - type: console - channels: [!event, !doctrine] + type: console + channels: ['!event', '!doctrine'] # uncomment to get logging in your browser # you may have to allow bigger header sizes in your Web server configuration #firephp: - # type: firephp - # level: info + # type: firephp + # level: info #chromephp: - # type: chromephp - # level: info + # type: chromephp + # level: info assetic: use_controller: true diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 5e5f0bcb02..3042dd3fc7 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -16,12 +16,12 @@ imports: monolog: handlers: main: - type: fingers_crossed + type: fingers_crossed action_level: error - handler: nested + handler: nested nested: - type: stream - path: "%kernel.logs_dir%/%kernel.environment%.log" + type: stream + path: '%kernel.logs_dir%/%kernel.environment%.log' level: debug console: - type: console + type: console diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index dd72f22703..8b636295d9 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -2,18 +2,18 @@ # 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_host: 127.0.0.1 - database_port: ~ - database_name: symfony - database_user: root + database_host: 127.0.0.1 + database_port: ~ + database_name: symfony + database_user: root database_password: ~ # You should uncomment this if you want to use pdo_sqlite - # database_path: "%kernel.root_dir%/data.db3" + #database_path: "%kernel.root_dir%/data.db3" - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ + mailer_transport: smtp + mailer_host: 127.0.0.1 + mailer_user: ~ + mailer_password: ~ # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt + secret: ThisTokenIsNotSoSecretChangeIt diff --git a/app/config/routing.yml b/app/config/routing.yml index 8eadc31aeb..2ec067f4c7 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,3 @@ app: - resource: "@AppBundle/Controller/" - type: annotation + resource: '@AppBundle/Controller/' + type: annotation diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 0f0afb615c..a3a6c2d645 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,18 +1,18 @@ _wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" - prefix: /_wdt + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' + prefix: /_wdt _profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" - prefix: /_profiler + resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' + prefix: /_profiler _configurator: - resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" - prefix: /_configurator + resource: '@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml' + prefix: /_configurator _errors: - resource: "@TwigBundle/Resources/config/routing/errors.xml" - prefix: /_error + resource: '@TwigBundle/Resources/config/routing/errors.xml' + prefix: /_error _main: resource: routing.yml diff --git a/app/config/security.yml b/app/config/security.yml index 343eb49d06..1086c1a7fb 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -17,8 +17,8 @@ security: anonymous: ~ # activate different ways to authenticate - # http_basic: ~ # http://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate + #http_basic: ~ - # form_login: ~ # http://symfony.com/doc/current/cookbook/security/form_login_setup.html + #form_login: ~ diff --git a/app/config/services.yml b/app/config/services.yml index 5a805ca49f..f15dc0ee60 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -1,9 +1,9 @@ # Learn more about services, parameters and containers at # http://symfony.com/doc/current/service_container.html parameters: -# parameter_name: value + #parameter_name: value services: -# service_name: -# class: AppBundle\Directory\ClassName -# arguments: ["@another_service_name", "plain_value", "%parameter_name%"] + #service_name: + # class: AppBundle\Directory\ClassName + # arguments: ['@another_service_name', 'plain_value', '%parameter_name%']