From 62752afc1e51f53a1f6f59b94233f7ff8e9db9c1 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 11 Apr 2020 12:33:42 +0200 Subject: [PATCH] [Phing] Simplified os family condition (#1308) --- classes/phing/Phing.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/classes/phing/Phing.php b/classes/phing/Phing.php index 293b7c98fc..a7e574be54 100644 --- a/classes/phing/Phing.php +++ b/classes/phing/Phing.php @@ -1573,27 +1573,19 @@ private static function setSystemConstants() // used by Fileself::getFileSystem to instantiate the correct // abstraction layer - switch (strtoupper(PHP_OS)) { - case 'WINNT': - case 'WIN32': - self::setProperty('host.fstype', 'WINDOWS'); - break; - default: - self::setProperty('host.fstype', 'UNIX'); - break; + if (PHP_OS_FAMILY === 'Windows') { + self::setProperty('host.fstype', 'WINDOWS'); + self::setProperty('user.home', getenv('HOMEDRIVE') . getenv('HOMEPATH')); + } else { + self::setProperty('host.fstype', 'UNIX'); + self::setProperty('user.home', getenv('HOME')); } - self::setProperty(self::PHP_INTERPRETER, PHP_BINARY); self::setProperty('file.separator', FileUtils::$separator); self::setProperty('line.separator', PHP_EOL); self::setProperty('path.separator', FileUtils::$pathSeparator); self::setProperty(self::PHP_VERSION, PHP_VERSION); self::setProperty('php.tmpdir', sys_get_temp_dir()); - if (stripos(PHP_OS, 'WIN') !== 0) { - self::setProperty('user.home', getenv('HOME')); - } else { - self::setProperty('user.home', getenv('HOMEDRIVE') . getenv('HOMEPATH')); - } self::setProperty('application.startdir', getcwd()); self::setProperty('phing.startTime', gmdate('D, d M Y H:i:s', time()) . ' GMT');