Fix relative path resolving for static lists

Author: theseer

src/AutoloadRenderer.php

@@ -227,7 +227,7 @@ public function setVariable($name, $value) {
          *
          * @return string
          */
-        private function resolvePath($fname) {
+        protected function resolvePath($fname) {
             if (empty($this->baseDir)) {
                 return str_replace('\\', '/', $fname);
             }

src/CacheWarmingListRenderer.php

@@ -29,11 +29,11 @@ public function __construct($addReset, $indent, $linebreak) {
      * @return string
      */
     public function render(array $list) {
-        $line = $this->indent . 'opcache_compile_file(';
-        $glue = ');' . $this->linebreak . $line;
+        $line = $this->indent . 'opcache_compile_file(___BASEDIR___\'';
+        $glue = '\');' . $this->linebreak . $line;
 
         $firstLine = $this->addReset ? $this->indent . 'opcache_reset();' . $this->linebreak : '';
-        return $firstLine . $line . implode($glue, $list) . ');';
+        return $firstLine . $line . implode($glue, $list) . '\');';
 
     }
 }

src/StaticRenderer.php

@@ -98,7 +98,10 @@ public function render($template) {
                 $baseDir = $this->compat ? 'dirname(__FILE__) . ' : '__DIR__ . ';
             }
 
-            $entries = $this->sortByDependency();
+            $entries = array();
+            foreach($this->sortByDependency() as $fname) {
+                $entries[] = $this->resolvePath($fname);
+            }
 
             $replace = array_merge(
                 $this->variables,
@@ -121,15 +124,8 @@ public function render($template) {
         protected function sortByDependency() {
             $sorter  = new ClassDependencySorter($this->classes, $this->dependencies);
             $list    = $sorter->process();
-            $entries = array();
-            foreach(array_unique($list) as $file) {
-                $fname = realpath($file);
-                if (!empty($this->baseDir) && strpos($fname, $this->baseDir)===0) {
-                    $fname = str_replace($this->baseDir, '', $fname);
-                }
-                $entries[] =  "___BASEDIR___'$fname'";
-            }
-            return $entries;
+
+            return array_unique($list);
         }
 
     }

src/StaticRequireListRenderer.php

@@ -26,8 +26,8 @@ public function __construct($useOnce, $indent, $linebreak) {
      */
     public function render(array $list) {
         $require = (boolean)$this->useOnce ? 'require_once' : 'require';
-        $glue = ';' . $this->linebreak . $this->indent . $require . ' ';
+        $glue = '\';' . $this->linebreak . $this->indent . $require . ' ___BASEDIR___\'';
 
-        return $this->indent . $require . ' ' . implode($glue, $list) . ';';
+        return $this->indent . $require . ' ' . implode($glue, $list) . '\';';
     }
 }