Improved Windows detect

phalcon · May 7, 2015 · c9bfb39 · c9bfb39
1 parent 6469a6e
commit c9bfb39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/Phalcon/Builder/Component.php b/scripts/Phalcon/Builder/Component.php
@@ -105,7 +105,7 @@ protected function _getConfig($path)
      */
     public function isAbsolutePath($path)
     {
-        if (PHP_OS == "WINNT") {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             if (preg_match('/^[A-Z]:\\\\/', $path)) {
                 return true;
             }

diff --git a/scripts/Phalcon/Web/Tools.php b/scripts/Phalcon/Web/Tools.php
@@ -364,7 +364,7 @@ public static function install($path)
         $path = rtrim(realpath($path), '/') . '/';
         $tools = realpath(__DIR__ . '/../../../');
 
-        if (PHP_OS == 'WINNT') {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             $path = str_replace("\\", '/', $path);
             $tools = str_replace("\\", '/', $tools);
         }
@@ -397,7 +397,7 @@ public static function install($path)
     public static function uninstall($path)
     {
         $path = realpath($path) . '/';
-        if (PHP_OS == 'WINNT') {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             $path = str_replace("\\", '/', $path);
         }
 

diff --git a/scripts/Phalcon/Web/Tools/controllers/ControllerBase.php b/scripts/Phalcon/Web/Tools/controllers/ControllerBase.php
@@ -151,7 +151,7 @@ private function checkToolsIp($ip)
      */
     public function isAbsolutePath($path)
     {
-        if (PHP_OS == "WINNT") {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             if (preg_match('/^[A-Z]:\\\\/', $path)) {
                 return true;
             }