Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/81' into develop
Browse files Browse the repository at this point in the history
Forward port #81
  • Loading branch information
weierophinney committed Mar 17, 2016
2 parents a768167 + a6ff63b commit 5af71c1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ All notable changes to this project will be documented in this file, in reverse
versions, and updates whoops to allow either 1.1 or 2.0 versions.
- [#80](https://github.com/zendframework/zend-expressive-skeleton/pull/80)
updates the default ProxyManager constraints to also allow v2 versions.
- [#81](https://github.com/zendframework/zend-expressive-skeleton/pull/81)
fixes an issue in the installer whereby specified constraints were not being
passed to Composer prior to dependency resolution/installation, resulting in
stale dependencies.

## 1.0.0 - 2016-01-28

Expand Down
6 changes: 5 additions & 1 deletion src/ExpressiveInstaller/OptionalPackages.php
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,12 @@ public static function addPackage(IOInterface $io, $packageName, $packageVersion
$packageVersion
));

// Get the version constraint
$versionParser = new VersionParser();
$constraint = $versionParser->parseConstraints($packageVersion);

// Create package link
$link = new Link('__root__', $packageName, null, 'requires', $packageVersion);
$link = new Link('__root__', $packageName, $constraint, 'requires', $packageVersion);

// Add package to the root package and composer.json requirements
if (in_array($packageName, self::$config['require-dev'])) {
Expand Down

0 comments on commit 5af71c1

Please sign in to comment.