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

make composer dependency required

Browse Source 
NOTE: this changes required minimum PHP version to 5.3.3
This commit is contained in:
Elan Ruusamäe
2014-10-15 23:51:13 +03:00
parent efe603d454
commit 0e9e1237c6
18 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -1,7 +1,6 @@
# /
/test /test
/docs /docs
.idea/ /.idea/
.DS_Store .DS_Store
vendor /vendor/
!/vendor/bootstrap.php

2
min/builder/index.php
View File

@@ -22,7 +22,7 @@ if (0 === strpos($_SERVER["SERVER_SOFTWARE"], 'Apache/')
} }
} }
require dirname(__FILE__) . '/../lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
require dirname(__FILE__) . '/../config.php'; require dirname(__FILE__) . '/../config.php';
if (! $min_enableBuilder) { if (! $min_enableBuilder) {

2
min/builder/ocCheck.php
View File

@@ -5,7 +5,7 @@
* @package Minify * @package Minify
*/ */
require dirname(__FILE__) . '/../lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
$_oc = ini_get('zlib.output_compression'); $_oc = ini_get('zlib.output_compression');

4
min/index.php
View File

@@ -7,9 +7,9 @@
* @package Minify * @package Minify
*/ */
define('MINIFY_MIN_DIR', dirname(__FILE__)); require dirname(__FILE__). '/../vendor/bootstrap.php';
require MINIFY_MIN_DIR . '/lib/Minify/Loader.php'; define('MINIFY_MIN_DIR', dirname(__FILE__));
// set config path defaults // set config path defaults
$min_configPaths = array( $min_configPaths = array(

4
min/utils.php
View File

@@ -10,9 +10,7 @@
* @package Minify * @package Minify
*/ */
if (!class_exists('Minify_Loader', false)) { require dirname(__FILE__) . '/../vendor/bootstrap.php';
require dirname(__FILE__) . '/lib/Minify/Loader.php';
}
/* /*
* Get an HTML-escaped Minify URI for a group or set of files. By default, URIs * Get an HTML-escaped Minify URI for a group or set of files. By default, URIs

4
min_extras/cli/minify.php
View File

@@ -1,9 +1,7 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
$pathToLib = dirname(dirname(__DIR__)) . '/min/lib'; require dirname(dirname(__DIR__)) . '/vendor/bootstrap.php';
require "$pathToLib/Minify/Loader.php";
$cli = new MrClay\Cli; $cli = new MrClay\Cli;

2
min_extras/cli/rewrite-uris.php
View File

@@ -1,7 +1,7 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
require dirname(dirname(__DIR__)) . '/min/lib/Minify/Loader.php'; require dirname(dirname(__DIR__)) . '/vendor/bootstrap.php';
$cli = new MrClay\Cli; $cli = new MrClay\Cli;

2
min_extras/tools/minifyTextarea.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
function getPost($key) { function getPost($key) {
return get_magic_quotes_gpc() return get_magic_quotes_gpc()

2
min_extras/tools/minifyUrl.php
View File

@@ -3,7 +3,7 @@
* Fetch and minify a URL (auto-detect HTML/JS/CSS) * Fetch and minify a URL (auto-detect HTML/JS/CSS)
*/ */
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
function getPost($key) { function getPost($key) {
if (! isset($_POST[$key])) { if (! isset($_POST[$key])) {

2
min_extras/tools/testRewriteUri.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
header('Content-Type: text/html;charset=utf-8'); header('Content-Type: text/html;charset=utf-8');

2
min_unit_tests/HTTP_ConditionalGet/2.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
// emulate regularly updating document // emulate regularly updating document
$every = 20; $every = 20;

2
min_unit_tests/HTTP_ConditionalGet/3.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../../vendor/bootstrap.php';
// generate content first (not ideal) // generate content first (not ideal)
// emulate regularly updating document // emulate regularly updating document

2
min_unit_tests/HTTP_ConditionalGet/4.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../../vendor/bootstrap.php';
// emulate regularly updating document // emulate regularly updating document
$every = 20; $every = 20;

2
min_unit_tests/HTTP_ConditionalGet/5.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
// far expires // far expires
$cg = new HTTP_ConditionalGet(array( $cg = new HTTP_ConditionalGet(array(

2
min_unit_tests/HTTP_ConditionalGet/index.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
// emulate regularly updating document // emulate regularly updating document
$every = 20; $every = 20;

2
min_unit_tests/HTTP_Encoder/index.php
View File

@@ -1,7 +1,7 @@
<?php <?php
ini_set('display_errors', 'on'); ini_set('display_errors', 'on');
require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../../vendor/bootstrap.php';
if (!isset($_GET['test'])) { if (!isset($_GET['test'])) {
$type = 'text/html'; $type = 'text/html';

2
min_unit_tests/_inc.php
View File

@@ -1,6 +1,6 @@
<?php <?php
require dirname(__FILE__) . '/../min/lib/Minify/Loader.php'; require dirname(__FILE__) . '/../vendor/bootstrap.php';
require dirname(__FILE__) . '/../min/config.php'; require dirname(__FILE__) . '/../min/config.php';
// set cache path and doc root if configured // set cache path and doc root if configured

19
vendor/bootstrap.php vendored Normal file
View File

@@ -0,0 +1,19 @@
<?php
/**
* Sets up autoloader for Minify
*
* @package Minify
*/
$includeIfExists = function($file) {
return file_exists($file) ? include $file : false;
};
if (!$includeIfExists(__DIR__.'/autoload.php')) {
echo 'You must set up the project dependencies, run the following commands:'.PHP_EOL.
'curl -sS https://getcomposer.org/installer | php'.PHP_EOL.
'php composer.phar install'.PHP_EOL;
exit(1);
}
unset($includeIfExists);