deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaning up unnecessary use of 'die' and 'exit'

Browse source
This commit is contained in:
Dan Cryer 2015-02-12 12:37:56 +00:00
commit 2d5659d613
13 changed files with 188 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

23
PHPCI/Controller/PluginController.php
View file

@ -82,16 +82,18 @@ class PluginController extends \PHPCI\Controller
$package = $this->getParam('package', null);
$json = $this->getComposerJson();
$response = new b8\Http\Response\RedirectResponse();
if (!in_array($package, $this->required)) {
unset($json['require'][$package]);
$this->setComposerJson($json);
header('Location: ' . PHPCI_URL . 'plugin?r=' . $package);
die;
$response->setHeader('Location', PHPCI_URL . 'plugin?r=' . $package);
return $response;
}
header('Location: ' . PHPCI_URL);
die;
$response->setHeader('Location', PHPCI_URL);
return $response;
}
/**
@ -108,8 +110,9 @@ class PluginController extends \PHPCI\Controller
$json['require'][$package] = $version;
$this->setComposerJson($json);
header('Location: ' . PHPCI_URL . 'plugin?w=' . $package);
die;
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'plugin?w=' . $package);
return $response;
}
/**
@ -181,7 +184,9 @@ class PluginController extends \PHPCI\Controller
$http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)'));
$res = $http->get('https://packagist.org/search.json', array('q' => $searchQuery));
die(json_encode($res['body']));
$response = new b8\Http\Response\JsonResponse();
$response->setContent($res['body']);
return $response;
}
/**
@ -194,6 +199,8 @@ class PluginController extends \PHPCI\Controller
$http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)'));
$res = $http->get('https://packagist.org/packages/'.$name.'.json');
die(json_encode($res['body']));
$response = new b8\Http\Response\JsonResponse();
$response->setContent($res['body']);
return $response;
}
}