Skip to content

Commit

Permalink
Remove minor keyword in other places 🧹
Browse files Browse the repository at this point in the history
  • Loading branch information
uzibhalepu authored and michael-rubel committed Nov 8, 2022
1 parent b86852c commit 837cd8f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions bin/roave-backward-compatibility-check.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use Roave\BackwardCompatibility\Git\GetVersionCollectionFromGitRepository;
use Roave\BackwardCompatibility\Git\GitCheckoutRevisionToTemporaryPath;
use Roave\BackwardCompatibility\Git\GitParseRevision;
use Roave\BackwardCompatibility\Git\PickLastMinorVersionFromCollection;
use Roave\BackwardCompatibility\Git\PickLastVersionFromCollection;
use Roave\BackwardCompatibility\LocateDependencies\LocateDependenciesViaComposer;
use Roave\BackwardCompatibility\LocateSources\LocateSourcesViaComposerJson;
use Roave\BetterReflection\BetterReflection;
Expand Down Expand Up @@ -66,7 +66,7 @@
new ComposerInstallationReflectorFactory(new LocateSourcesViaComposerJson($astLocator)),
new GitParseRevision(),
new GetVersionCollectionFromGitRepository(),
new PickLastMinorVersionFromCollection(),
new PickLastVersionFromCollection(),
new LocateDependenciesViaComposer(
static function (string $installationPath) use ($composerIo): Installer {
return Installer::create(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
use Version\Version;
use Version\VersionCollection;

final class PickLastMinorVersionFromCollection implements PickVersionFromVersionCollection
final class PickLastVersionFromCollection implements PickVersionFromVersionCollection
{
public function forVersions(VersionCollection $versionsCollection): Version
{
Psl\invariant(! $versionsCollection->isEmpty(), 'Cannot determine latest minor version from an empty collection');
Psl\invariant(! $versionsCollection->isEmpty(), 'Cannot determine latest version from an empty collection');

$stableVersions = $versionsCollection->matching(new class implements Constraint {
public function assert(Version $version): bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
use PHPUnit\Framework\TestCase;
use Psl\Exception\InvariantViolationException;
use Psl\Type;
use Roave\BackwardCompatibility\Git\PickLastMinorVersionFromCollection;
use Roave\BackwardCompatibility\Git\PickLastVersionFromCollection;
use Version\Version;
use Version\VersionCollection;

use function array_map;

/** @covers \Roave\BackwardCompatibility\Git\PickLastMinorVersionFromCollection */
final class PickLastMinorVersionFromCollectionTest extends TestCase
/** @covers \Roave\BackwardCompatibility\Git\PickLastVersionFromCollection */
final class PickLastVersionFromCollectionTest extends TestCase
{
/**
* @return array<int, array<int, string|array<int, string>>>
* @psalm-return array<int, array{0: string, 1: list<string>}>
*/
public function lastStableMinorVersionForCollectionProvider(): array
public function lastStableVersionForCollectionProvider(): array
{
return [
['2.2.0', ['1.1.0', '2.1.1', '2.2.0', '1.2.1']],
Expand All @@ -42,13 +42,13 @@ public function lastStableMinorVersionForCollectionProvider(): array
/**
* @param string[] $collectionOfVersions
*
* @dataProvider lastStableMinorVersionForCollectionProvider
* @dataProvider lastStableVersionForCollectionProvider
*/
public function testForRepository(string $expectedVersion, array $collectionOfVersions): void
{
self::assertSame(
$expectedVersion,
(new PickLastMinorVersionFromCollection())->forVersions(
(new PickLastVersionFromCollection())->forVersions(
new VersionCollection(...array_map(static function (string $version): Version {
return Type\instance_of(Version::class)
->coerce(Version::fromString($version));
Expand All @@ -59,7 +59,7 @@ public function testForRepository(string $expectedVersion, array $collectionOfVe

public function testWillRejectEmptyCollection(): void
{
$pick = new PickLastMinorVersionFromCollection();
$pick = new PickLastVersionFromCollection();

$this->expectException(InvariantViolationException::class);

Expand Down

0 comments on commit 837cd8f

Please sign in to comment.