Permalink
Browse files

Merge pull request #18 from meven/master

YUICompressor should alert when java executable is not found or went wrong (issue #17)
  • Loading branch information...
2 parents 945c2b4 + b95ce11 commit 65078366deb7a921bf9adac3df01e84aa38d62c8 @mrclay mrclay committed Jan 20, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 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.');
}

0 comments on commit 6507836

Please sign in to comment.