diff --git a/min/config.php b/min/config.php index da4eb0f..c9d631d 100644 --- a/min/config.php +++ b/min/config.php @@ -17,7 +17,7 @@ $minifyCachePath = 'c:\\xampp\\tmp'; /** * Manually set the path to Minify's lib folder */ -$minifyLibPath = '../lib'; +//$minifyLibPath = '../lib'; /** @@ -44,8 +44,4 @@ $minifyAllowBase = true; * * // = DOCUMENT_ROOT */ -$minifyAllowDirs = array( - '//js' - ,'//css' -); - +$minifyAllowDirs = array('//js', '//css'); diff --git a/lib/HTTP/ConditionalGet.php b/min/lib/HTTP/ConditionalGet.php similarity index 100% rename from lib/HTTP/ConditionalGet.php rename to min/lib/HTTP/ConditionalGet.php diff --git a/lib/HTTP/Encoder.php b/min/lib/HTTP/Encoder.php similarity index 100% rename from lib/HTTP/Encoder.php rename to min/lib/HTTP/Encoder.php diff --git a/lib/JSMin.php b/min/lib/JSMin.php similarity index 100% rename from lib/JSMin.php rename to min/lib/JSMin.php diff --git a/lib/Minify.php b/min/lib/Minify.php similarity index 100% rename from lib/Minify.php rename to min/lib/Minify.php diff --git a/lib/Minify/Build.php b/min/lib/Minify/Build.php similarity index 100% rename from lib/Minify/Build.php rename to min/lib/Minify/Build.php diff --git a/lib/Minify/CSS.php b/min/lib/Minify/CSS.php similarity index 100% rename from lib/Minify/CSS.php rename to min/lib/Minify/CSS.php diff --git a/lib/Minify/Cache/File.php b/min/lib/Minify/Cache/File.php similarity index 100% rename from lib/Minify/Cache/File.php rename to min/lib/Minify/Cache/File.php diff --git a/lib/Minify/Controller/Base.php b/min/lib/Minify/Controller/Base.php similarity index 100% rename from lib/Minify/Controller/Base.php rename to min/lib/Minify/Controller/Base.php diff --git a/lib/Minify/Controller/Files.php b/min/lib/Minify/Controller/Files.php similarity index 100% rename from lib/Minify/Controller/Files.php rename to min/lib/Minify/Controller/Files.php diff --git a/lib/Minify/Controller/Groups.php b/min/lib/Minify/Controller/Groups.php similarity index 100% rename from lib/Minify/Controller/Groups.php rename to min/lib/Minify/Controller/Groups.php diff --git a/lib/Minify/Controller/Page.php b/min/lib/Minify/Controller/Page.php similarity index 100% rename from lib/Minify/Controller/Page.php rename to min/lib/Minify/Controller/Page.php diff --git a/lib/Minify/Controller/Version1.php b/min/lib/Minify/Controller/Version1.php similarity index 100% rename from lib/Minify/Controller/Version1.php rename to min/lib/Minify/Controller/Version1.php diff --git a/lib/Minify/HTML.php b/min/lib/Minify/HTML.php similarity index 100% rename from lib/Minify/HTML.php rename to min/lib/Minify/HTML.php diff --git a/lib/Minify/Javascript.php b/min/lib/Minify/Javascript.php similarity index 100% rename from lib/Minify/Javascript.php rename to min/lib/Minify/Javascript.php diff --git a/lib/Minify/Lines.php b/min/lib/Minify/Lines.php similarity index 100% rename from lib/Minify/Lines.php rename to min/lib/Minify/Lines.php diff --git a/lib/Minify/Packer.php b/min/lib/Minify/Packer.php similarity index 100% rename from lib/Minify/Packer.php rename to min/lib/Minify/Packer.php diff --git a/lib/Minify/Source.php b/min/lib/Minify/Source.php similarity index 100% rename from lib/Minify/Source.php rename to min/lib/Minify/Source.php diff --git a/lib/Solar/Dir.php b/min/lib/Solar/Dir.php similarity index 100% rename from lib/Solar/Dir.php rename to min/lib/Solar/Dir.php diff --git a/web/ab_tests/results_summary.txt b/web/ab_tests/results_summary.txt index 59167be..e54cc51 100644 --- a/web/ab_tests/results_summary.txt +++ b/web/ab_tests/results_summary.txt @@ -1,33 +1,28 @@ Document Path: /_3rd_party/minify/web/ab_tests/ideal_php/before.php Document Length: 15993 bytes -Requests per second: 389.06 [#/sec] (mean) +Requests per second: 429.53 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/v1.0/minify.php?files=before.js Document Length: 54159 bytes - (Connect: 3, Length: 0, Exceptions: 0) -Requests per second: 271.19 [#/sec] (mean) +Requests per second: 299.07 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/minify/test_Files.php Document Length: 15993 bytes - (Connect: 0, Length: 1, Exceptions: 0) -Requests per second: 261.22 [#/sec] (mean) +Requests per second: 243.81 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/minify/test_Groups.php/test Document Length: 15993 bytes - (Connect: 3, Length: 0, Exceptions: 0) -Requests per second: 234.86 [#/sec] (mean) +Requests per second: 225.35 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/minify/test_Version1.php?files=before.js Document Length: 15993 bytes - (Connect: 0, Length: 1, Exceptions: 0) -Requests per second: 251.97 [#/sec] (mean) +Requests per second: 234.43 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/mod_deflate/before.js Document Length: 16053 bytes - (Connect: 3, Length: 0, Exceptions: 0) -Requests per second: 182.08 [#/sec] (mean) +Requests per second: 189.07 [#/sec] (mean) -------------------------------------------------------------------------------- Document Path: /_3rd_party/minify/web/ab_tests/type-map/before.js.var Document Length: 15993 bytes -Requests per second: 501.96 [#/sec] (mean) +Requests per second: 503.94 [#/sec] (mean) -------------------------------------------------------------------------------- diff --git a/web/ab_tests/v1.0/minify.php b/web/ab_tests/v1.0/minify.php index f5ca8dd..096f272 100644 --- a/web/ab_tests/v1.0/minify.php +++ b/web/ab_tests/v1.0/minify.php @@ -202,7 +202,7 @@ class Minify { * @see minifyCSS() */ protected static function minifyJS($js) { - require_once dirname(__FILE__).'/../../../lib/JSMin.php'; + require_once dirname(__FILE__).'/../../../min/lib/JSMin.php'; return JSMin::minify($js); } diff --git a/web/config.php b/web/config.php index f8de863..6aec3b1 100644 --- a/web/config.php +++ b/web/config.php @@ -5,7 +5,7 @@ * production this could be done via .htaccess or some other method. */ ini_set('include_path', - dirname(__FILE__) . '/../lib' + dirname(__FILE__) . '/../min/lib' . PATH_SEPARATOR . ini_get('include_path') ); diff --git a/web/tools/encodeFile.php b/web/tools/encodeFile.php index ae93e77..32e0a37 100644 --- a/web/tools/encodeFile.php +++ b/web/tools/encodeFile.php @@ -2,7 +2,7 @@ if (isset($_FILES['subject']['name'])) { - require '../../lib/HTTP/Encoder.php'; + require '../../min/lib/HTTP/Encoder.php'; $he = new HTTP_Encoder(array( 'content' => file_get_contents($_FILES['subject']['tmp_name']) ,'method' => $_POST['method'] diff --git a/web/tools/minifyFile.php b/web/tools/minifyFile.php index e2c8557..4f7db4b 100644 --- a/web/tools/minifyFile.php +++ b/web/tools/minifyFile.php @@ -4,7 +4,7 @@ if (isset($_FILES['subject']['name']) && preg_match('/\\.(js|css|html)$/', $_FILES['subject']['name'], $m) ) { ini_set('include_path', - dirname(__FILE__) . '/../../lib' + dirname(__FILE__) . '/../../min/lib' . PATH_SEPARATOR . ini_get('include_path') );