From 6d809cb02361babaa91f292bb32fe41c43beb9e5 Mon Sep 17 00:00:00 2001 From: JoshyPHP Date: Fri, 29 Apr 2016 07:41:30 +0200 Subject: [PATCH] Updated s9e\TextFormatter to 0.5.0 (#947) --- composer.json | 2 +- src/Asset/JsCompiler.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e73741c21..03fd0fda5 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "symfony/http-foundation": "^2.7", "symfony/translation": "^2.7", "symfony/yaml": "^2.7", - "s9e/text-formatter": "^0.4.12", + "s9e/text-formatter": "^0.5.0", "tobscure/json-api": "^0.3.0", "zendframework/zend-diactoros": "^1.1", "zendframework/zend-stratigility": "^1.1" diff --git a/src/Asset/JsCompiler.php b/src/Asset/JsCompiler.php index 798ca74f2..887b74201 100644 --- a/src/Asset/JsCompiler.php +++ b/src/Asset/JsCompiler.php @@ -93,11 +93,11 @@ class JsCompiler extends RevisionCompiler $hostedMinifer = $minifier->add('HostedMinifier'); $hostedMinifer->url = 'http://s9e-textformatter.rhcloud.com/flarum-minifier/'; - $hostedMinifer->timeout = 30; + $hostedMinifer->httpClient->timeout = 30; $ccs = $minifier->add('ClosureCompilerService'); $ccs->compilationLevel = 'SIMPLE_OPTIMIZATIONS'; - $ccs->timeout = 30; + $ccs->httpClient->timeout = 30; $minifier->add('MatthiasMullieMinify');