Allowing null values to be used inline.

kherge-archive · Jul 12, 2013 · 6ea8648 · 6ea8648
1 parent f64f86c
commit 6ea8648
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/lib/Herrera/Wise/Loader/AbstractFileLoader.php b/src/lib/Herrera/Wise/Loader/AbstractFileLoader.php
@@ -145,14 +145,16 @@ function (&$value) use (&$data, $global, $_this) {
                             $ref = $_this->resolveReference($reference, $global);
                         }
 
-                        if (false === is_scalar($ref)) {
-                            if (false == preg_match('/^%(?:[^%]+)%$/', $value)) {
-                                throw InvalidReferenceException::format(
-                                    'The non-scalar reference "%s" cannot be used inline.',
-                                    "%$reference%"
-                                );
-                            }
+                        if ((false === is_null($ref))
+                            && (false === is_scalar($ref))
+                            && (false == preg_match('/^%(?:[^%]+)%$/', $value))) {
+                            throw InvalidReferenceException::format(
+                                'The non-scalar reference "%s" cannot be used inline.',
+                                "%$reference%"
+                            );
+                        }
 
+                        if ("%$reference%" === $value) {
                             $value = $ref;
                         } else {
                             $value = str_replace("%$reference%", $ref, $value);

diff --git a/src/tests/Herrera/Wise/Tests/Loader/AbstractFileLoaderTest.php b/src/tests/Herrera/Wise/Tests/Loader/AbstractFileLoaderTest.php
@@ -124,7 +124,7 @@ public function testProcess()
                     ),
                     'global' => '%global.value%',
                     'placeholder' => '%imported.list%',
-                    'inline_placeholder' => 'rand: %imported.value%'
+                    'inline_placeholder' => 'rand: %imported.list.null%%imported.value%'
                 ),
                 true
             ) . ';'
@@ -136,6 +136,7 @@ public function testProcess()
                 array(
                     'imported' => array(
                         'list' => array(
+                            'null' => null,
                             'value' => 123
                         ),
                         'value' => $rand = rand()
@@ -154,11 +155,13 @@ public function testProcess()
                 ),
                 'global' => 999,
                 'placeholder' => array(
+                    'null' => null,
                     'value' => 123
                 ),
                 'inline_placeholder' => 'rand: ' . $rand,
                 'imported' => array(
                     'list' => array(
+                        'null' => null,
                         'value' => 123
                     ),
                     'value' => $rand