Refactor Injector instantiation and streamline bootstrap

Removed the `$_ENV['TMP_DIR']` parameter from `Injector` instantiation in tests for cleaner initiation. Updated `phpunit.xml.dist` to use a more standard bootstrap path, improving configuration consistency.
bearsunday · Nov 21, 2024 · 924c238 · 924c238
1 parent 64cf9e2
commit 924c238
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 21 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="tests/bootstrap.php">
+    bootstrap="vendor/autoload.php">
     <coverage processUncoveredFiles="true" cacheDirectory="./.phpunit-cache">
         <include>
             <directory suffix=".php">src</directory>

diff --git a/src/FastlyEnableSoftPurgeModule.php b/src/FastlyEnableSoftPurgeModule.php
@@ -10,7 +10,7 @@
 final class FastlyEnableSoftPurgeModule extends AbstractModule
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function configure(): void
     {

diff --git a/src/FastlyPurgeModule.php b/src/FastlyPurgeModule.php
@@ -31,7 +31,7 @@ public function __construct(
         parent::__construct($module);
     }
 
-    /** {@inheritdoc} */
+    /** {@inheritDoc} */
     protected function configure(): void
     {
         $this->bind(Configuration::class)->annotatedWith(Configuration::class)->toInstance(

diff --git a/tests/FastlyPurgeModuleTest.php b/tests/FastlyPurgeModuleTest.php
@@ -15,7 +15,7 @@ class FastlyPurgeModuleTest extends TestCase
     public function testModule(): void
     {
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
-        $injector = new Injector($module, $_ENV['TMP_DIR']);
+        $injector = new Injector($module);
 
         $this->assertInstanceOf(PurgeApi::class, $injector->getInstance(PurgeApi::class));
         $this->assertInstanceOf(FastlyCachePurgerInterface::class, $injector->getInstance(FastlyCachePurgerInterface::class));
@@ -26,9 +26,8 @@ public function testPurge(): void
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
         $module->override(new FakeFastlyPurgeModule());
 
-        $injector =  new Injector($module, $_ENV['TMP_DIR']);
+        $injector =  new Injector($module);
         $cachePurger = $injector->getInstance(FastlyCachePurgerInterface::class);
-        assert($cachePurger instanceof FastlyCachePurgerInterface);
         ($cachePurger)('fakeTag');
 
         $purgeApi = $injector->getInstance(PurgeApi::class);

diff --git a/tests/FastlySoftPurgeModuleTest.php b/tests/FastlySoftPurgeModuleTest.php
@@ -17,9 +17,8 @@ public function testSoftPurge(): void
         $module = new FastlyPurgeModule('apiKey', 'serviceId');
         $module->override(new FastlyEnableSoftPurgeModule(new FakeFastlyPurgeModule()));
 
-        $injector =  new Injector($module, $_ENV['TMP_DIR']);
+        $injector =  new Injector($module);
         $cachePurger = $injector->getInstance(FastlyCachePurgerInterface::class);
-        assert($cachePurger instanceof FastlyCachePurgerInterface);
         ($cachePurger)('fakeTag');
 
         $purgeApi = $injector->getInstance(PurgeApi::class);

diff --git a/tests/bootstrap.php b/tests/bootstrap.php