Mutation cleanup

.github/workflows/mutation.yml

@@ -38,5 +38,4 @@ jobs:
         if: github.event_name == 'push'
         env:
           INFECTION_DASHBOARD_API_KEY: ${{ secrets.INFECTION_DASHBOARD_API_KEY }}
-        run: |
-          php vendor/bin/infection --threads=max --only-covered
+        run: composer mutation

composer.json

@@ -129,8 +129,8 @@
         "box-compile": [
             "php var/box.phar compile"
         ],
-        "infection": [
-            "php -d pcov.enabled=1 vendor/bin/infection --threads=max"
+        "mutation": [
+            "infection --threads=max --only-covered"
         ],
         "cs": "phpcs",
         "cbf": "phpcbf",

infection.json5

@@ -8,10 +8,11 @@
     "logs": {
         "stryker": {
             "report": "main"
-        }
+        },
+        "html": "var/infection.html"
     },
-    "timeout": 30,
     "mutators": {
         "@default": true
-    }
+    },
+    "testFrameworkOptions": "--exclude-group=serial"
 }

phpunit.xml.dist

@@ -10,6 +10,7 @@
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
         convertDeprecationsToExceptions="true"
+        executionOrder="random"
 >
   <php>
     <env name="AMPLITUDE_KEY" value=""/>

src/Command/Api/ApiCommandHelper.php

@@ -277,16 +277,16 @@ private function getParameterSchemaFromSpec(string $paramKey, array $acquiaCloud
     return $acquiaCloudSpec['components']['schemas'][$paramKey];
   }
 
+  /** @infection-ignore-all */
   private function isApiSpecChecksumCacheValid(\Symfony\Component\Cache\CacheItem $cacheItem, string $acquiaCloudSpecFileChecksum): bool {
     // If the spec file doesn't exist, assume cache is valid.
-    if ($cacheItem->isHit() && !$acquiaCloudSpecFileChecksum) {
+    if (!$acquiaCloudSpecFileChecksum && $cacheItem->isHit()) {
       return TRUE;
     }
     // If there's an invalid entry OR there's no entry, return false.
-    if (!$cacheItem->isHit() || ($cacheItem->isHit() && $cacheItem->get() !== $acquiaCloudSpecFileChecksum)) {
+    if (!$cacheItem->isHit() || $cacheItem->get() !== $acquiaCloudSpecFileChecksum) {
       return FALSE;
     }
-
     return TRUE;
   }
 
@@ -296,6 +296,7 @@ private function isApiSpecChecksumCacheValid(\Symfony\Component\Cache\CacheItem
   private function getCloudApiSpec(string $specFilePath): array {
     $cacheKey = basename($specFilePath);
     $cache = new PhpArrayAdapter(__DIR__ . '/../../../var/cache/' . $cacheKey . '.cache', new NullAdapter());
+    /** @infection-ignore-all */
     $cacheItemChecksum = $cache->getItem($cacheKey . '.checksum');
     $cacheItemSpec = $cache->getItem($cacheKey);
 
@@ -306,6 +307,7 @@ private function getCloudApiSpec(string $specFilePath): array {
 
     // Otherwise, only use cache when it is valid.
     $checksum = md5_file($specFilePath);
+    /** @infection-ignore-all */
     if ($this->useCloudApiSpecCache()
       && $this->isApiSpecChecksumCacheValid($cacheItemChecksum, $checksum) && $cacheItemSpec->isHit()
     ) {
@@ -325,13 +327,13 @@ private function getCloudApiSpec(string $specFilePath): array {
   }
 
   /**
-   * @param array $acquiaCloudSpec
    * @return ApiBaseCommand[]
    */
   private function generateApiCommandsFromSpec(array $acquiaCloudSpec, string $commandPrefix, CommandFactoryInterface $commandFactory): array {
     $apiCommands = [];
     foreach ($acquiaCloudSpec['paths'] as $path => $endpoint) {
       // Skip internal endpoints. These shouldn't actually be in the spec.
+      /** @infection-ignore-all */
       if (array_key_exists('x-internal', $endpoint) && $endpoint['x-internal']) {
         continue;
       }
@@ -346,6 +348,7 @@ private function generateApiCommandsFromSpec(array $acquiaCloudSpec, string $com
         }
 
         // Skip deprecated endpoints.
+        /** @infection-ignore-all */
         if (array_key_exists('deprecated', $schema) && $schema['deprecated']) {
           continue;
         }

src/Command/CommandBase.php

@@ -1749,6 +1749,7 @@ protected function waitForNotificationToComplete(Client $acquiaCloudClient, stri
     $notification = NULL;
     $checkNotificationStatus = static function () use ($notificationsResource, &$notification, $uuid): bool {
       $notification = $notificationsResource->get($uuid);
+      /** @infection-ignore-all */
       return $notification->status !== 'in-progress';
     };
     if ($success === NULL) {

src/Command/Email/ConfigurePlatformEmailCommand.php

@@ -305,6 +305,7 @@ private function checkIfDomainVerified(
         return TRUE;
       }
 
+      /** @infection-ignore-all */
       if (isset($response->health) && str_starts_with($response->health->code, "4")) {
         $this->io->error($response->health->details);
         if ($this->io->confirm('Would you like to refresh?')) {

src/Command/Ide/IdeCreateCommand.php

@@ -4,14 +4,22 @@
 
 namespace Acquia\Cli\Command\Ide;
 
+use Acquia\Cli\ApiCredentialsInterface;
 use Acquia\Cli\Attribute\RequireAuth;
+use Acquia\Cli\CloudApi\ClientService;
+use Acquia\Cli\DataStore\AcquiaCliDatastore;
+use Acquia\Cli\DataStore\CloudDataStore;
+use Acquia\Cli\Helpers\LocalMachineHelper;
 use Acquia\Cli\Helpers\LoopHelper;
+use Acquia\Cli\Helpers\SshHelper;
+use Acquia\Cli\Helpers\TelemetryHelper;
 use Acquia\Cli\Output\Checklist;
 use AcquiaCloudApi\Endpoints\Account;
 use AcquiaCloudApi\Endpoints\Ides;
 use AcquiaCloudApi\Response\IdeResponse;
 use AcquiaCloudApi\Response\OperationResponse;
 use GuzzleHttp\Client;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -27,7 +35,21 @@ final class IdeCreateCommand extends IdeCommandBase {
 
   private IdeResponse $ide;
 
-  private Client $client;
+  public function __construct(
+    public LocalMachineHelper $localMachineHelper,
+    protected CloudDataStore $datastoreCloud,
+    protected AcquiaCliDatastore $datastoreAcli,
+    protected ApiCredentialsInterface $cloudCredentials,
+    protected TelemetryHelper $telemetryHelper,
+    protected string $projectDir,
+    protected ClientService $cloudApiClientService,
+    public SshHelper $sshHelper,
+    protected string $sshDir,
+    LoggerInterface $logger,
+    protected Client $httpClient
+  ) {
+    parent::__construct($this->localMachineHelper, $this->datastoreCloud, $this->datastoreAcli, $this->cloudCredentials, $this->telemetryHelper, $this->projectDir, $this->cloudApiClientService, $this->sshHelper, $this->sshDir, $logger);
+  }
 
   protected function configure(): void {
     $this->acceptApplicationUuid();
@@ -76,13 +98,14 @@ public function validateIdeLabel(string $label): string {
     return $label;
   }
 
-  private function waitForDnsPropagation(mixed $ideUrl): int {
+  private function waitForDnsPropagation(string $ideUrl): int {
     $ideCreated = FALSE;
-    if (!$this->getClient()) {
-      $this->setClient(new Client(['base_uri' => $ideUrl]));
-    }
-    $checkIdeStatus = function () use (&$ideCreated) {
-      $response = $this->client->request('GET', '/health');
+    $checkIdeStatus = function () use (&$ideCreated, $ideUrl) {
+      // Ideally we'd set $ideUrl as the Guzzle base_url, but that requires creating a client factory.
+      // @see https://stackoverflow.com/questions/28277889/guzzlehttp-client-change-base-url-dynamically
+      $response = $this->httpClient->request('GET', "$ideUrl/health");
+      // Mutating this will result in an infinite loop and timeout.
+      /** @infection-ignore-all */
       if ($response->getStatusCode() === 200) {
         $ideCreated = TRUE;
       }
@@ -111,14 +134,6 @@ private function writeIdeLinksToScreen(): void {
     // @todo Prompt to open browser.
   }
 
-  private function getClient(): ?Client {
-    return $this->client ?? NULL;
-  }
-
-  public function setClient(Client $client): void {
-    $this->client = $client;
-  }
-
   private function getIdeFromResponse(
     OperationResponse $response,
     \AcquiaCloudApi\Connector\Client $acquiaCloudClient

src/Helpers/LoopHelper.php

@@ -23,12 +23,14 @@ public static function getLoopy(OutputInterface $output, SymfonyStyle $io, Logge
     $spinner->start();
 
     $cancelTimers = static function () use (&$timers, $spinner): void {
+      /** @infection-ignore-all */
       array_map('\React\EventLoop\Loop::cancelTimer', $timers);
       $timers = [];
       $spinner->finish();
     };
     $periodicCallback = static function () use ($logger, $statusCallback, $doneCallback, $cancelTimers): void {
       try {
+        /** @infection-ignore-all */
         if ($statusCallback()) {
           $cancelTimers();
           $doneCallback();

tests/phpunit/src/Commands/Ide/IdeCreateCommandTest.php

@@ -9,12 +9,33 @@
 use Acquia\Cli\Tests\CommandTestBase;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
+use Prophecy\Prophecy\ObjectProphecy;
 
 /**
  * @property IdeCreateCommand $command
  */
 class IdeCreateCommandTest extends CommandTestBase {
 
+  protected Client|ObjectProphecy $httpClientProphecy;
+
+  protected function createCommand(): CommandBase {
+    $this->httpClientProphecy = $this->prophet->prophesize(Client::class);
+
+    return new IdeCreateCommand(
+      $this->localMachineHelper,
+      $this->datastoreCloud,
+      $this->datastoreAcli,
+      $this->cloudCredentials,
+      $this->telemetryHelper,
+      $this->acliRepoRoot,
+      $this->clientServiceProphecy->reveal(),
+      $this->sshHelper,
+      $this->sshDir,
+      $this->logger,
+      $this->httpClientProphecy->reveal()
+    );
+  }
+
   /**
    * @group brokenProphecy
    */
@@ -34,9 +55,7 @@ public function testCreate(): void {
     /** @var \Prophecy\Prophecy\ObjectProphecy|\GuzzleHttp\Psr7\Response $guzzleResponse */
     $guzzleResponse = $this->prophet->prophesize(Response::class);
     $guzzleResponse->getStatusCode()->willReturn(200);
-    $guzzleClient = $this->prophet->prophesize(Client::class);
-    $guzzleClient->request('GET', '/health')->willReturn($guzzleResponse->reveal())->shouldBeCalled();
-    $this->command->setClient($guzzleClient->reveal());
+    $this->httpClientProphecy->request('GET', 'https://215824ff-272a-4a8c-9027-df32ed1d68a9.ides.acquia.com/health')->willReturn($guzzleResponse->reveal())->shouldBeCalled();
 
     $inputs = [
       // Would you like Acquia CLI to search for a Cloud application that matches your local git config?
@@ -61,11 +80,4 @@ public function testCreate(): void {
     $this->assertStringContainsString('Your Drupal Site URL: https://ide-215824ff-272a-4a8c-9027-df32ed1d68a9.prod.acquia-sites.com', $output);
   }
 
-  /**
-   * @return \Acquia\Cli\Command\Ide\IdeCreateCommand
-   */
-  protected function createCommand(): CommandBase {
-    return $this->injectCommand(IdeCreateCommand::class);
-  }
-
 }