Browse Source

Quote yaml correctly

Jordi Boggiano 8 years ago
parent
commit
f8af4df7e8

+ 31 - 31
app/config/config.yml

@@ -4,25 +4,25 @@ imports:
     - { resource: security.yml }
 
 framework:
-    secret:          %secret%
+    secret:          '%secret%'
     router:
         resource: '%kernel.root_dir%/config/routing.yml'
-        strict_requirements: %kernel.debug%
+        strict_requirements: '%kernel.debug%'
     form:            true
     csrf_protection: true
     validation:      { enable_annotations: true }
     translator:      { fallback: en }
     templating:      { engines: ['twig'] }
     assets:
-        version: v=%assets_version%
-    default_locale: %locale%
+        version: 'v=%assets_version%'
+    default_locale: '%locale%'
     session:
         name:            packagist
         cookie_lifetime: 3600
         cookie_httponly: true
-        save_path: %session_save_path%
-    trusted_proxies: %trusted_proxies%
-    trusted_hosts: %trusted_hosts%
+        save_path: '%session_save_path%'
+    trusted_proxies: '%trusted_proxies%'
+    trusted_hosts: '%trusted_hosts%'
     http_method_override: true
     fragments: ~
 
@@ -30,25 +30,25 @@ framework:
 twig:
     form_themes:
         - 'PackagistWebBundle::forms.html.twig'
-    debug:            %kernel.debug%
-    strict_variables: %kernel.debug%
+    debug:            '%kernel.debug%'
+    strict_variables: '%kernel.debug%'
     globals:
-        google_analytics: %google_analytics%
-        packagist_host: %packagist_host%
+        google_analytics: '%google_analytics%'
+        packagist_host: '%packagist_host%'
 
 # Doctrine Configuration
 doctrine:
     dbal:
-        driver:   %database_driver%
-        host:     %database_host%
-        dbname:   %database_name%
-        user:     %database_user%
-        password: %database_password%
+        driver:   '%database_driver%'
+        host:     '%database_host%'
+        dbname:   '%database_name%'
+        user:     '%database_user%'
+        password: '%database_password%'
         charset:  utf8mb4
         # See https://github.com/sonata-project/SonataAdminBundle/issues/3342
         server_version: 5.6
     orm:
-        auto_generate_proxy_classes: %kernel.debug%
+        auto_generate_proxy_classes: '%kernel.debug%'
         auto_mapping: true
 
 snc_redis:
@@ -56,13 +56,13 @@ snc_redis:
         default:
             type: predis
             alias: default
-            dsn: %redis_dsn%
+            dsn: '%redis_dsn%'
             options:
                 profile: 2.8
         cache:
             type: predis
             alias: cache
-            dsn: %redis_dsn%
+            dsn: '%redis_dsn%'
             options:
                 profile: 2.8
     session:
@@ -72,10 +72,10 @@ snc_redis:
 
 # Swiftmailer Configuration
 swiftmailer:
-    transport: %mailer_transport%
-    host:      %mailer_host%
-    username:  %mailer_user%
-    password:  %mailer_password%
+    transport: '%mailer_transport%'
+    host:      '%mailer_host%'
+    username:  '%mailer_user%'
+    password:  '%mailer_password%'
     spool:     { type: memory }
 
 fos_user:
@@ -84,8 +84,8 @@ fos_user:
     user_class:  Packagist\WebBundle\Entity\User
     use_username_form_type: true
     from_email:
-        address:        %mailer_from_email%
-        sender_name:    %mailer_from_name%
+        address:        '%mailer_from_email%'
+        sender_name:    '%mailer_from_name%'
     profile:
         form:
             type:       packagist_user_profile
@@ -103,18 +103,18 @@ hwi_oauth:
     resource_owners:
         github:
             type:          github
-            client_id:     %github.client_id%
-            client_secret: %github.client_secret%
+            client_id:     '%github.client_id%'
+            client_secret: '%github.client_secret%'
             options:
                 csrf: true
 
 nelmio_solarium:
     clients:
         default:
-            host: %solr_host%
-            port: %solr_port%
-            path: %solr_path%
-            core: %solr_core%
+            host: '%solr_host%'
+            port: '%solr_port%'
+            path: '%solr_path%'
+            core: '%solr_core%'
 
 nelmio_cors:
     defaults:

+ 1 - 1
app/config/config_dev.yml

@@ -20,7 +20,7 @@ monolog:
     handlers:
         main:
             type:  stream
-            path:  %kernel.logs_dir%/%kernel.environment%.log
+            path:  '%kernel.logs_dir%/%kernel.environment%.log'
             level: debug
             channels: ['!event']
         firephp:

+ 8 - 8
app/config/config_prod.yml

@@ -3,11 +3,11 @@ imports:
 
 doctrine:
     orm:
-        metadata_cache_driver: %doctrine_cache_backend%
+        metadata_cache_driver: '%doctrine_cache_backend%'
         result_cache_driver:
             type: predis
             cache_provider: predis
-        query_cache_driver: %doctrine_cache_backend%
+        query_cache_driver: '%doctrine_cache_backend%'
 
 doctrine_cache:
     providers:
@@ -27,7 +27,7 @@ monolog:
                 - ^/
         nested:
             type:  stream
-            path:  %kernel.logs_dir%/%kernel.environment%.log
+            path:  '%kernel.logs_dir%/%kernel.environment%.log'
             level: debug
             include_stacktraces: true
 
@@ -36,13 +36,13 @@ snc_redis:
         default:
             type: predis
             alias: default
-            dsn: %redis_dsn%
+            dsn: '%redis_dsn%'
             options:
                 profile: 2.8
         cache:
             type: predis
             alias: cache
-            dsn: %redis_session_dsn%
+            dsn: '%redis_session_dsn%'
             options:
                 profile: 2.8
     session:
@@ -52,14 +52,14 @@ snc_redis:
 framework:
     session:
         handler_id: snc_redis.session.handler
-        cookie_secure: %force_ssl%
+        cookie_secure: '%force_ssl%'
     validation:
-        cache: %validation_cache_backend%
+        cache: '%validation_cache_backend%'
 
 nelmio_security:
     clickjacking:
         paths:
             '^/.*': DENY
     forced_ssl:
-        enabled: %force_ssl%
+        enabled: '%force_ssl%'
         hsts_max_age: 31104000 # 1y

+ 2 - 2
app/config/config_test.yml

@@ -2,8 +2,8 @@ imports:
     - { resource: config_dev.yml }
 
 parameters:
-    database_name: %database_name_test%
-    redis_dsn: %redis_dsn_test%
+    database_name: '%database_name_test%'
+    redis_dsn: '%redis_dsn_test%'
 
 framework:
     test: ~

+ 1 - 1
app/config/defaults.yml

@@ -2,7 +2,7 @@ parameters:
     packagist_host: ~
     packagist_metadata_dir: '%kernel.cache_dir%/composer-packages-build'
     packagist_dumper_compress: 0
-    session_save_path: %kernel.cache_dir%/sessions
+    session_save_path: '%kernel.cache_dir%/sessions'
     database_name_test: packagist_test
     redis_dsn_test: redis://127.0.0.1/14
     assets_version: 1234

+ 1 - 1
app/config/parameters.yml.dist

@@ -14,7 +14,7 @@ parameters:
     mailer_from_name: Admin Team
 
     # packagist_host: example.org
-    # router.request_context.host: %packagist_host%
+    # router.request_context.host: '%packagist_host%'
     # router.request_context.scheme: https
 
     redis_dsn: redis://localhost/1

+ 1 - 1
app/config/security.yml

@@ -19,7 +19,7 @@ security:
                 check_path:     /login_check
                 failure_path:   null
             remember_me:
-                secret: %remember_me.secret%
+                secret: '%remember_me.secret%'
                 user_providers: packagist
                 name: pauth
                 always_remember_me: true

+ 2 - 2
src/Packagist/WebBundle/Resources/config/services.yml

@@ -95,11 +95,11 @@ services:
             - '@mailer'
             - '@twig'
             - '@logger'
-            - { from: %mailer_from_email%, fromName: %mailer_from_name% }
+            - { from: '%mailer_from_email%', fromName: '%mailer_from_name%' }
 
     packagist.profile.form.type:
         class: Packagist\WebBundle\Form\Type\ProfileFormType
-        arguments: [%fos_user.model.user.class%]
+        arguments: ['%fos_user.model.user.class%']
         tags:
             - { name: form.type, alias: packagist_user_profile }
 

+ 11 - 11
src/Packagist/WebBundle/Resources/translations/messages.en.yml

@@ -8,7 +8,7 @@ menu:
     login: Login
     register: Register
     browse_packages: Browse Packages
-    twitter: Follow @packagist
+    twitter: "Follow @packagist"
     github: GitHub
     contact: Contact
     stats: Statistics
@@ -53,20 +53,20 @@ search:
 packages:
     mine: My packages
     yours: Your packages
-    maintained_by: Packages maintained by %user%
+    maintained_by: "Packages maintained by %user%"
     my_favorites: My favorite packages
-    users_favorites: %user%'s favorite packages
+    users_favorites: "%user%'s favorite packages"
     dependent_title: Dependent Packages
     dependents: dependents
-    providers_title: The following packages provide %name%
+    providers_title: "The following packages provide %name%"
     suggesters: suggesters
     suggesters_title: Suggesters Packages
-    from: Packages from %vendor%
+    from: "Packages from %vendor%"
 
 browse:
     packages: Packages
-    of_type: of type %type%
-    with_tag: tagged with %tag%
+    of_type: "of type %type%"
+    with_tag: "tagged with %tag%"
     join_and: ' and '
     join_or: ' or '
 
@@ -87,8 +87,8 @@ abandon:
             will be tagged as abandoned and a replacement can be added later.</p>
 
 edit:
-    page_title: Edit Package %name%
-    title: Edit %name%
+    page_title: "Edit Package %name%"
+    title: "Edit %name%"
     submit: Update
 
 profile:
@@ -110,7 +110,7 @@ stats:
     since_midnight: "since midnight, UTC"
     daily: Daily installs
     daily_per_version: Daily installs per version
-    averaged: averaged %avg%
+    averaged: "averaged %avg%"
 
 statistics:
     title: Statistics
@@ -147,7 +147,7 @@ api_doc:
 
 user:
     member_since: member since
-    packages: %username%'s packages
+    packages: "%username%'s packages"
 
 'Search packages...': 'Search packages...'
 brandname: Packagist