cleanup

acquia · Dec 8, 2023 · 0a737f3 · 0a737f3
1 parent 5f435c2
commit 0a737f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/src/Command/Acsf/AcsfApiBaseCommand.php b/src/Command/Acsf/AcsfApiBaseCommand.php
@@ -8,7 +8,6 @@
 use Acquia\Cli\Command\Api\ApiBaseCommand;
 use Acquia\Cli\Exception\AcquiaCliException;
 use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Input\InputInterface;
 
 #[AsCommand(name: 'acsf:base')]
 class AcsfApiBaseCommand extends ApiBaseCommand {
@@ -19,23 +18,4 @@ protected function checkAuthentication(): void {
     }
   }
 
-  /**
-   * @todo Remove this method when CLI-791 is resolved.
-   */
-  protected function getRequestPath(InputInterface $input): string {
-    $path = $this->path;
-
-    $arguments = $input->getArguments();
-    // The command itself is the first argument. Remove it.
-    array_shift($arguments);
-    foreach ($arguments as $key => $value) {
-      $token = '%' . $key;
-      if (str_contains($path, $token)) {
-        return str_replace($token, $value, $path);
-      }
-    }
-
-    return parent::getRequestPath($input);
-  }
-
 }
diff --git a/src/Command/Api/ApiBaseCommand.php b/src/Command/Api/ApiBaseCommand.php
@@ -187,8 +187,7 @@ private function castParamType(array $paramSpec, array|string|bool|int $value):
         }
         $types[] = $type['type'];
       }
-      $isInt = (in_array('integer', $types, TRUE) || in_array('int', $types, TRUE));
-      if ($isInt && ctype_digit($value)) {
+      if (in_array('integer', $types, TRUE) && ctype_digit($value)) {
         return $this->doCastParamType('integer', $value);
       }
     }
@@ -210,8 +209,8 @@ private function castParamType(array $paramSpec, array|string|bool|int $value):
 
   private function doCastParamType(string $type, mixed $value): array|bool|int|string|object {
     return match ($type) {
-      'int', 'integer' => (int) $value,
-      'bool', 'boolean' => $this->castBool($value),
+      'integer' => (int) $value,
+      'boolean' => $this->castBool($value),
       'array' => is_string($value) ? explode(',', $value) : (array) $value,
       'string' => (string) $value,
       'object' => json_decode($value, FALSE, 512, JSON_THROW_ON_ERROR),

diff --git a/tests/phpunit/src/Commands/Api/ApiCommandTest.php b/tests/phpunit/src/Commands/Api/ApiCommandTest.php
@@ -52,22 +52,20 @@ public function testArgumentsInteractionValidation(): void {
         'AH_SOMETHING',
       ]);
     }
-    catch (MissingInputException $exception) {
-
+    catch (MissingInputException) {
     }
     $output = $this->getDisplay();
     $this->assertStringContainsString('It must match the pattern', $output);
   }
 
-  public function testArgumentsInteractionValdationFormat(): void {
+  public function testArgumentsInteractionValidationFormat(): void {
     $this->command = $this->getApiCommandByName('api:notifications:find');
     try {
       $this->executeCommand([], [
         'test',
       ]);
     }
-    catch (MissingInputException $exception) {
-
+    catch (MissingInputException) {
     }
     $output = $this->getDisplay();
     $this->assertStringContainsString('This is not a valid UUID', $output);