Split version lookup into Packagist only and Packagist with Drupal.org.

acquia · Oct 7, 2020 · bce9ea9 · bce9ea9
1 parent 6ffb5b9
commit bce9ea9
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/src/Domain/Composer/Version/VersionFinder.php b/src/Domain/Composer/Version/VersionFinder.php
@@ -47,7 +47,7 @@ public function findLatestVersion(string $package_name, ?string $constraint, boo
       $stability = 'dev';
     }
 
-    $selector = $this->versionSelectorFactory->create();
+    $selector = $this->versionSelectorFactory->createWithDrupalDotOrg();
     $candidate = $selector->findBestCandidate($package_name, $constraint, NULL, $stability);
 
     if (!$candidate) {

diff --git a/src/Domain/Composer/Version/VersionSelectorFactory.php b/src/Domain/Composer/Version/VersionSelectorFactory.php
@@ -28,12 +28,23 @@ public function __construct(PoolFactory $factory) {
   }
 
   /**
-   * Creates a Composer version selector for Packagist and Drupal.org.
+   * Creates a Composer version selector with Packagist only.
    *
    * @return \Composer\Package\Version\VersionSelector
    *   The version selector.
    */
-  public function create(): VersionSelector {
+  public function createWithPackagistOnly(): VersionSelector {
+    $pool = $this->factory->createWithPackagistOnly();
+    return new VersionSelector($pool);
+  }
+
+  /**
+   * Creates a Composer version selector with Packagist and drupal.org.
+   *
+   * @return \Composer\Package\Version\VersionSelector
+   *   The version selector.
+   */
+  public function createWithDrupalDotOrg(): VersionSelector {
     $pool = $this->factory->createWithDrupalDotOrg();
     return new VersionSelector($pool);
   }

diff --git a/tests/Domain/Composer/Version/VersionFinderTest.php b/tests/Domain/Composer/Version/VersionFinderTest.php
@@ -25,7 +25,10 @@ protected function setUp(): void {
 
   private function createVersionFinder(): VersionFinder {
     $this->versionSelectorFactory
-      ->create()
+      ->createWithPackagistOnly()
+      ->willReturn($this->versionSelector->reveal());
+    $this->versionSelectorFactory
+      ->createWithDrupalDotOrg()
       ->willReturn($this->versionSelector->reveal());
     $version_selector_factory = $this->versionSelectorFactory->reveal();
     return new VersionFinder($version_selector_factory);

diff --git a/tests/Domain/Composer/Version/VersionSelectorFactoryTest.php b/tests/Domain/Composer/Version/VersionSelectorFactoryTest.php
@@ -30,15 +30,37 @@ protected function createVersionSelectorFactory(): VersionSelectorFactory {
 
   /**
    * @covers ::__construct
-   * @covers ::create
+   * @covers ::createWithPackagistOnly
    */
-  public function testCreate(): void {
+  public function testCreateWithPackagistOnly(): void {
+    $this->poolFactory
+      ->createWithPackagistOnly()
+      ->shouldBeCalledOnce();
+    $this->poolFactory
+      ->createWithDrupalDotOrg()
+      ->shouldNotBeCalled();
+    $factory = $this->createVersionSelectorFactory();
+
+    $selector = $factory->createWithPackagistOnly();
+
+    /* @noinspection UnnecessaryAssertionInspection */
+    self::assertInstanceOf(VersionSelector::class, $selector, 'Created a version selector.');
+  }
+
+  /**
+   * @covers ::__construct
+   * @covers ::createWithDrupalDotOrg
+   */
+  public function testCreateWithDrupalDotOrg(): void {
     $this->poolFactory
       ->createWithDrupalDotOrg()
       ->shouldBeCalledOnce();
+    $this->poolFactory
+      ->createWithPackagistOnly()
+      ->shouldNotBeCalled();
     $factory = $this->createVersionSelectorFactory();
 
-    $selector = $factory->create();
+    $selector = $factory->createWithDrupalDotOrg();
 
     /* @noinspection UnnecessaryAssertionInspection */
     self::assertInstanceOf(VersionSelector::class, $selector, 'Created a version selector.');