use DIRECTORY_SEPARATOR & PATH_SEPARATOR

bushbaby · Jan 30, 2015 · bef1242 · bef1242
1 parent ddb38fb
commit bef1242
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Service/Phing.php b/src/Service/Phing.php
@@ -139,13 +139,14 @@ protected function getEnv()
 
         $env['PHP_COMMAND']   = $this->options->getPhpBin();
         $env['PHING_HOME']    = $this->options->getPhingPath();
-        $env['PHP_CLASSPATH'] = sprintf('%s\classes', $this->options->getPhingPath());
-
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $env['PATH']          = sprintf('%s;%s\bin', $_SERVER['PATH'], $this->options->getPhingPath());
-        } else {
-            $env['PATH']          = sprintf('%s:%s\bin', $_SERVER['PATH'], $this->options->getPhingPath());
-        }
+        $env['PHP_CLASSPATH'] = sprintf('%s%sclasses', $this->options->getPhingPath(), DIRECTORY_SEPARATOR);
+        $env['PATH']          = sprintf(
+            '%s%s%s%sbin',
+            $_SERVER['PATH'],
+            PATH_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            $this->options->getPhingPath()
+        );
 
         return $env;
     }