Merge pull request #5 from lifesign/hotfix/windows_check

fix windows environment check not work on mac
slince · Jul 10, 2017 · d56fb9c · d56fb9c
2 parents 7f4eca8 + 812336b
commit d56fb9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ConfigPath.php b/src/ConfigPath.php
@@ -43,7 +43,7 @@ public static function getHomeConfigDir()
      */
     public static function isWindows()
     {
-        return stripos(PHP_OS, 'win') !== false;
+        return DIRECTORY_SEPARATOR == '\\';
     }
 
     /**
@@ -63,4 +63,4 @@ public static function getUserConfigFile()
     {
         return static::getHomeConfigDir() . '/crm.json';
     }
-}
+}
diff --git a/tests/ConfigPathTest.php b/tests/ConfigPathTest.php
@@ -8,11 +8,11 @@ class ConfigPathTest extends TestCase
 {
     public function testHomeConfigDir()
     {
-        $this->assertTrue((boolean)preg_match('/win/i', PHP_OS) === ConfigPath::isWindows());
+        $this->assertTrue((boolean)(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') === ConfigPath::isWindows());
     }
 
     public function testDefaultConfigFile()
     {
         $this->assertFileExists(ConfigPath::getDefaultConfigFile());
     }
-}
+}