timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +20 -12
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f02a94b862 - Show all commits

32
public/js.php
View File

@ -18,7 +18,7 @@ namespace Aviat\EasyMin;
use function Amp\wait; use function Amp\wait;
use Amp\Artax\{Client, FormBody, Request}; use Amp\Artax\{Client, FormBody, Request};
use Aviat\Ion\Json; use Aviat\Ion\{Json, JsonException};
// Include Amp and Artax // Include Amp and Artax
require_once('../vendor/autoload.php'); require_once('../vendor/autoload.php');
@ -121,7 +121,7 @@ class JSMin {
$request = (new Request) $request = (new Request)
->setMethod('POST') ->setMethod('POST')
->setUri('http://closure-compiler.appspot.com/compile') ->setUri('https://closure-compiler.appspot.com/compile')
->setAllHeaders([ ->setAllHeaders([
'Accept' => 'application/json', 'Accept' => 'application/json',
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
@ -144,17 +144,25 @@ class JSMin {
*/ */
protected function checkMinifyErrors($options) protected function checkMinifyErrors($options)
{ {
$errorRes = $this->closureCall($options); try
$errorJson = $errorRes->getBody();
$errorObj = Json::decode($errorJson) ?: (object)[];
// Show error if exists
if ( ! empty($errorObj->errors) || ! empty($errorObj->serverErrors))
{ {
$errorJson = Json::encode($errorObj, JSON_PRETTY_PRINT); $errorRes = $this->closureCall($options);
header('Content-type: application/javascript'); $errorJson = $errorRes->getBody();
echo "console.error(${errorJson});"; $errorObj = Json::decode($errorJson) ?: (object)[];
// Show error if exists
if ( ! empty($errorObj->errors) || ! empty($errorObj->serverErrors))
{
$errorJson = Json::encode($errorObj, JSON_PRETTY_PRINT);
header('Content-type: application/javascript');
echo "console.error(${errorJson});";
die();
}
}
catch (JsonException $e)
{
print_r($e);
die(); die();
} }
} }