fix: directory with phar host prefix issue and partial revert of prev…

…iuos commit Closes 4
marcocesarato · Mar 12, 2020 · 1de045a · 1de045a
1 parent 8ddcc85
commit 1de045a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # AMWSCAN - PHP Antimalware Scanner
 
-**Version:** 0.5.0.70 beta
+**Version:** 0.5.0.71 beta
 
 **Github:** https://github.com/marcocesarato/PHP-Antimalware-Scanner
 

diff --git a/dist/scanner b/dist/scanner
diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-0.5.0.70
+0.5.0.71
diff --git a/src/Application.php b/src/Application.php
@@ -34,7 +34,7 @@ class Application
      *
      * @var string
      */
-    public static $VERSION = '0.5.0.70';
+    public static $VERSION = '0.5.0.71';
 
     /**
      * Root path.
@@ -1081,6 +1081,6 @@ private function convertToBytes($from)
      */
     public static function currentDirectory()
     {
-        return preg_replace('/^phar:\/\//i', '', __DIR__);
+        return dirname(preg_replace('/^phar:\/\//i', '', __DIR__), 1);
     }
 }
diff --git a/src/index.php b/src/index.php
@@ -2,14 +2,14 @@
 
 namespace marcocesarato\amwscan;
 
-include './Argument.php';
-include './Argv.php';
-include './Console.php';
-include './CSV.php';
-include './Definitions.php';
-include './Flag.php';
-include './Deobfuscator.php';
-include './Application.php';
+include 'Argument.php';
+include 'Argv.php';
+include 'Console.php';
+include 'CSV.php';
+include 'Definitions.php';
+include 'Flag.php';
+include 'Deobfuscator.php';
+include 'Application.php';
 
 $isCLI = (php_sapi_name() === 'cli');
 if (!$isCLI) {