diff --git a/core/modules/update/src/ModuleVersion.php b/core/modules/update/src/ModuleVersion.php index b43e63680a..94297824d9 100644 --- a/core/modules/update/src/ModuleVersion.php +++ b/core/modules/update/src/ModuleVersion.php @@ -168,7 +168,7 @@ public function getVersionExtra() { public function getSupportBranch() { $branch = $this->useCorePrefix ? static::CORE_COMPATIBILITY_PREFIX : ''; $branch .= $this->majorVersion . '.'; - if ($this->minorVersion) { + if ($this->minorVersion !== NULL) { $branch .= $this->minorVersion . '.'; } return $branch; diff --git a/core/modules/update/tests/src/Unit/ModuleVersionTest.php b/core/modules/update/tests/src/Unit/ModuleVersionTest.php index 53ec2079f0..dcb3c10e60 100644 --- a/core/modules/update/tests/src/Unit/ModuleVersionTest.php +++ b/core/modules/update/tests/src/Unit/ModuleVersionTest.php @@ -95,6 +95,26 @@ public function providerVersionInfos() { 'branch' => '8.x-1.', ], ], + '8.x-1.0' => [ + '8.x-1.0', + [ + 'major' => '1', + 'minor' => NULL, + 'patch' => '0', + 'extra' => NULL, + 'branch' => '8.x-1.', + ], + ], + '8.x-1.0-dev' => [ + '8.x-1.0-dev', + [ + 'major' => '1', + 'minor' => NULL, + 'patch' => '0', + 'extra' => 'dev', + 'branch' => '8.x-1.', + ], + ], '8.x-1.3-dev' => [ '8.x-1.3-dev', [ @@ -105,6 +125,26 @@ public function providerVersionInfos() { 'branch' => '8.x-1.', ], ], + '0.1' => [ + '0.1', + [ + 'major' => '0', + 'minor' => NULL, + 'patch' => '1', + 'extra' => NULL, + 'branch' => '0.', + ], + ], + '1.0' => [ + '1.0', + [ + 'major' => '1', + 'minor' => NULL, + 'patch' => '0', + 'extra' => NULL, + 'branch' => '1.', + ], + ], '1.3' => [ '1.3', [ @@ -115,6 +155,16 @@ public function providerVersionInfos() { 'branch' => '1.', ], ], + '1.0-dev' => [ + '1.0-dev', + [ + 'major' => '1', + 'minor' => NULL, + 'patch' => '0', + 'extra' => 'dev', + 'branch' => '1.', + ], + ], '1.3-dev' => [ '1.3-dev', [ @@ -125,6 +175,36 @@ public function providerVersionInfos() { 'branch' => '1.', ], ], + '0.2.0' => [ + '0.2.0', + [ + 'major' => '0', + 'minor' => '2', + 'patch' => '0', + 'extra' => NULL, + 'branch' => '0.2.', + ], + ], + '1.2.0' => [ + '1.2.0', + [ + 'major' => '1', + 'minor' => '2', + 'patch' => '0', + 'extra' => NULL, + 'branch' => '1.2.', + ], + ], + '1.0.3' => [ + '1.0.3', + [ + 'major' => '1', + 'minor' => '0', + 'patch' => '3', + 'extra' => NULL, + 'branch' => '1.0.', + ], + ], '1.2.3' => [ '1.2.3', [ @@ -135,6 +215,16 @@ public function providerVersionInfos() { 'branch' => '1.2.', ], ], + '1.2.0-dev' => [ + '1.2.0-dev', + [ + 'major' => '1', + 'minor' => '2', + 'patch' => '0', + 'extra' => 'dev', + 'branch' => '1.2.', + ], + ], '1.2.3-dev' => [ '1.2.3-dev', [ @@ -145,6 +235,16 @@ public function providerVersionInfos() { 'branch' => '1.2.', ], ], + '1.0.x' => [ + '1.0.x', + [ + 'major' => '1', + 'minor' => '0', + 'patch' => NULL, + 'extra' => NULL, + 'branch' => '1.0.', + ], + ], '1.2.x' => [ '1.2.x', [