Merge branch 'feature/7263'

Adds PHP 7 support. Close zendframework/zendframework#7366 Fixes zendframework/zendframework#7270 Fixes zendframework/zendframework#7263
zendframework · Mar 25, 2015 · b7b2499 · b7b2499
3 parents bbde888 + 32de5ae + 0738b9c
commit b7b2499
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Processor/Token.php b/src/Processor/Token.php
@@ -259,7 +259,7 @@ private function doProcess($value, array $replacements)
 
         if (!is_string($value) && (is_bool($value) || is_numeric($value))) {
             $stringVal  = (string) $value;
-            $changedVal = strtr($value, $this->map);
+            $changedVal = strtr($stringVal, $this->map);
 
             // replace the value only if a string replacement occurred
             if ($changedVal !== $stringVal) {