Merge branch 'feature-generator-path' of https://github.com/rafalwrze…

…szcz/zf2 into hotfix/classmap-compare
agiledivider · Jan 3, 2012 · 2673592 · 2673592
2 parents 9624c2a + 98c3c78
commit 2673592
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/bin/classmap_generator.php b/bin/classmap_generator.php
@@ -95,8 +95,17 @@
         // If both library path and classmap path are absolute, we have to make
         // it relative to the classmap file.
         $libraryPathCompare  = rtrim(str_replace('\\', '/', realpath($libraryPath)), '/');
-        $classmapPathCompare = rtrim(str_replace('\\', '/', realpath($opts->o)), '/');
-
+
+        if (file_exists($opts->o) ) {
+            $classmapPathCompare = rtrim(str_replace('\\', '/', realpath($opts->o)), '/');
+        } else {
+            // realpath() won't work for unexisting files
+            $newFilePath = explode('/', str_replace('\\', '/', $opts->o));
+            // stip filename
+            array_pop($newFilePath);
+            $classmapPathCompare = rtrim(realpath(implode('/', $newFilePath)), '/');
+        }
+
         if (is_file($libraryPathCompare)) {
             $libraryPathCompare = str_replace('\\', '/', dirname($libraryPathCompare));
         }