fix: stderr in phpunit output tests (#10)

Author: babeuloula

phpmd-ruleset.xml

@@ -41,8 +41,7 @@
         </properties>
     </rule>
     <rule ref="rulesets/controversial.xml">
-        <exclude name="CamelCasePropertyName"/>
-        <exclude name="CamelCaseMethodName"/>
+        <exclude name="Superglobals"/>
     </rule>
     <rule ref="rulesets/design.xml">
         <exclude name="CouplingBetweenObjects"/>

phpunit.xml

@@ -13,6 +13,10 @@
          failOnRisky="true"
          failOnWarning="true"
 >
+    <php>
+        <server name="LOG_STREAM" value="/tmp/cdn-php.log" force="true" />
+    </php>
+
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>

public/index.php

@@ -20,7 +20,6 @@
 use Symfony\Component\HttpFoundation\Response;
 
 $dotenv = new Dotenv();
-$dotenv->usePutenv();
 $dotenv->loadEnv(__DIR__ . '/../.env');
 
 if (true === filter_var(getenv('APP_DEBUG'), FILTER_VALIDATE_BOOLEAN)) {

src/ContainerConfig.php

@@ -35,15 +35,15 @@ public function __construct()
     {
         parent::__construct();
 
-        $this['storage_driver'] = getenv('STORAGE_DRIVER');
-        $this['storage_path'] = getenv('STORAGE_PATH');
-        $this['cache_ttl'] = (int) getenv('CACHE_TTL');
-        $this['allowed_domains'] = explode(',', (string) getenv('ALLOWED_DOMAINS'));
-        $this['image_compression'] = (int) getenv('IMAGE_COMPRESSION');
-
-        $this[LoggerInterface::class] = static fn () => new BrefLogger(
-            (string) getenv('LOG_LEVEL'),
-            (string) getenv('LOG_STREAM')
+        $this['storage_driver'] = $this->getEnv('STORAGE_DRIVER');
+        $this['storage_path'] = $this->getEnv('STORAGE_PATH');
+        $this['cache_ttl'] = (int) $this->getEnv('CACHE_TTL');
+        $this['allowed_domains'] = explode(',', $this->getEnv('ALLOWED_DOMAINS'));
+        $this['image_compression'] = (int) $this->getEnv('IMAGE_COMPRESSION');
+
+        $this[LoggerInterface::class] = fn () => new BrefLogger(
+            $this->getEnv('LOG_LEVEL'),
+            $this->getEnv('LOG_STREAM')
         );
 
         $this[SymfonyFilesystem::class] = static fn() => new SymfonyFilesystem();
@@ -52,20 +52,20 @@ public function __construct()
             case 's3':
                 $awsClient = new S3Client(
                     [
-                        'version' => 'latest',
-                        'region' => getenv('S3_REGION'),
-                        'endpoint' => getenv('S3_ENDPOINT'),
-                        'use_path_style_endpoint' => 1 === ((int) getenv('S3_PATH_STYLE_ENDPOINT')),
+                        'version' => $this->getEnv('S3_VERSION', 'latest'),
+                        'region' => $this->getEnv('S3_REGION'),
+                        'endpoint' => $this->getEnv('S3_ENDPOINT'),
+                        'use_path_style_endpoint' => 1 === ((int) $this->getEnv('S3_PATH_STYLE_ENDPOINT', 1)),
                         'credentials' => [
-                            'key' => getenv('S3_ACCESS_KEY'),
-                            'secret' => getenv('S3_SECRET_KEY'),
+                            'key' => $this->getEnv('S3_ACCESS_KEY'),
+                            'secret' => $this->getEnv('S3_SECRET_KEY'),
                         ],
                     ]
                 );
 
                 $this[FilesystemAdapter::class] = new AwsS3V3Adapter(
                     client: $awsClient,
-                    bucket: (string) getenv('S3_BUCKET'),
+                    bucket: $this->getEnv('S3_BUCKET'),
                     visibility: new PortableVisibilityConverter(Visibility::PRIVATE),
                 );
                 break;
@@ -79,7 +79,7 @@ public function __construct()
         }
 
         $this[UrlFilesystemAdapter::class] = static fn(self $c) => new UrlFilesystemAdapter(
-            $c[SymfonyFilesystem::class]
+            $c[SymfonyFilesystem::class],
         );
         $this[LeagueFilesystem::class] = static fn(self $c) => new LeagueFilesystem($c[FilesystemAdapter::class]);
         $this[Storage::class] = static fn (self $c) => new Storage(
@@ -105,4 +105,15 @@ public function __construct()
             $c[LoggerInterface::class],
         );
     }
+
+    private function getEnv(string $key, mixed $default = null): string
+    {
+        // phpcs:ignore
+        if (false === \array_key_exists($key, $_ENV)) {
+            return $default;
+        }
+
+        // phpcs:ignore
+        return (string) $_ENV[$key];
+    }
 }

tests/bootstrap.php

@@ -16,5 +16,4 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $dotenv = new Dotenv();
-$dotenv->usePutenv();
 $dotenv->load(__DIR__ . '/../.env');