From 9f4362e105fa6acecc45aa9b60391a923ea8702a Mon Sep 17 00:00:00 2001
From: Andrii Vasyliev <sol@hiqdev.com>
Date: Mon, 26 Dec 2016 12:55:51 +0000
Subject: [PATCH] + proper propagating skippable sign

---
 src/Builder.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Builder.php b/src/Builder.php
index 8d480d1..c6fc9e3 100644
--- a/src/Builder.php
+++ b/src/Builder.php
@@ -173,7 +173,9 @@ public static function writeFile($path, array $data)
         if (!file_exists(dirname($path))) {
             mkdir(dirname($path), 0777, true);
         }
-        $content = str_replace("'" . static::BASE_DIR_MARKER, '$baseDir . \'', Helper::exportVar($data));
+        $content = Helper::exportVar($data);
+        $content = str_replace("'" . static::BASE_DIR_MARKER, "\$baseDir . '", $content);
+        $content = str_replace("'?" . static::BASE_DIR_MARKER, "'?' . \$baseDir . '", $content);
         static::putFile($path, "<?php\n\n\$baseDir = dirname(dirname(dirname(__DIR__)));\n\nreturn $content;\n");
     }
 
@@ -218,7 +220,13 @@ public static function substitutePathes($data, $dir, $alias)
      */
     protected static function substitutePath($path, $dir, $alias)
     {
-        return (substr($path, 0, strlen($dir) + 1) === $dir . DIRECTORY_SEPARATOR) ? $alias . substr($path, strlen($dir)) : $path;
+        $skippable = strncmp($path, '?', 1) === 0 ? '?' : '';
+        if ($skippable) {
+            $path = substr($path, 1);
+        }
+        $result = (substr($path, 0, strlen($dir) + 1) === $dir . DIRECTORY_SEPARATOR) ? $alias . substr($path, strlen($dir)) : $path;
+
+        return $skippable . $result;
     }
 
     public function readConfig($name)