fix redirects when running as phar

[phancap.git] / src / phancap / Config.php

diff --git a/src/phancap/Config.php b/src/phancap/Config.php
index 1bb43796dbc61a8db4ffff76fd2e00dd0da7904c..5034b0f3c153daae2ed82360ffb4549966e21b12 100644 (file)
--- a/src/phancap/Config.php
+++ b/src/phancap/Config.php
@@ -118,15 +118,23 @@ class Config
             . preg_replace('/#.*$/', '', $_SERVER['REQUEST_URI']);
     }
 
+    /**
+     * @return string Directory of URL without trailing slash,
+     *                and without .phar file
+     */
     protected function getCurrentUrlDir()
     {
         $url = $this->getCurrentUrl();
         $url = preg_replace('/\?.*$/', '', $url);
-        if (substr($url, -1) == '/') {
-            return $url;
+        if (substr($url, -1) != '/') {
+            $url = substr($url, 0, -strlen(basename($url)) - 1);
+        }
+        if (\Phar::running()) {
+            //remove .phar file name
+            $url = substr($url, 0, -strlen(basename($url)) - 1);
         }
 
-        return substr($url, 0, -strlen(basename($url)) - 1);
+        return $url;
     }
 }
 ?>