fix: code review fixes

sitepark · Dec 7, 2023 · f5d7a46 · f5d7a46
1 parent 22eddd5
commit f5d7a46
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 29 deletions.
diff --git a/src/Loader/SiteKitLoader.php b/src/Loader/SiteKitLoader.php
@@ -47,11 +47,9 @@ public function load(string $location): Resource
 
     public function exists(string $location): bool
     {
-        return file_exists(
-            $this->baseLocator->locate() .
-                DIRECTORY_SEPARATOR .
-            $location
-        );
+        return file_exists($this->baseLocator->locate()
+            . DIRECTORY_SEPARATOR
+            . $location);
     }
 
     /**

diff --git a/test/Loader/DocumentRootLayoutResourceBaseLocatorTest.php b/test/Loader/DocumentRootLayoutResourceBaseLocatorTest.php
@@ -17,20 +17,30 @@
 #[CoversClass(DocumentRootLayoutResourceBaseLocator::class)]
 class DocumentRootLayoutResourceBaseLocatorTest extends TestCase
 {
+    /**
+     * @var array<string,string>
+     */
+    private array $saveServerState;
+
+    public function setUp(): void
+    {
+        $this->saveServerState = $_SERVER;
+    }
+
+    public function tearDown(): void
+    {
+        $_SERVER = $this->saveServerState;
+    }
+
     public function testConstruct(): void
     {
-        $saveServerState = $_SERVER;
-        try {
-            $_SERVER['DOCUMENT_ROOT'] = 'abc';
-            $locator = new DocumentRootLayoutResourceBaseLocator();
-            $this->assertEquals(
-                'abc',
-                $locator->locate(),
-                'unexpected resource base'
-            );
-        } finally {
-            $_SERVER = $saveServerState;
-        }
+        $_SERVER['DOCUMENT_ROOT'] = 'abc';
+        $locator = new DocumentRootLayoutResourceBaseLocator();
+        $this->assertEquals(
+            'abc',
+            $locator->locate(),
+            'unexpected resource base'
+        );
     }
 
     public function testWithMissingSeverVariable(): void

diff --git a/test/Loader/ResourceLayoutResourceBaseLocatorTest.php b/test/Loader/ResourceLayoutResourceBaseLocatorTest.php
@@ -14,20 +14,30 @@
 #[CoversClass(ResourceLayoutResourceBaseLocator::class)]
 class ResourceLayoutResourceBaseLocatorTest extends TestCase
 {
+    /**
+     * @var array<string,string>
+     */
+    private array $saveServerState;
+
+    public function setUp(): void
+    {
+        $this->saveServerState = $_SERVER;
+    }
+
+    public function tearDown(): void
+    {
+        $_SERVER = $this->saveServerState;
+    }
+
     public function testConstruct(): void
     {
-        $saveServerState = $_SERVER;
-        try {
-            $_SERVER['RESOURCE_ROOT'] = 'abc';
-            $locator = new ResourceLayoutResourceBaseLocator();
-            $this->assertEquals(
-                'abc/objects',
-                $locator->locate(),
-                'unexpected resource base'
-            );
-        } finally {
-            $_SERVER = $saveServerState;
-        }
+        $_SERVER['RESOURCE_ROOT'] = 'abc';
+        $locator = new ResourceLayoutResourceBaseLocator();
+        $this->assertEquals(
+            'abc/objects',
+            $locator->locate(),
+            'unexpected resource base'
+        );
     }
 
     public function testWithMissingSeverVariable(): void