Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesvdvreken committed Jul 4, 2016
2 parents d060f3e + 98df8bd commit 244e200
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions app/Semver/Http/Controllers/PackageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public function matchVersions($vendor, $package)
{
$this->configureMinimumStability();

$constraint = $this->request->getAttribute('constraint', '*');
$queryParams = $this->request->getQueryParams();
$constraint = isset($queryParams['constraint']) ? $queryParams['constraint'] : '*';
$versions = $this->packagist->getMatchingVersions($vendor, $package, $constraint);

return new JsonResponse($versions);
Expand All @@ -67,7 +68,8 @@ public function matchVersions($vendor, $package)
*/
protected function configureMinimumStability()
{
$minimumStability = $this->request->getAttribute('minimum-stability', 'stable');
$queryParams = $this->request->getQueryParams();
$minimumStability = isset($queryParams['minimum-stability']) ? $queryParams['minimum-stability'] : 'stable';
if (!in_array($minimumStability, array_keys(BasePackage::$stabilities), true)) {
throw new UnexpectedValueException(sprintf('Unsupported value for minimum-stability: %s', $minimumStability));
}
Expand Down

0 comments on commit 244e200

Please sign in to comment.