Merge pull request mrclay#18 from meven/master

YUICompressor should alert when java executable is not found or went wrong (issue mrclay#17)
kara-ryli · Jan 20, 2012 · 6507836 · 6507836
2 parents 945c2b4 + b95ce11
commit 6507836
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/min/lib/Minify/YUICompressor.php b/min/lib/Minify/YUICompressor.php
@@ -90,8 +90,11 @@ private static function _minify($type, $content, $options)
             throw new Exception('Minify_YUICompressor : could not create temp file.');
         }
         file_put_contents($tmpFile, $content);
-        exec(self::_getCmd($options, $type, $tmpFile), $output);
+        exec(self::_getCmd($options, $type, $tmpFile), $output, $result_code);
         unlink($tmpFile);
+        if ($result_code != 0) {
+            throw new Exception('Minify_YUICompressor : YUI compressor execution failed.');
+        }
         return implode("\n", $output);
     }
 
@@ -131,6 +134,9 @@ private static function _prepare()
         if (! is_file(self::$jarFile)) {
             throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not a valid file.');
         }
+        if (! is_executable(self::$jarFile)) {
+            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not executable.');
+        }
         if (! is_dir(self::$tempDir)) {
             throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.');
         }