-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bug #5 Make VersionValidator produce better suggestions (sstok)
This PR was merged into the 1.0-dev branch. labels: bc-break Discussion ---------- The Validator had no tests at all (closes #3 ) and the algorithm was horrible flawed, suggestions could include already existing versions and predictions for a new major or minor release while this was not logically expected. This pull request changes the validator completely, by using a more descriptive name and separating concerns of validating and getting possible versions. Note: The suggested versions might be different than expected, this algorithm is highly opinionated and tries to enforce a continues versioning list. Commits ------- fb64dff Make VersionValidator produce better suggestions
- Loading branch information
Showing
8 changed files
with
352 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * This file is part of the Rollerworks Semver package. | ||
| * | ||
| * (c) Sebastiaan Stok <[email protected]> | ||
| * | ||
| * This source file is subject to the MIT license that is bundled | ||
| * with this source code in the file LICENSE. | ||
| */ | ||
|
|
||
| namespace Rollerworks\Component\Version; | ||
|
|
||
| use function count; | ||
|
|
||
| final class ContinuesVersionsValidator | ||
| { | ||
| /** @var Version[] */ | ||
| private $versions = []; | ||
|
|
||
| /** @var Version[] */ | ||
| private $possibleVersions = []; | ||
|
|
||
| /** @var array<int, Version[]> */ | ||
| private $resolveVersions = []; | ||
|
|
||
| public function __construct(Version ...$versions) | ||
| { | ||
| $this->versions = $versions; | ||
| } | ||
|
|
||
| public function isContinues(Version $new): bool | ||
| { | ||
| if (count($this->versions) === 0) { | ||
| $this->possibleVersions = [ | ||
| Version::fromString('0.1.0'), | ||
| Version::fromString('1.0.0-ALPHA1'), | ||
| Version::fromString('1.0.0-BETA1'), | ||
| Version::fromString('1.0.0'), | ||
| ]; | ||
| } else { | ||
| $this->computePossibleVersions($new); | ||
| } | ||
|
|
||
| foreach ($this->possibleVersions as $possibleVersion) { | ||
| if ($possibleVersion->equalTo($new)) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * @return Version[] | ||
| */ | ||
| public function getPossibleVersions(): array | ||
| { | ||
| return $this->possibleVersions; | ||
| } | ||
|
|
||
| private function computePossibleVersions(Version $new): void | ||
| { | ||
| $this->arrangeExistingVersions(); | ||
|
|
||
| $major = $new->major; | ||
| $minor = $new->minor; | ||
|
|
||
| if (!isset($this->resolveVersions[$major])) { | ||
| $this->computePossibleVersionsFromLastExisting(); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| if (!isset($this->resolveVersions[$major][$minor])) { | ||
| $minor = $this->getLastArrayIndex($this->resolveVersions[$major]); | ||
| } | ||
|
|
||
| $this->computePossibleVersionsFromMinor($major, $minor); | ||
| } | ||
|
|
||
| private function arrangeExistingVersions(): void | ||
| { | ||
| usort($this->versions, function (Version $a, Version $b) { | ||
| return version_compare(strtolower($a->full), strtolower($b->full), '<') ? -1 : 1; | ||
| }); | ||
|
|
||
| $resolvedVersions = []; | ||
|
|
||
| foreach ($this->versions as $version) { | ||
| $resolvedVersions[$version->major][$version->minor] = $version; | ||
| } | ||
|
|
||
| $this->resolveVersions = $resolvedVersions; | ||
| } | ||
|
|
||
| private function computePossibleVersionsFromLastExisting(): void | ||
| { | ||
| $major = $this->getLastArrayIndex($this->resolveVersions); | ||
| $minor = $this->getLastArrayIndex($this->resolveVersions[$major]); | ||
|
|
||
| /** @var Version $version */ | ||
| $version = $this->resolveVersions[$major][$minor]; | ||
| $this->possibleVersions = $version->getNextVersionCandidates(); | ||
| } | ||
|
|
||
| private function getLastArrayIndex(array $array) | ||
| { | ||
| end($array); | ||
|
|
||
| return key($array); | ||
| } | ||
|
|
||
| private function hasNewerVersionsAfter(int $major, int $minor): bool | ||
| { | ||
| return $this->getLastArrayIndex($this->resolveVersions) > $major || | ||
| $this->getLastArrayIndex($this->resolveVersions[$major]) > $minor; | ||
| } | ||
|
|
||
| private function computePossibleVersionsFromMinor(int $major, int $minor): void | ||
| { | ||
| /** @var Version $version */ | ||
| $version = $this->resolveVersions[$major][$minor]; | ||
|
|
||
| if ($this->hasNewerVersionsAfter($major, $minor)) { | ||
| $this->possibleVersions = [$version->getNextIncreaseOf('patch')]; | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| $versionCandidates = $version->getNextVersionCandidates(); | ||
| $this->possibleVersions = $versionCandidates; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.