fix: directory with phar host prefix issue

Fix directory with phar host prefix issue Update Copyright year Updated bin files permissions New version 0.5.0.70 Closes 4
marcocesarato · Mar 11, 2020 · 8ddcc85 · 8ddcc85
1 parent b06e642
commit 8ddcc85
Show file tree

Hide file tree

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

diff --git a/bin/build b/bin/build
diff --git a/bin/composer b/bin/composer
diff --git a/bin/fix-cs b/bin/fix-cs
diff --git a/bin/fix-cs-all b/bin/fix-cs-all
diff --git a/bin/lint b/bin/lint
diff --git a/bin/pre-commit b/bin/pre-commit
diff --git a/bin/run b/bin/run
diff --git a/dist/scanner b/dist/scanner
diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-0.5.0.69
+0.5.0.70
diff --git a/src/Application.php b/src/Application.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner
@@ -34,7 +34,7 @@ class Application
      *
      * @var string
      */
-    public static $VERSION = '0.5.0.69';
+    public static $VERSION = '0.5.0.70';
 
     /**
      * Root path.
@@ -195,11 +195,11 @@ public function __construct()
     private function init()
     {
         if (self::$ROOT === './') {
-            self::$ROOT = __DIR__;
+            self::$ROOT = self::currentDirectory();
         }
 
         if (self::$SCAN_PATH === './') {
-            self::$SCAN_PATH = __DIR__;
+            self::$SCAN_PATH = self::currentDirectory();
         }
         self::$PATH_QUARANTINE = self::$ROOT . self::$PATH_QUARANTINE;
         self::$PATH_LOGS = self::$ROOT . self::$PATH_LOGS;
@@ -808,7 +808,7 @@ private function scan($iterator)
                             }
                         } elseif (in_array($confirmation, array('2'))) {
                             // Move to quarantine
-                            $quarantine = self::$PATH_QUARANTINE . str_replace(realpath(__DIR__), '', $_FILE_PATH);
+                            $quarantine = self::$PATH_QUARANTINE . str_replace(realpath(self::currentDirectory()), '', $_FILE_PATH);
 
                             if (!is_dir(dirname($quarantine))) {
                                 if (!mkdir($concurrentDirectory = dirname($quarantine), 0755, true) && !is_dir($concurrentDirectory)) {
@@ -1073,4 +1073,14 @@ private function convertToBytes($from)
 
         return $number * pow(1024, $pow);
     }
+
+    /**
+     * Return real current path.
+     *
+     * @return string|string[]|null
+     */
+    public static function currentDirectory()
+    {
+        return preg_replace('/^phar:\/\//i', '', __DIR__);
+    }
 }
diff --git a/src/Argument.php b/src/Argument.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

diff --git a/src/Argv.php b/src/Argv.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

diff --git a/src/CSV.php b/src/CSV.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

diff --git a/src/Console.php b/src/Console.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner
@@ -496,7 +496,7 @@ public static function helplist($type = null)
     public static function helper()
     {
         self::displayTitle('Help', 'black', 'cyan');
-        $dir = __DIR__;
+        $dir = Application::currentDirectory();
         $help = <<<EOD
 
 Arguments:

diff --git a/src/Definitions.php b/src/Definitions.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

diff --git a/src/Deobfuscator.php b/src/Deobfuscator.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

diff --git a/src/Flag.php b/src/Flag.php
@@ -4,7 +4,7 @@
  * PHP Antimalware Scanner.
  *
  * @author Marco Cesarato <[email protected]>
- * @copyright Copyright (c) 2019
+ * @copyright Copyright (c) 2020
  * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
  *
  * @see https://github.com/marcocesarato/PHP-Antimalware-Scanner

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) {