mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-12 00:54:35 +02:00
Code Issues Releases Wiki Activity

Merge pull request #18 from meven/master

Browse Source 
YUICompressor should alert when java executable is not found or went wrong (issue #17)
This commit is contained in:
Steve Clay
2012-01-19 17:15:46 -08:00
parent 945c2b459f b95ce11d46
commit 65078366de
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
min/lib/Minify/YUICompressor.php
View File

@@ -90,8 +90,11 @@ class Minify_YUICompressor {
throw new Exception('Minify_YUICompressor : could not create temp file.'); throw new Exception('Minify_YUICompressor : could not create temp file.');
} }
file_put_contents($tmpFile, $content); file_put_contents($tmpFile, $content);
exec(self::_getCmd($options, $type, $tmpFile), $output); exec(self::_getCmd($options, $type, $tmpFile), $output, $result_code);
unlink($tmpFile); unlink($tmpFile);
if ($result_code != 0) {
throw new Exception('Minify_YUICompressor : YUI compressor execution failed.');
}
return implode("\n", $output); return implode("\n", $output);
} }
@@ -131,6 +134,9 @@ class Minify_YUICompressor {
if (! is_file(self::$jarFile)) { if (! is_file(self::$jarFile)) {
throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not a valid file.'); 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)) { if (! is_dir(self::$tempDir)) {
throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.'); throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.');
} }