make composer dependency required

NOTE: this changes required minimum PHP version to 5.3.3

.gitignore

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

min/builder/index.php

@@ -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';
 
 if (! $min_enableBuilder) {

min/builder/ocCheck.php

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

min/index.php

@@ -7,9 +7,9 @@
  * @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
 $min_configPaths = array(

min/utils.php

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

min_extras/cli/minify.php

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

min_extras/cli/rewrite-uris.php

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

min_extras/tools/minifyTextarea.php

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

min_extras/tools/minifyUrl.php

@@ -3,7 +3,7 @@
  * 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) {
     if (! isset($_POST[$key])) {

min_extras/tools/testRewriteUri.php

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

min_unit_tests/HTTP_ConditionalGet/2.php

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

min_unit_tests/HTTP_ConditionalGet/3.php

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

min_unit_tests/HTTP_ConditionalGet/4.php

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

min_unit_tests/HTTP_ConditionalGet/5.php

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

min_unit_tests/HTTP_ConditionalGet/index.php

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

min_unit_tests/HTTP_Encoder/index.php

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

min_unit_tests/_inc.php

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

vendor/bootstrap.php

@@ -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);