From 0e9e1237c62067074cd13e5f3beea1dff2a4283a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 15 Oct 2014 23:51:13 +0300
Subject: [PATCH] make composer dependency required

NOTE: this changes required minimum PHP version to 5.3.3
---
 .gitignore                                   | 11 +++++------
 min/builder/index.php                        |  2 +-
 min/builder/ocCheck.php                      |  2 +-
 min/index.php                                |  4 ++--
 min/utils.php                                |  4 +---
 min_extras/cli/minify.php                    |  4 +---
 min_extras/cli/rewrite-uris.php              |  2 +-
 min_extras/tools/minifyTextarea.php          |  2 +-
 min_extras/tools/minifyUrl.php               |  2 +-
 min_extras/tools/testRewriteUri.php          |  2 +-
 min_unit_tests/HTTP_ConditionalGet/2.php     |  2 +-
 min_unit_tests/HTTP_ConditionalGet/3.php     |  2 +-
 min_unit_tests/HTTP_ConditionalGet/4.php     |  2 +-
 min_unit_tests/HTTP_ConditionalGet/5.php     |  2 +-
 min_unit_tests/HTTP_ConditionalGet/index.php |  2 +-
 min_unit_tests/HTTP_Encoder/index.php        |  2 +-
 min_unit_tests/_inc.php                      |  2 +-
 vendor/bootstrap.php                         | 19 +++++++++++++++++++
 18 files changed, 41 insertions(+), 27 deletions(-)
 create mode 100644 vendor/bootstrap.php

diff --git a/.gitignore b/.gitignore
index f4558c7..427148e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-
-# /
-/test
-/docs
-.idea/
+/test
+/docs
+/.idea/
 .DS_Store
-vendor
+/vendor/
+!/vendor/bootstrap.php
diff --git a/min/builder/index.php b/min/builder/index.php
index b033933..de19dd4 100644
--- a/min/builder/index.php
+++ b/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) {
diff --git a/min/builder/ocCheck.php b/min/builder/ocCheck.php
index 2aa5abf..4af8525 100644
--- a/min/builder/ocCheck.php
+++ b/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');
  
diff --git a/min/index.php b/min/index.php
index 7f78a7c..e8c36e7 100644
--- a/min/index.php
+++ b/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(
diff --git a/min/utils.php b/min/utils.php
index 286568f..80c89b1 100644
--- a/min/utils.php
+++ b/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
diff --git a/min_extras/cli/minify.php b/min_extras/cli/minify.php
index 6482fdb..e3df308 100755
--- a/min_extras/cli/minify.php
+++ b/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;
 
diff --git a/min_extras/cli/rewrite-uris.php b/min_extras/cli/rewrite-uris.php
index a0577f4..4b335f1 100755
--- a/min_extras/cli/rewrite-uris.php
+++ b/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;
 
diff --git a/min_extras/tools/minifyTextarea.php b/min_extras/tools/minifyTextarea.php
index 274a61e..8925f89 100644
--- a/min_extras/tools/minifyTextarea.php
+++ b/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()
diff --git a/min_extras/tools/minifyUrl.php b/min_extras/tools/minifyUrl.php
index 867e36b..1c203bb 100644
--- a/min_extras/tools/minifyUrl.php
+++ b/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])) {
diff --git a/min_extras/tools/testRewriteUri.php b/min_extras/tools/testRewriteUri.php
index f189c8e..d26087a 100644
--- a/min_extras/tools/testRewriteUri.php
+++ b/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');
 
diff --git a/min_unit_tests/HTTP_ConditionalGet/2.php b/min_unit_tests/HTTP_ConditionalGet/2.php
index cc73957..06eedf5 100644
--- a/min_unit_tests/HTTP_ConditionalGet/2.php
+++ b/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;
diff --git a/min_unit_tests/HTTP_ConditionalGet/3.php b/min_unit_tests/HTTP_ConditionalGet/3.php
index 4ad68ff..38c507f 100644
--- a/min_unit_tests/HTTP_ConditionalGet/3.php
+++ b/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
diff --git a/min_unit_tests/HTTP_ConditionalGet/4.php b/min_unit_tests/HTTP_ConditionalGet/4.php
index aec6ead..537649a 100644
--- a/min_unit_tests/HTTP_ConditionalGet/4.php
+++ b/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;
diff --git a/min_unit_tests/HTTP_ConditionalGet/5.php b/min_unit_tests/HTTP_ConditionalGet/5.php
index d1618b6..0cd2ec7 100644
--- a/min_unit_tests/HTTP_ConditionalGet/5.php
+++ b/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(
diff --git a/min_unit_tests/HTTP_ConditionalGet/index.php b/min_unit_tests/HTTP_ConditionalGet/index.php
index d2dad82..e0444c9 100644
--- a/min_unit_tests/HTTP_ConditionalGet/index.php
+++ b/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;
diff --git a/min_unit_tests/HTTP_Encoder/index.php b/min_unit_tests/HTTP_Encoder/index.php
index 663750c..31d2507 100644
--- a/min_unit_tests/HTTP_Encoder/index.php
+++ b/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';
diff --git a/min_unit_tests/_inc.php b/min_unit_tests/_inc.php
index 2e63304..24af676 100644
--- a/min_unit_tests/_inc.php
+++ b/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
diff --git a/vendor/bootstrap.php b/vendor/bootstrap.php
new file mode 100644
index 0000000..40238d3
--- /dev/null
+++ b/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);