Working on phpstan level 2

acquia · Jun 7, 2023 · 22290af · 22290af
1 parent 1764456
commit 22290af
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -58,6 +58,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "dominikb/composer-license-checker": "^2.4",
         "infection/infection": "^0.26.15",
+        "jangregor/phpstan-prophecy": "^1.0",
         "mikey179/vfsstream": "^1.6",
         "overtrue/phplint": "^9.0",
         "phpro/grumphp": "^1.13.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/ClientServiceInterface.php b/src/ClientServiceInterface.php
diff --git a/src/CloudApi/ClientService.php b/src/CloudApi/ClientService.php
@@ -6,7 +6,6 @@
 
 use Acquia\Cli\ApiCredentialsInterface;
 use Acquia\Cli\Application;
-use Acquia\Cli\ClientServiceInterface;
 use Acquia\Cli\ConnectorFactoryInterface;
 use AcquiaCloudApi\Connector\Client;
 use AcquiaCloudApi\Connector\ConnectorInterface;
@@ -18,7 +17,7 @@
  * client queries. Consumers could otherwise just call
  * Client::factory($connector) directly.
  */
-class ClientService implements ClientServiceInterface {
+class ClientService {
 
   protected ConnectorInterface $connector;
   protected ConnectorFactoryInterface|ConnectorFactory $connectorFactory;

diff --git a/src/Command/Api/ApiCommandHelper.php b/src/Command/Api/ApiCommandHelper.php
@@ -4,7 +4,6 @@
 
 namespace Acquia\Cli\Command\Api;
 
-use Acquia\Cli\Command\CommandBase;
 use Acquia\Cli\CommandFactoryInterface;
 use Acquia\Cli\Exception\AcquiaCliException;
 use Symfony\Component\Cache\Adapter\NullAdapter;
@@ -64,7 +63,7 @@ private function addOptionExampleToUsageForGetEndpoint(array $paramDefinition, s
    * @param array $schema
    * @param array $acquiaCloudSpec
    */
-  private function addApiCommandParameters(array $schema, array $acquiaCloudSpec, CommandBase $command): void {
+  private function addApiCommandParameters(array $schema, array $acquiaCloudSpec, ApiBaseCommand $command): void {
     $inputDefinition = [];
     $usage = '';
 

diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -5,7 +5,7 @@
 namespace Acquia\Cli\Command;
 
 use Acquia\Cli\ApiCredentialsInterface;
-use Acquia\Cli\ClientServiceInterface;
+use Acquia\Cli\CloudApi\ClientService;
 use Acquia\Cli\Command\Ssh\SshKeyCommandBase;
 use Acquia\Cli\DataStore\AcquiaCliDatastore;
 use Acquia\Cli\DataStore\CloudDataStore;
@@ -97,7 +97,7 @@ public function __construct(
     protected ApiCredentialsInterface $cloudCredentials,
     protected TelemetryHelper $telemetryHelper,
     protected string $projectDir,
-    protected ClientServiceInterface $cloudApiClientService,
+    protected ClientService $cloudApiClientService,
     protected LogstreamManager $logstreamManager,
     public SshHelper $sshHelper,
     protected string $sshDir,
@@ -1030,9 +1030,9 @@ private function convertUserAliasToUuid(InputInterface $input, string $userUuidA
   }
 
   /**
-   * @param String $userAlias
+   * @param string $userUuidArgument
    *   User alias like uuid or email.
-   * @param String $orgUuidArgument
+   * @param string $orgUuidArgument
    *   Organization uuid.
    * @return string
    *   User uuid from alias

diff --git a/src/ConnectorFactoryInterface.php b/src/ConnectorFactoryInterface.php
@@ -4,6 +4,11 @@
 
 namespace Acquia\Cli;
 
+use Acquia\Cli\CloudApi\AccessTokenConnector;
+use AcquiaCloudApi\Connector\Connector;
+
 interface ConnectorFactoryInterface {
 
+  public function createConnector(): Connector|AccessTokenConnector;
+
 }
diff --git a/tests/phpunit/src/Commands/WizardTestBase.php b/tests/phpunit/src/Commands/WizardTestBase.php
@@ -68,7 +68,6 @@ protected function runTestCreate(): void {
     $sshHelper = $this->mockPollCloudViaSsh($environmentsResponse);
     $this->command->sshHelper = $sshHelper->reveal();
 
-    /** @var Filesystem|ObjectProphecy $fileSystem */
     $fileSystem = $this->prophet->prophesize(Filesystem::class);
     $this->mockGenerateSshKey($localMachineHelper, $request['public_key']);
     $localMachineHelper->getLocalFilepath($this->passphraseFilepath)->willReturn($this->passphraseFilepath);