From 12c833864c9530ea3b80f64a5b6f0a374893cf6e Mon Sep 17 00:00:00 2001 From: nevvermind Date: Mon, 8 Jun 2015 22:45:20 +0100 Subject: [PATCH] Revert converting `1.0.0` to `^1.0`. --- doc/articles/plugins.md | 8 +----- .../Package/Version/VersionParser.php | 15 ----------- .../Package/Version/VersionParserTest.php | 26 +++---------------- .../Test/Plugin/PluginInstallerTest.php | 12 ++++----- 4 files changed, 10 insertions(+), 51 deletions(-) diff --git a/doc/articles/plugins.md b/doc/articles/plugins.md index 367c74c83..0d1ba2b8d 100644 --- a/doc/articles/plugins.md +++ b/doc/articles/plugins.md @@ -32,13 +32,7 @@ requirements: to define which Plugin API versions your plugin is compatible with. The required version of the `composer-plugin-api` follows the same [rules][7] -as a normal package's, except for the `1.0`, `1.0.0` and `1.0.0.0` _exact_ -values. In only these three cases, Composer will assume your plugin -actually meant `^1.0` instead. This was introduced to maintain BC with -the old style of declaring the Plugin API version. - -In other words, `"require": { "composer-plugin-api": "1.0.0" }` means -`"require": { "composer-plugin-api": "^1.0" }`. +as a normal package's. The current composer plugin API version is 1.0.0. diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index 41f9a72a0..b5a32a448 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -228,27 +228,12 @@ class VersionParser $parsedConstraint = $this->parseConstraints($constraint); } - // if the required Plugin API version is exactly "1.0.0", convert it to "^1.0", to keep BC - if ('composer-plugin-api' === strtolower($target) && $this->isOldStylePluginApiVersion($constraint)) { - $parsedConstraint = $this->parseConstraints('^1.0'); - } - $res[strtolower($target)] = new Link($source, $target, $parsedConstraint, $description, $constraint); } return $res; } - /** - * @param string $requiredPluginApiVersion - * @return bool - */ - private function isOldStylePluginApiVersion($requiredPluginApiVersion) - { - // catch "1.0", "1.0.0", "1.0.0.0" etc. - return (bool) preg_match('#^1(\.0)++$#', trim($requiredPluginApiVersion)); - } - /** * Parses as constraint string into LinkConstraint objects * diff --git a/tests/Composer/Test/Package/Version/VersionParserTest.php b/tests/Composer/Test/Package/Version/VersionParserTest.php index 87416e7eb..565451811 100644 --- a/tests/Composer/Test/Package/Version/VersionParserTest.php +++ b/tests/Composer/Test/Package/Version/VersionParserTest.php @@ -515,18 +515,12 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase ); } - public function oldStylePluginApiVersions() + public function pluginApiVersions() { return array( array('1.0'), array('1.0.0'), array('1.0.0.0'), - ); - } - - public function newStylePluginApiVersions() - { - return array( array('1'), array('=1.0.0'), array('==1.0'), @@ -543,23 +537,9 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase } /** - * @dataProvider oldStylePluginApiVersions - */ - public function testOldStylePluginApiVersionGetsConvertedIntoAnotherConstraintToKeepBc($apiVersion) - { - $parser = new VersionParser; - - /** @var Link[] $links */ - $links = $parser->parseLinks('Plugin', '9.9.9', '', array('composer-plugin-api' => $apiVersion)); - - $this->assertArrayHasKey('composer-plugin-api', $links); - $this->assertSame('^1.0', $links['composer-plugin-api']->getConstraint()->getPrettyString()); - } - - /** - * @dataProvider newStylePluginApiVersions + * @dataProvider pluginApiVersions */ - public function testNewStylePluginApiVersionAreKeptAsDeclared($apiVersion) + public function testPluginApiVersionAreKeptAsDeclared($apiVersion) { $parser = new VersionParser; diff --git a/tests/Composer/Test/Plugin/PluginInstallerTest.php b/tests/Composer/Test/Plugin/PluginInstallerTest.php index 8bebe7d28..cd05b922f 100644 --- a/tests/Composer/Test/Plugin/PluginInstallerTest.php +++ b/tests/Composer/Test/Plugin/PluginInstallerTest.php @@ -249,21 +249,21 @@ class PluginInstallerTest extends TestCase $this->pm->loadInstalledPlugins(); } - public function testOldPluginVersionStyleWorksWithAPIUntil199() + public function testExactPluginVersionStyleAreRegisteredCorrectly() { - $pluginsWithOldStyleAPIVersions = array( + $pluginsWithFixedAPIVersions = array( $this->packages[0], $this->packages[1], $this->packages[2], ); - $this->setPluginApiVersionWithPlugins('1.0.0', $pluginsWithOldStyleAPIVersions); + $this->setPluginApiVersionWithPlugins('1.0.0', $pluginsWithFixedAPIVersions); $this->assertCount(3, $this->pm->getPlugins()); - $this->setPluginApiVersionWithPlugins('1.9.9', $pluginsWithOldStyleAPIVersions); - $this->assertCount(3, $this->pm->getPlugins()); + $this->setPluginApiVersionWithPlugins('1.0.1', $pluginsWithFixedAPIVersions); + $this->assertCount(0, $this->pm->getPlugins()); - $this->setPluginApiVersionWithPlugins('2.0.0-dev', $pluginsWithOldStyleAPIVersions); + $this->setPluginApiVersionWithPlugins('2.0.0-dev', $pluginsWithFixedAPIVersions); $this->assertCount(0, $this->pm->getPlugins()); }