@import "/min/?g=css2";<
Need help? Check the wiki, +
Need help? Check the wiki, or post to the discussion list.
Powered by Minify
@@ -239,8 +239,8 @@ $server->serve($controller, array( 'lastModifiedTime' => max( // regenerate cache if any of these change filemtime(__FILE__), - filemtime(dirname(__FILE__) . '/../config.php'), - filemtime(dirname(__FILE__) . '/../lib/Minify.php') + filemtime(__DIR__ . '/../config.php'), + filemtime(__DIR__ . '/../lib/Minify.php') ), 'minifyAll' => true, 'encodeOutput' => $encodeOutput, diff --git a/min/builder/jquery-1.6.3.min.js b/builder/jquery-1.6.3.min.js similarity index 100% rename from min/builder/jquery-1.6.3.min.js rename to builder/jquery-1.6.3.min.js diff --git a/min/builder/ocCheck.php b/builder/ocCheck.php similarity index 88% rename from min/builder/ocCheck.php rename to builder/ocCheck.php index 3c4f7c9..ff991e4 100644 --- a/min/builder/ocCheck.php +++ b/builder/ocCheck.php @@ -5,12 +5,12 @@ * @package Minify */ -require __DIR__ . '/../../bootstrap.php'; +require __DIR__ . '/../bootstrap.php'; $_oc = ini_get('zlib.output_compression'); // allow access only if builder is enabled -require dirname(__FILE__) . '/../config.php'; +require __DIR__ . '/../config.php'; if (! $min_enableBuilder) { header('Location: /'); exit; diff --git a/min/builder/rewriteTest.js b/builder/rewriteTest.js similarity index 100% rename from min/builder/rewriteTest.js rename to builder/rewriteTest.js diff --git a/min/builder/test.php b/builder/test.php similarity index 96% rename from min/builder/test.php rename to builder/test.php index 7f3e04b..88e8da0 100644 --- a/min/builder/test.php +++ b/builder/test.php @@ -6,7 +6,7 @@ exit; $_oc = ini_get('zlib.output_compression'); // allow access only if builder is enabled -require dirname(__FILE__) . '/../config.php'; +require __DIR__ . '/../config.php'; if (! $min_enableBuilder) { exit; } diff --git a/composer.json b/composer.json index a9e14fe..7c2919e 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "wiki": "https://github.com/mrclay/minify/blob/master/docs" }, "autoload": { - "classmap": ["min/lib/"] + "classmap": ["lib/"] }, "require": { "ext-pcre": "*", diff --git a/composer.lock b/composer.lock index 67ec0f6..30e3d54 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "523e463e2f705e3389708dffaeeda859", + "hash": "de48bc346ef046cc11ddc45358b1887b", "packages": [ { "name": "firephp/firephp-core", diff --git a/min/config-test.php b/config-test.php similarity index 100% rename from min/config-test.php rename to config-test.php diff --git a/min/config.php b/config.php similarity index 98% rename from min/config.php rename to config.php index f584437..dfe13f2 100644 --- a/min/config.php +++ b/config.php @@ -10,7 +10,7 @@ /** * Allow use of the Minify URI Builder app. Only set this to true while you need it. */ -$min_enableBuilder = false; +$min_enableBuilder = true; /** @@ -78,7 +78,7 @@ $min_allowDebugFlag = false; * second line. The third line might work on some Apache servers. */ $min_documentRoot = ''; -//$min_documentRoot = dirname(dirname(dirname(__FILE__))); +//$min_documentRoot = dirname(dirname(__DIR__)); //$min_documentRoot = substr(__FILE__, 0, -15); //$min_documentRoot = $_SERVER['SUBDOMAIN_DOCUMENT_ROOT']; diff --git a/min/groupsConfig.php b/groupsConfig.php similarity index 100% rename from min/groupsConfig.php rename to groupsConfig.php diff --git a/min/index.php b/index.php similarity index 92% rename from min/index.php rename to index.php index 1d99d33..c3628ae 100644 --- a/min/index.php +++ b/index.php @@ -7,15 +7,13 @@ * @package Minify */ -require __DIR__ . '/../bootstrap.php'; - -define('MINIFY_MIN_DIR', dirname(__FILE__)); +require __DIR__ . '/bootstrap.php'; // set config path defaults $min_configPaths = array( - 'base' => MINIFY_MIN_DIR . '/config.php', - 'test' => MINIFY_MIN_DIR . '/config-test.php', - 'groups' => MINIFY_MIN_DIR . '/groupsConfig.php', + 'base' => __DIR__ . '/config.php', + 'test' => __DIR__ . '/config-test.php', + 'groups' => __DIR__ . '/groupsConfig.php', ); // check for custom config paths diff --git a/min/lib/DooDigestAuth.php b/lib/DooDigestAuth.php similarity index 100% rename from min/lib/DooDigestAuth.php rename to lib/DooDigestAuth.php diff --git a/min/lib/HTTP/ConditionalGet.php b/lib/HTTP/ConditionalGet.php similarity index 100% rename from min/lib/HTTP/ConditionalGet.php rename to lib/HTTP/ConditionalGet.php diff --git a/min/lib/HTTP/Encoder.php b/lib/HTTP/Encoder.php similarity index 100% rename from min/lib/HTTP/Encoder.php rename to lib/HTTP/Encoder.php diff --git a/min/lib/JSMinPlus.php b/lib/JSMinPlus.php similarity index 100% rename from min/lib/JSMinPlus.php rename to lib/JSMinPlus.php diff --git a/min/lib/Minify.php b/lib/Minify.php similarity index 99% rename from min/lib/Minify.php rename to lib/Minify.php index 823f22c..1ba176a 100644 --- a/min/lib/Minify.php +++ b/lib/Minify.php @@ -84,7 +84,7 @@ class Minify { 'encodeLevel' => 9, 'minifiers' => array( - Minify::TYPE_JS => array('JSMin', 'minify'), + Minify::TYPE_JS => array('JSMin\\JSMin', 'minify'), Minify::TYPE_CSS => array('Minify_CSS', 'minify'), Minify::TYPE_HTML => array('Minify_HTML', 'minify'), ), diff --git a/min/lib/Minify/Build.php b/lib/Minify/Build.php similarity index 100% rename from min/lib/Minify/Build.php rename to lib/Minify/Build.php diff --git a/min/lib/Minify/CSS.php b/lib/Minify/CSS.php similarity index 100% rename from min/lib/Minify/CSS.php rename to lib/Minify/CSS.php diff --git a/min/lib/Minify/CSS/Compressor.php b/lib/Minify/CSS/Compressor.php similarity index 100% rename from min/lib/Minify/CSS/Compressor.php rename to lib/Minify/CSS/Compressor.php diff --git a/min/lib/Minify/CSS/UriRewriter.php b/lib/Minify/CSS/UriRewriter.php similarity index 100% rename from min/lib/Minify/CSS/UriRewriter.php rename to lib/Minify/CSS/UriRewriter.php diff --git a/min/lib/Minify/CSSmin.php b/lib/Minify/CSSmin.php similarity index 100% rename from min/lib/Minify/CSSmin.php rename to lib/Minify/CSSmin.php diff --git a/min/lib/Minify/Cache/APC.php b/lib/Minify/Cache/APC.php similarity index 100% rename from min/lib/Minify/Cache/APC.php rename to lib/Minify/Cache/APC.php diff --git a/min/lib/Minify/Cache/File.php b/lib/Minify/Cache/File.php similarity index 100% rename from min/lib/Minify/Cache/File.php rename to lib/Minify/Cache/File.php diff --git a/min/lib/Minify/Cache/Memcache.php b/lib/Minify/Cache/Memcache.php similarity index 100% rename from min/lib/Minify/Cache/Memcache.php rename to lib/Minify/Cache/Memcache.php diff --git a/min/lib/Minify/Cache/Null.php b/lib/Minify/Cache/Null.php similarity index 100% rename from min/lib/Minify/Cache/Null.php rename to lib/Minify/Cache/Null.php diff --git a/min/lib/Minify/Cache/WinCache.php b/lib/Minify/Cache/WinCache.php similarity index 100% rename from min/lib/Minify/Cache/WinCache.php rename to lib/Minify/Cache/WinCache.php diff --git a/min/lib/Minify/Cache/XCache.php b/lib/Minify/Cache/XCache.php similarity index 100% rename from min/lib/Minify/Cache/XCache.php rename to lib/Minify/Cache/XCache.php diff --git a/min/lib/Minify/Cache/ZendPlatform.php b/lib/Minify/Cache/ZendPlatform.php similarity index 100% rename from min/lib/Minify/Cache/ZendPlatform.php rename to lib/Minify/Cache/ZendPlatform.php diff --git a/min/lib/Minify/CacheInterface.php b/lib/Minify/CacheInterface.php similarity index 100% rename from min/lib/Minify/CacheInterface.php rename to lib/Minify/CacheInterface.php diff --git a/min/lib/Minify/ClosureCompiler.php b/lib/Minify/ClosureCompiler.php similarity index 100% rename from min/lib/Minify/ClosureCompiler.php rename to lib/Minify/ClosureCompiler.php diff --git a/min/lib/Minify/CommentPreserver.php b/lib/Minify/CommentPreserver.php similarity index 100% rename from min/lib/Minify/CommentPreserver.php rename to lib/Minify/CommentPreserver.php diff --git a/min/lib/Minify/Controller/Base.php b/lib/Minify/Controller/Base.php similarity index 100% rename from min/lib/Minify/Controller/Base.php rename to lib/Minify/Controller/Base.php diff --git a/min/lib/Minify/Controller/Files.php b/lib/Minify/Controller/Files.php similarity index 100% rename from min/lib/Minify/Controller/Files.php rename to lib/Minify/Controller/Files.php diff --git a/min/lib/Minify/Controller/Groups.php b/lib/Minify/Controller/Groups.php similarity index 100% rename from min/lib/Minify/Controller/Groups.php rename to lib/Minify/Controller/Groups.php diff --git a/min/lib/Minify/Controller/MinApp.php b/lib/Minify/Controller/MinApp.php similarity index 100% rename from min/lib/Minify/Controller/MinApp.php rename to lib/Minify/Controller/MinApp.php diff --git a/min/lib/Minify/Controller/Page.php b/lib/Minify/Controller/Page.php similarity index 97% rename from min/lib/Minify/Controller/Page.php rename to lib/Minify/Controller/Page.php index 96cd552..b17031f 100644 --- a/min/lib/Minify/Controller/Page.php +++ b/lib/Minify/Controller/Page.php @@ -53,7 +53,7 @@ class Minify_Controller_Page extends Minify_Controller_Base { // this will be the 2nd argument passed to Minify_HTML::minify() $sourceSpec['minifyOptions'] = array( 'cssMinifier' => array('Minify_CSS', 'minify') - ,'jsMinifier' => array('JSMin', 'minify') + ,'jsMinifier' => array('JSMin\\JSMin', 'minify') ); unset($options['minifyAll']); } diff --git a/min/lib/Minify/ControllerInterface.php b/lib/Minify/ControllerInterface.php similarity index 100% rename from min/lib/Minify/ControllerInterface.php rename to lib/Minify/ControllerInterface.php diff --git a/min/lib/Minify/DebugDetector.php b/lib/Minify/DebugDetector.php similarity index 100% rename from min/lib/Minify/DebugDetector.php rename to lib/Minify/DebugDetector.php diff --git a/min/lib/Minify/Env.php b/lib/Minify/Env.php similarity index 100% rename from min/lib/Minify/Env.php rename to lib/Minify/Env.php diff --git a/min/lib/Minify/HTML.php b/lib/Minify/HTML.php similarity index 100% rename from min/lib/Minify/HTML.php rename to lib/Minify/HTML.php diff --git a/min/lib/Minify/HTML/Helper.php b/lib/Minify/HTML/Helper.php similarity index 99% rename from min/lib/Minify/HTML/Helper.php rename to lib/Minify/HTML/Helper.php index 7ed8cba..88536e5 100644 --- a/min/lib/Minify/HTML/Helper.php +++ b/lib/Minify/HTML/Helper.php @@ -115,7 +115,7 @@ class Minify_HTML_Helper { $this->_groupKey = $key; if ($checkLastModified) { if (! $this->groupsConfigFile) { - $this->groupsConfigFile = dirname(dirname(dirname(dirname(__FILE__)))) . '/groupsConfig.php'; + $this->groupsConfigFile = dirname(dirname(dirname(__DIR__))) . '/groupsConfig.php'; } if (is_file($this->groupsConfigFile)) { $gc = (require $this->groupsConfigFile); diff --git a/min/lib/Minify/ImportProcessor.php b/lib/Minify/ImportProcessor.php similarity index 100% rename from min/lib/Minify/ImportProcessor.php rename to lib/Minify/ImportProcessor.php diff --git a/min/lib/Minify/JS/ClosureCompiler.php b/lib/Minify/JS/ClosureCompiler.php similarity index 99% rename from min/lib/Minify/JS/ClosureCompiler.php rename to lib/Minify/JS/ClosureCompiler.php index e067d7c..6683884 100644 --- a/min/lib/Minify/JS/ClosureCompiler.php +++ b/lib/Minify/JS/ClosureCompiler.php @@ -68,7 +68,7 @@ class Minify_JS_ClosureCompiler { /** * @var callable Function to minify JS if service fails. Default is JSMin */ - protected $fallbackMinifier = array('JSMin', 'minify'); + protected $fallbackMinifier = array('JSMin\\JSMin', 'minify'); /** * Minify JavaScript code via HTTP request to a Closure Compiler API diff --git a/min/lib/Minify/LessCssSource.php b/lib/Minify/LessCssSource.php similarity index 100% rename from min/lib/Minify/LessCssSource.php rename to lib/Minify/LessCssSource.php diff --git a/min/lib/Minify/Lines.php b/lib/Minify/Lines.php similarity index 100% rename from min/lib/Minify/Lines.php rename to lib/Minify/Lines.php diff --git a/min/lib/Minify/Loader.php b/lib/Minify/Loader.php similarity index 92% rename from min/lib/Minify/Loader.php rename to lib/Minify/Loader.php index 591528f..f8ee750 100644 --- a/min/lib/Minify/Loader.php +++ b/lib/Minify/Loader.php @@ -13,7 +13,7 @@ class Minify_Loader { public function loadClass($class) { - $file = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR; + $file = dirname(__DIR__) . DIRECTORY_SEPARATOR; $file .= strtr($class, "\\_", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR) . '.php'; if (is_readable($file)) { require $file; diff --git a/min/lib/Minify/Logger.php b/lib/Minify/Logger.php similarity index 100% rename from min/lib/Minify/Logger.php rename to lib/Minify/Logger.php diff --git a/min/lib/Minify/Packer.php b/lib/Minify/Packer.php similarity index 100% rename from min/lib/Minify/Packer.php rename to lib/Minify/Packer.php diff --git a/min/lib/Minify/ServeConfiguration.php b/lib/Minify/ServeConfiguration.php similarity index 100% rename from min/lib/Minify/ServeConfiguration.php rename to lib/Minify/ServeConfiguration.php diff --git a/min/lib/Minify/Source.php b/lib/Minify/Source.php similarity index 100% rename from min/lib/Minify/Source.php rename to lib/Minify/Source.php diff --git a/min/lib/Minify/Source/Factory.php b/lib/Minify/Source/Factory.php similarity index 100% rename from min/lib/Minify/Source/Factory.php rename to lib/Minify/Source/Factory.php diff --git a/min/lib/Minify/Source/FactoryException.php b/lib/Minify/Source/FactoryException.php similarity index 100% rename from min/lib/Minify/Source/FactoryException.php rename to lib/Minify/Source/FactoryException.php diff --git a/min/lib/Minify/SourceInterface.php b/lib/Minify/SourceInterface.php similarity index 100% rename from min/lib/Minify/SourceInterface.php rename to lib/Minify/SourceInterface.php diff --git a/min/lib/Minify/SourceSet.php b/lib/Minify/SourceSet.php similarity index 100% rename from min/lib/Minify/SourceSet.php rename to lib/Minify/SourceSet.php diff --git a/min/lib/Minify/YUI/CssCompressor.java b/lib/Minify/YUI/CssCompressor.java similarity index 100% rename from min/lib/Minify/YUI/CssCompressor.java rename to lib/Minify/YUI/CssCompressor.java diff --git a/min/lib/Minify/YUI/CssCompressor.php b/lib/Minify/YUI/CssCompressor.php similarity index 100% rename from min/lib/Minify/YUI/CssCompressor.php rename to lib/Minify/YUI/CssCompressor.php diff --git a/min/lib/Minify/YUICompressor.php b/lib/Minify/YUICompressor.php similarity index 100% rename from min/lib/Minify/YUICompressor.php rename to lib/Minify/YUICompressor.php diff --git a/min/lib/MrClay/Cli.php b/lib/MrClay/Cli.php similarity index 100% rename from min/lib/MrClay/Cli.php rename to lib/MrClay/Cli.php diff --git a/min/lib/MrClay/Cli/Arg.php b/lib/MrClay/Cli/Arg.php similarity index 100% rename from min/lib/MrClay/Cli/Arg.php rename to lib/MrClay/Cli/Arg.php diff --git a/min_extras/cli/minify.php b/min_extras/cli/minify.php index bad0b48..3d23cf5 100755 --- a/min_extras/cli/minify.php +++ b/min_extras/cli/minify.php @@ -1,6 +1,8 @@ #!/usr/bin/env php array('Minify_CSS', 'minify') - ,'jsMinifier' => array('JSMin', 'minify') + ,'jsMinifier' => array('JSMin\\JSMin', 'minify') ); } $func = array($_POST['method'], 'minify'); diff --git a/min_extras/tools/minifyUrl.php b/min_extras/tools/minifyUrl.php index 6305f23..fb78c92 100644 --- a/min_extras/tools/minifyUrl.php +++ b/min_extras/tools/minifyUrl.php @@ -96,7 +96,7 @@ if (isset($_POST['url'])) { if ($type['minify'] === 'text/html') { if (isset($_POST['minJs'])) { - $sourceSpec['minifyOptions']['jsMinifier'] = array('JSMin', 'minify'); + $sourceSpec['minifyOptions']['jsMinifier'] = array('JSMin\\JSMin', 'minify'); } if (isset($_POST['minCss'])) { $sourceSpec['minifyOptions']['cssMinifier'] = array('Minify_CSS', 'minify'); diff --git a/min_extras/tools/testRewriteUri.php b/min_extras/tools/testRewriteUri.php index 28ccc11..2774b68 100644 --- a/min_extras/tools/testRewriteUri.php +++ b/min_extras/tools/testRewriteUri.php @@ -26,7 +26,7 @@ if (! empty($_POST)) { } } -$defaultCurrentDir = dirname(__FILE__); +$defaultCurrentDir = __DIR__; $defaultDocRoot = realpath($_SERVER['DOCUMENT_ROOT']); $defaultSymLink = '//symlinkPath'; $defaultSymTarget = ($defaultCurrentDir[0] === '/') ? '/tmp' : 'C:\\WINDOWS\\Temp'; diff --git a/min_unit_tests/HTTP_ConditionalGet/index.php b/min_unit_tests/HTTP_ConditionalGet/index.php index e604ebd..e40fd11 100644 --- a/min_unit_tests/HTTP_ConditionalGet/index.php +++ b/min_unit_tests/HTTP_ConditionalGet/index.php @@ -28,7 +28,7 @@ property is false, you echo the content. require '_include.php'; -echo send_slowly(get_content(array( +send_slowly(get_content(array( 'title' => $title ,'explain' => $explain ))); diff --git a/min_unit_tests/HTTP_Encoder/index.php b/min_unit_tests/HTTP_Encoder/index.php index 50553b0..3566548 100644 --- a/min_unit_tests/HTTP_Encoder/index.php +++ b/min_unit_tests/HTTP_Encoder/index.php @@ -33,7 +33,7 @@ p span {padding:0 .5em;} ob_end_clean(); } elseif ($_GET['test'] == '1') { - $content = file_get_contents(dirname(__FILE__) . '/green.png'); + $content = file_get_contents(__DIR__ . '/green.png'); $type = 'image/png'; } elseif ($_GET['test'] == '2') { diff --git a/min_unit_tests/_inc.php b/min_unit_tests/_inc.php index 895554b..9013f57 100644 --- a/min_unit_tests/_inc.php +++ b/min_unit_tests/_inc.php @@ -1,7 +1,9 @@ $_SERVER, + )); + $sourceFactory = new Minify_Source_Factory($env, array(), new Minify_Cache_Null()); + $controller = new Minify_Controller_Files($env, $sourceFactory); + + $output = $minify->serve($controller, array( + 'files' => $thisDir . '/_test_files/css/styles.css' // controller casts to array + ,'quiet' => true + ,'lastModifiedTime' => $lastModified + ,'encodeOutput' => false + )); + $expected = array ( 'success' => true ,'statusCode' => 304 @@ -32,12 +46,7 @@ function test_Minify() '_responseCode' => 'HTTP/1.0 304 Not Modified', ) ); - $output = Minify::serve('Files', array( - 'files' => $thisDir . '/_test_files/css/styles.css' // controller casts to array - ,'quiet' => true - ,'lastModifiedTime' => $lastModified - ,'encodeOutput' => false - )); + $passed = assertTrue($expected === $output, 'Minify : 304 response'); if ($thisFileActive) { echo "\nOutput: " .var_export($output, 1). "\n\n"; @@ -48,8 +57,7 @@ function test_Minify() assertTrue( ! class_exists('Minify_CSS', false) - && ! class_exists('Minify_Cache_File', false) - ,'Minify : cache, and minifier classes aren\'t loaded for 304s' + ,'Minify : minifier classes aren\'t loaded for 304s' ); // Test JS and Expires @@ -74,9 +82,16 @@ function test_Minify() 'Content-Type' => 'application/x-javascript; charset=utf-8', ) ); + unset($_SERVER['HTTP_IF_NONE_MATCH']); unset($_SERVER['HTTP_IF_MODIFIED_SINCE']); - $output = Minify::serve('Files', array( + + $env = new Minify_Env(array( + 'server' => $_SERVER, + )); + $sourceFactory = new Minify_Source_Factory($env, array(), new Minify_Cache_Null()); + $controller = new Minify_Controller_Files($env, $sourceFactory); + $output = $minify->serve($controller, array( 'files' => array( $minifyTestPath . '/email.js' ,$minifyTestPath . '/QueryString.js' @@ -95,10 +110,8 @@ function test_Minify() } // test for Issue 73 - Minify::setCache(null); - $expected = ";function h(){}"; - $output = Minify::serve('Files', array( + $output = $minify->serve($controller, array( 'files' => array( $minifyTestPath . '/issue73_1.js' ,$minifyTestPath . '/issue73_2.js' @@ -118,7 +131,7 @@ function test_Minify() // test for Issue 89 $expected = file_get_contents($minifyTestPath . '/issue89_out.min.css'); - $output = Minify::serve('Files', array( + $output = $minify->serve($controller, array( 'files' => array( $minifyTestPath . '/issue89_1.css' ,$minifyTestPath . '/issue89_2.css' @@ -136,7 +149,7 @@ function test_Minify() } } - $output = Minify::serve('Files', array( + $output = $minify->serve($controller, array( 'files' => array( $minifyTestPath . '/issue89_1.css' ,$minifyTestPath . '/issue89_2.css' @@ -145,7 +158,10 @@ function test_Minify() ,'encodeOutput' => false )); $output = $output['content']; - $passed = assertTrue(0 === strpos($output, Minify::$importWarning), 'Minify : Issue 89 : detect invalid imports'); + + $defaultOptions = $minify->getDefaultOptions(); + + $passed = assertTrue(0 === strpos($output, $defaultOptions['importWarning']), 'Minify : Issue 89 : detect invalid imports'); if ($thisFileActive) { if (! $passed) { echo "\n---Output : " .var_export($output, 1). "\n"; @@ -153,7 +169,7 @@ function test_Minify() } } - $output = Minify::serve('Files', array( + $output = $minify->serve($controller, array( 'files' => array( $minifyTestPath . '/issue89_1.css' ) @@ -161,7 +177,7 @@ function test_Minify() ,'encodeOutput' => false )); $output = $output['content']; - $passed = assertTrue(false === strpos($output, Minify::$importWarning), 'Minify : Issue 89 : don\'t warn about valid imports'); + $passed = assertTrue(false === strpos($output, $defaultOptions['importWarning']), 'Minify : Issue 89 : don\'t warn about valid imports'); if ($thisFileActive) { if (! $passed) { echo "\n---Output : " .var_export($output, 1). "\n"; @@ -171,8 +187,8 @@ function test_Minify() // Test Issue 132 if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { - $output = Minify::serve('Files', array( - 'files' => array(dirname(__FILE__) . '/_test_files/js/issue132.js') + $output = $minify->serve($controller, array( + 'files' => array(__DIR__ . '/_test_files/js/issue132.js') ,'quiet' => true ,'encodeOutput' => false )); @@ -199,7 +215,14 @@ function test_Minify() 'Content-Type' => 'text/css; charset=utf-8', ) ); - $output = Minify::serve('Files', array( + + $env = new Minify_Env(array( + 'server' => $_SERVER, + )); + $sourceFactory = new Minify_Source_Factory($env, array(), new Minify_Cache_Null()); + $controller = new Minify_Controller_Files($env, $sourceFactory); + + $output = $minify->serve($controller, array( 'files' => array( $thisDir . '/_test_files/css/styles.css' ,$thisDir . '/_test_files/css/comments.css' diff --git a/min_unit_tests/test_Minify_CSS.php b/min_unit_tests/test_Minify_CSS.php index 804c523..8ec6501 100644 --- a/min_unit_tests/test_Minify_CSS.php +++ b/min_unit_tests/test_Minify_CSS.php @@ -5,7 +5,7 @@ function test_CSS() { global $thisDir; - $cssPath = dirname(__FILE__) . '/_test_files/css'; + $cssPath = __DIR__ . '/_test_files/css'; // build test file list $d = dir($cssPath); diff --git a/min_unit_tests/test_Minify_HTML.php b/min_unit_tests/test_Minify_HTML.php index 9338f96..80be87a 100644 --- a/min_unit_tests/test_Minify_HTML.php +++ b/min_unit_tests/test_Minify_HTML.php @@ -11,7 +11,7 @@ function test_HTML() $time = microtime(true); $minOutput = Minify_HTML::minify($src, array( 'cssMinifier' => array('Minify_CSS', 'minify') - ,'jsMinifier' => array('JSMin', 'minify') + ,'jsMinifier' => array('JSMin\\JSMin', 'minify') )); $time = microtime(true) - $time; @@ -34,7 +34,7 @@ function test_HTML() $time = microtime(true); $minOutput = Minify_HTML::minify($src, array( 'cssMinifier' => array('Minify_CSS', 'minify') - ,'jsMinifier' => array('JSMin', 'minify') + ,'jsMinifier' => array('JSMin\\JSMin', 'minify') )); $time = microtime(true) - $time; diff --git a/min_unit_tests/test_Minify_HTML_Helper.php b/min_unit_tests/test_Minify_HTML_Helper.php index a0223a3..47ea1ac 100644 --- a/min_unit_tests/test_Minify_HTML_Helper.php +++ b/min_unit_tests/test_Minify_HTML_Helper.php @@ -35,7 +35,7 @@ function test_Minify_HTML_Helper() )); $passed = assertTrue($actual === $expected, 'Minify_HTML_Helper : existing group'); - $utilsFile = dirname(dirname(__FILE__)) . '/min/utils.php'; + $utilsFile = dirname(__DIR__) . '/min/utils.php'; if (is_file($utilsFile)) { require_once $utilsFile; diff --git a/min_unit_tests/test_Minify_Lines.php b/min_unit_tests/test_Minify_Lines.php index 5d23c2d..be9fc93 100644 --- a/min_unit_tests/test_Minify_Lines.php +++ b/min_unit_tests/test_Minify_Lines.php @@ -8,9 +8,12 @@ function test_Lines() $exp = file_get_contents("{$thisDir}/_test_files/minify/lines_output.js"); - Minify::setCache(null); // no cache - - $ret = Minify::serve('Files', array( + $env = new Minify_Env(); + $sourceFactory = new Minify_Source_Factory($env, array(), new Minify_Cache_Null()); + $controller = new Minify_Controller_Files($env, $sourceFactory); + $minify = new Minify(new Minify_Cache_Null()); + + $ret = $minify->serve($controller, array( 'debug' => true ,'quiet' => true ,'encodeOutput' => false diff --git a/min/quick-test.css b/quick-test.css similarity index 100% rename from min/quick-test.css rename to quick-test.css diff --git a/min/quick-test.js b/quick-test.js similarity index 100% rename from min/quick-test.js rename to quick-test.js diff --git a/min/quick-test.less b/quick-test.less similarity index 100% rename from min/quick-test.less rename to quick-test.less diff --git a/min/quick-testinc.less b/quick-testinc.less similarity index 100% rename from min/quick-testinc.less rename to quick-testinc.less diff --git a/min/server-info.php b/server-info.php similarity index 100% rename from min/server-info.php rename to server-info.php diff --git a/min/utils.php b/utils.php similarity index 92% rename from min/utils.php rename to utils.php index ac2dbe4..d3b8023 100644 --- a/min/utils.php +++ b/utils.php @@ -4,13 +4,13 @@ * * @warning These functions execute min/groupsConfig.php, sometimes multiple times. * You must make sure that functions are not redefined, and if your use custom sources, - * you must require_once dirname(__FILE__) . '/lib/Minify/Source.php' so that + * you must require_once __DIR__ . '/lib/Minify/Source.php' so that * class is available. * * @package Minify */ -require __DIR__ . '/../bootstrap.php'; +require __DIR__ . '/bootstrap.php'; /* * Get an HTML-escaped Minify URI for a group or set of files. By default, URIs @@ -56,7 +56,7 @@ function Minify_mtime($keysAndFiles, $groupsConfigFile = null) { $gc = null; if (! $groupsConfigFile) { - $groupsConfigFile = dirname(__FILE__) . '/groupsConfig.php'; + $groupsConfigFile = __DIR__ . '/groupsConfig.php'; } $sources = array(); foreach ($keysAndFiles as $keyOrFile) {