[#.x] - phpcs and phpstan

Author: niden

src/Domain/Exceptions/InvalidConfigurationArgumentException.php

@@ -13,6 +13,8 @@
 
 namespace Phalcon\Api\Domain\Exceptions;
 
-class InvalidConfigurationArgumentException extends \InvalidArgumentException
+use InvalidArgumentException;
+
+class InvalidConfigurationArgumentException extends InvalidArgumentException
 {
 }

src/Domain/Hello/HelloService.php

@@ -26,7 +26,7 @@ public function __invoke(): Payload
         return new Payload(
             DomainStatus::SUCCESS,
             [
-                'results' => "Hello World!!! - " . date("Y-m-d H:i:s")
+                'results' => "Hello World!!! - " . date("Y-m-d H:i:s"),
             ]
         );
     }

src/Domain/Services/Env/EnvFactory.php

@@ -36,7 +36,7 @@ public function newInstance(string $name, mixed ...$parameters): AdapterInterfac
 
             $definition = $adapters[$name];
             /** @var AdapterInterface $instance */
-            $instance = new $definition(...$parameters);
+            $instance               = new $definition(...$parameters);
             $this->instances[$name] = $instance;
         }
 

tests/Unit/Domain/Services/Env/Adapters/DotEnvTest.php

@@ -15,24 +15,46 @@
 
 use Phalcon\Api\Domain\Exceptions\InvalidConfigurationArgumentException;
 use Phalcon\Api\Domain\Services\Env\Adapters\DotEnv;
-use Phalcon\Api\Domain\Services\Env\EnvFactory;
 use Phalcon\Api\Domain\Services\Env\EnvManager;
 use Phalcon\Api\Tests\Unit\AbstractUnitTestCase;
 
 final class DotEnvTest extends AbstractUnitTestCase
 {
     private string $envFile;
 
-    protected function setUp(): void
+    public function testLoadExceptionForEmptyFilePath(): void
     {
-        $this->envFile = EnvManager::appPath()
-            . '/tests/Fixtures/Domain/Services/Env/'
-        ;
+        $this->expectException(InvalidConfigurationArgumentException::class);
+        $this->expectExceptionMessage(
+            'The .env file does not exist at the specified path'
+        );
+
+        $dotEnv  = new DotEnv();
+        $options = [
+            'filePath' => '',
+        ];
+
+        $dotEnv->load($options);
+    }
+
+    public function testLoadExceptionForMissingFile(): void
+    {
+        $this->expectException(InvalidConfigurationArgumentException::class);
+        $this->expectExceptionMessage(
+            'The .env file does not exist at the specified path'
+        );
+
+        $dotEnv  = new DotEnv();
+        $options = [
+            'filePath' => '/does/not/exist/',
+        ];
+
+        $dotEnv->load($options);
     }
 
     public function testLoadSuccess(): void
     {
-        $dotEnv = new DotEnv();
+        $dotEnv  = new DotEnv();
         $options = [
             'filePath' => $this->envFile,
         ];
@@ -43,7 +65,7 @@ public function testLoadSuccess(): void
             'SAMPLE_TRUE'   => 'true',
             'SAMPLE_FALSE'  => 'false',
         ];
-        $actual = $dotEnv->load($options);
+        $actual   = $dotEnv->load($options);
 
         $this->assertArrayHasKey('SAMPLE_STRING', $actual);
         $this->assertArrayHasKey('SAMPLE_INT', $actual);
@@ -60,33 +82,9 @@ public function testLoadSuccess(): void
         $this->assertSame($expected, $actualArray);
     }
 
-    public function testLoadExceptionForEmptyFilePath(): void
-    {
-        $this->expectException(InvalidConfigurationArgumentException::class);
-        $this->expectExceptionMessage(
-            'The .env file does not exist at the specified path'
-        );
-
-        $dotEnv = new DotEnv();
-        $options = [
-            'filePath' => '',
-        ];
-
-        $dotEnv->load($options);
-    }
-
-    public function testLoadExceptionForMissingFile(): void
+    protected function setUp(): void
     {
-        $this->expectException(InvalidConfigurationArgumentException::class);
-        $this->expectExceptionMessage(
-            'The .env file does not exist at the specified path'
-        );
-
-        $dotEnv = new DotEnv();
-        $options = [
-            'filePath' => '/does/not/exist/',
-        ];
-
-        $dotEnv->load($options);
+        $this->envFile = EnvManager::appPath()
+            . '/tests/Fixtures/Domain/Services/Env/';
     }
 }

tests/Unit/Domain/Services/Env/EnvManagerTest.php

@@ -13,25 +13,14 @@
 
 namespace Phalcon\Api\Tests\Unit\Domain\Services\Env;
 
-use Phalcon\Api\Domain\Exceptions\InvalidConfigurationArgumentException;
-use Phalcon\Api\Domain\Services\Env\Adapters\DotEnv;
-use Phalcon\Api\Domain\Services\Env\EnvFactory;
 use Phalcon\Api\Domain\Services\Env\EnvManager;
 use Phalcon\Api\Tests\Unit\AbstractUnitTestCase;
-use Phalcon\Container\Lazy\Env;
 use PHPUnit\Framework\Attributes\BackupGlobals;
 use ReflectionClass;
 
 #[BackupGlobals(true)]
 final class EnvManagerTest extends AbstractUnitTestCase
 {
-    protected function setUp(): void
-    {
-        $ref = new ReflectionClass(EnvManager::class);
-        $ref->setStaticPropertyValue('isLoaded', false);
-        $ref->setStaticPropertyValue('settings', []);
-    }
-
     public function testAppPathReturnsRoot(): void
     {
         $expected = dirname(__DIR__, 5);
@@ -44,7 +33,7 @@ public function testGetFromDotEnvLoad(): void
         $_ENV = [
             'APP_ENV_ADAPTER'   => 'dotenv',
             'APP_ENV_FILE_PATH' => EnvManager::appPath()
-                . '/tests/Fixtures/Domain/Services/Env/'
+                . '/tests/Fixtures/Domain/Services/Env/',
         ];
 
         $values = [
@@ -74,4 +63,11 @@ public function testGetFromDotEnvLoad(): void
         $actual   = EnvManager::get('SAMPLE_FALSE');
         $this->assertSame($expected, $actual);
     }
+
+    protected function setUp(): void
+    {
+        $ref = new ReflectionClass(EnvManager::class);
+        $ref->setStaticPropertyValue('isLoaded', false);
+        $ref->setStaticPropertyValue('settings', []);
+    }
 }