From 028d5380080e21df2469595cdcb2011183a5ab2c Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 15 Jan 2016 16:59:56 +0100
Subject: [PATCH] Added support for new minifiers

---
 framework/core/composer.json            |  2 +-
 framework/core/src/Asset/JsCompiler.php | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/framework/core/composer.json b/framework/core/composer.json
index 0fb1c4ada..9d8908ed6 100644
--- a/framework/core/composer.json
+++ b/framework/core/composer.json
@@ -39,7 +39,7 @@
         "tobscure/json-api": "^0.2.0",
         "oyejorge/less.php": "~1.5",
         "intervention/image": "^2.3.0",
-        "s9e/text-formatter": "^0.4.4",
+        "s9e/text-formatter": "^0.4.8",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.1",
         "zendframework/zend-stratigility": "^1.1",
diff --git a/framework/core/src/Asset/JsCompiler.php b/framework/core/src/Asset/JsCompiler.php
index a07401efa..b063aaf0a 100644
--- a/framework/core/src/Asset/JsCompiler.php
+++ b/framework/core/src/Asset/JsCompiler.php
@@ -13,7 +13,8 @@ namespace Flarum\Asset;
 use Exception;
 use Illuminate\Cache\Repository;
 use MatthiasMullie\Minify;
-use s9e\TextFormatter\Configurator\JavaScript\Minifiers\ClosureCompilerService;
+use s9e\TextFormatter\Configurator;
+use s9e\TextFormatter\Configurator\JavaScript\Minifiers\FirstAvailable;
 
 class JsCompiler extends RevisionCompiler
 {
@@ -82,14 +83,25 @@ class JsCompiler extends RevisionCompiler
      */
     protected function minifyWithClosureCompilerService($source)
     {
-        $minifier = new ClosureCompilerService;
+        // The minifier may need some classes bundled with the Configurator so we autoload it
+        class_exists(Configurator::class);
 
-        $minifier->compilationLevel = 'SIMPLE_OPTIMIZATIONS';
-        $minifier->timeout = 60;
+        $minifier = new FirstAvailable;
 
-        $output = $minifier->minify($source);
+        $remoteCache = $minifier->add('RemoteCache');
+        $remoteCache->url = 'http://s9e-textformatter.rhcloud.com/flarum-minifier/';
 
-        return $output;
+        $hostedMinifer = $minifier->add('HostedMinifier');
+        $hostedMinifer->url = 'http://s9e-textformatter.rhcloud.com/flarum-minifier/';
+        $hostedMinifer->timeout = 30;
+
+        $ccs = $minifier->add('ClosureCompilerService');
+        $ccs->compilationLevel = 'SIMPLE_OPTIMIZATIONS';
+        $ccs->timeout = 30;
+
+        $minifier->add('MatthiasMullieMinify');
+
+        return $minifier->minify($source);
     }
 
     /**