FIX Add quotes to constants in YAML to ensure syntax validity

silverstripe · Feb 27, 2017 · 458ea65 · 458ea65
1 parent deca009
commit 458ea65
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/_config/cache.yml b/_config/cache.yml
@@ -5,7 +5,7 @@ SilverStripe\Core\Injector\Injector:
   SilverStripe\Core\Cache\CacheFactory:
     class: 'SilverStripe\Core\Cache\DefaultCacheFactory'
     constructor:
-      directory: `TEMP_FOLDER`
+      directory: '`TEMP_FOLDER`'
   Psr\SimpleCache\CacheInterface.GDBackend_Manipulations:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:

diff --git a/_config/i18n.yml b/_config/i18n.yml
@@ -39,7 +39,7 @@ SilverStripe\Core\Injector\Injector:
     constructor:
       0: 'en'
       1: null
-      2: `TEMP_FOLDER`
+      2: '`TEMP_FOLDER`'
     properties:
       ConfigCacheFactory: %$Symfony\Component\Config\ConfigCacheFactoryInterface
     calls:

diff --git a/docs/en/02_Developer_Guides/05_Extending/05_Injector.md b/docs/en/02_Developer_Guides/05_Extending/05_Injector.md
@@ -123,17 +123,17 @@ As well as properties, method calls can also be specified:
 
 ## Using constants as variables
 
-Any of the core constants can be used as a service argument by quoting with back ticks "`".
+Any of the core constants can be used as a service argument by quoting with back ticks "`". Please ensure you also quote the entire value (see below).
 
 
-    :::yaml
-    CachingService:
-      class: SilverStripe\Cache\CacheProvider
-      properties:
-        CacheDir: `TEMP_DIR`
+```yaml
+CachingService:
+  class: SilverStripe\Cache\CacheProvider
+  properties:
+    CacheDir: '`TEMP_DIR`'
+```
 
-
-Note: undefined variables will be replaced with null
+Note: undefined variables will be replaced with null.
 
 
 ## Factories

diff --git a/src/Core/Injector/Injector.php b/src/Core/Injector/Injector.php
@@ -525,8 +525,8 @@ public function convertServiceProperty($value)
             return $this->get($id);
         }
 
-        // Evaluate constants surrounded by back ticks
-        if (preg_match('/^`(?<name>[^`]+)`$/', $value, $matches)) {
+        // Evaluate constants surrounded by back ticks (and quotes)
+        if (preg_match('/^[\'"]?`(?<name>[^`]+)`[\'"]?$/', $value, $matches)) {
             $value = defined($matches['name']) ? constant($matches['name']) : null;
         }
 

diff --git a/tests/php/Core/Injector/InjectorTest.php b/tests/php/Core/Injector/InjectorTest.php
@@ -216,7 +216,7 @@ public function testConstantUsage()
                 'properties' => array(
                     'filters' => array(
                         '`BASE_PATH`',
-                        '`TEMP_FOLDER`',
+                        '"`TEMP_FOLDER`"',
                         '`NOT_DEFINED`',
                         'THIRDPARTY_DIR' // Not back-tick escaped
                     )