Merge pull request wikimedia#102 from webflo/master

Resolve the self.version contraint through packages from the root package

Author: bd808

.travis.yml

@@ -13,7 +13,7 @@ sudo: false
 
 before_script:
  - travis_retry composer self-update
- - if [ "$TRAVIS_PHP_VERSION" == "5.3.3" ]; then composer config disable-tls true; fi
+ - if [ "$TRAVIS_PHP_VERSION" == "5.3.3" ]; then composer config disable-tls true; composer config secure-http false; fi
  - travis_retry composer install --prefer-source --no-interaction
 
 script: composer test

src/Merge/ExtraPackage.php

@@ -440,9 +440,24 @@ protected function replaceSelfVersionDependencies(
  $prettyVersion = $root->getPrettyVersion();
  $vp = new VersionParser();
 
+ $method = 'get' . ucfirst($linkType['method']);
+ $packages = $root->$method();
+
  return array_map(
- function ($link) use ($linkType, $version, $prettyVersion, $vp) {
+ function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
  if ('self.version' === $link->getPrettyConstraint()) {
+ if (isset($packages[$link->getSource()])) {
+ /** @var Link $package */
+ $package = $packages[$link->getSource()];
+ return new Link(
+ $link->getSource(),
+ $link->getTarget(),
+ $vp->parseConstraints($package->getConstraint()->getPrettyString()),
+ $linkType['description'],
+ $package->getPrettyConstraint()
+ );
+ }
+
  return new Link(
  $link->getSource(),
  $link->getTarget(),

tests/phpunit/MergePluginTest.php

@@ -845,6 +845,49 @@ function ($args) use ($that) {
  $this->assertEquals(0, count($extraInstalls));
  }
 
+ /**
+ * Test replace link with self.version as version constraint.
+ */
+ public function testSelfVersionNoRootVersion()
+ {
+ $that = $this;
+ $dir = $this->fixtureDir(__FUNCTION__);
+ $root = $this->rootFromJson("{$dir}/composer.json");
+
+ $root->setReplaces(Argument::type('array'))->will(
+ function ($args) use ($that) {
+ $replace = $args[0];
+ $that->assertEquals(3, count($replace));
+
+ $that->assertArrayHasKey('foo/bar', $replace);
+ $that->assertArrayHasKey('foo/baz', $replace);
+ $that->assertArrayHasKey('foo/xyzzy', $replace);
+
+ $that->assertTrue($replace['foo/bar'] instanceof Link);
+ $that->assertTrue($replace['foo/baz'] instanceof Link);
+ $that->assertTrue($replace['foo/xyzzy'] instanceof Link);
+
+ $that->assertEquals(
+ '~8.0',
+ $replace['foo/bar']->getPrettyConstraint()
+ );
+ $that->assertEquals(
+ '~8.0',
+ $replace['foo/baz']->getPrettyConstraint()
+ );
+ $that->assertEquals(
+ '~1.0',
+ $replace['foo/xyzzy']->getPrettyConstraint()
+ );
+ }
+ );
+
+ $root->getRequires()->shouldNotBeCalled();
+
+ $extraInstalls = $this->triggerPlugin($root->reveal(), $dir);
+ $this->assertEquals(0, count($extraInstalls));
+ }
+
 
  /**
  * Given a root package with minimum-stability=beta

tests/phpunit/fixtures/testSelfVersionNoRootVersion/composer.json

@@ -0,0 +1,11 @@
+{
+ "name": "foo/root",
+ "replace": {
+ "foo/bar": "~8.0"
+ },
+ "extra": {
+ "merge-plugin": {
+ "include": "composer.local.json"
+ }
+ }
+}

tests/phpunit/fixtures/testSelfVersionNoRootVersion/composer.local.json

@@ -0,0 +1,7 @@
+{
+ "name": "foo/bar",
+ "replace": {
+ "foo/baz": "self.version",
+ "foo/xyzzy": "~1.0"
+ }
+}