Use System PHP library for the which command

horde · Nov 5, 2013 · 3a71af8 · 3a71af8
1 parent 33db5ab
commit 3a71af8
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/horde/lib/Test.php b/horde/lib/Test.php
@@ -700,15 +700,10 @@ protected function _checkGcProbability()
      */
     public function requiredFileCheck()
     {
-        $output = '';
-
-        $php = trim(system('which php'));
-        if (!$php || !file_exists($php)) {
-            $output = '<p style="color:orange">Cannot find PHP command-line binary on your system. Syntax checking of configuration files is disabled.</p>';
-            $php = null;
-        } else {
-            $output = '';
-        }
+        $php = System::which('php', null);
+        $output = is_null($php)
+            ? '<p style="color:orange">Cannot find PHP command-line binary on your system. Syntax checking of configuration files is disabled.</p>'
+            : '';
 
         ksort($this->_fileList);