Maintenance on CodeBase (#225)

SonsOfPHP · Sep 10, 2024 · 461fa76 · 461fa76
1 parent 7d69eb7
commit 461fa76
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/Adapter/InMemoryAdapter.php b/Adapter/InMemoryAdapter.php
@@ -50,7 +50,7 @@ public function remove(string $path, ?ContextInterface $context = null): void
     {
         $path = $this->normalizePath($path);
 
-        foreach ($this->files as $key => $value) {
+        foreach (array_keys($this->files) as $key) {
             if ($path === $key || str_starts_with($key, $path)) {
                 unset($this->files[$key]);
             }
@@ -73,7 +73,11 @@ public function move(string $source, string $destination, ?ContextInterface $con
 
     public function has(string $path, ?ContextInterface $context = null): bool
     {
-        return $this->isFile($path) || $this->isDirectory($path);
+        if ($this->isFile($path)) {
+            return true;
+        }
+
+        return $this->isDirectory($path);
     }
 
     public function isFile(string $path, ?ContextInterface $context = null): bool
@@ -87,7 +91,7 @@ public function isDirectory(string $path, ?ContextInterface $context = null): bo
     {
         $path = $this->normalizePath($path);
 
-        foreach ($this->files as $key => $contents) {
+        foreach (array_keys($this->files) as $key) {
             $parts = explode('/', $key);
             array_pop($parts);
 
@@ -115,7 +119,7 @@ public function removeDirectory(string $path, ?ContextInterface $context = null)
     {
         $path = $this->normalizePath($path);
 
-        foreach ($this->files as $key => $value) {
+        foreach (array_keys($this->files) as $key) {
             if (str_starts_with($key, $path)) {
                 unset($this->files[$key]);
                 return;

diff --git a/Adapter/NativeAdapter.php b/Adapter/NativeAdapter.php
@@ -77,7 +77,11 @@ public function remove(string $path, ?ContextInterface $context = null): void
 
     public function has(string $path, ?ContextInterface $context = null): bool
     {
-        return $this->isFile($path, $context) || $this->isDirectory($path, $context);
+        if ($this->isFile($path, $context)) {
+            return true;
+        }
+
+        return $this->isDirectory($path, $context);
     }
 
     public function isFile(string $path, ?ContextInterface $context = null): bool

diff --git a/Tests/Adapter/ChainAdapterTest.php b/Tests/Adapter/ChainAdapterTest.php
@@ -21,7 +21,7 @@ final class ChainAdapterTest extends TestCase
 {
     private array $adapters = [];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->adapters[] = new InMemoryAdapter();
     }

diff --git a/Tests/Adapter/NativeAdapterTest.php b/Tests/Adapter/NativeAdapterTest.php
@@ -18,6 +18,7 @@
 final class NativeAdapterTest extends TestCase
 {
     private AdapterInterface $adapter;
+
     private string $prefix;
 
     protected function setUp(): void

diff --git a/Tests/Adapter/ReadOnlyAdapterTest.php b/Tests/Adapter/ReadOnlyAdapterTest.php
@@ -22,7 +22,7 @@ final class ReadOnlyAdapterTest extends TestCase
 {
     private AdapterInterface|MockObject $adapter;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->adapter = $this->createMock(AdapterInterface::class);
     }

diff --git a/Tests/Adapter/WormAdapterTest.php b/Tests/Adapter/WormAdapterTest.php
@@ -21,7 +21,7 @@ final class WormAdapterTest extends TestCase
 {
     private AdapterInterface $adapter;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->adapter = new InMemoryAdapter();
     }

diff --git a/Tests/ContextTest.php b/Tests/ContextTest.php
@@ -41,37 +41,37 @@ public function testItCanSetValues(): void
     {
         $context = new Context();
 
-        $this->assertFalse(isset($context['testing']));
+        $this->assertArrayNotHasKey('testing', $context);
 
         $context['testing'] = true;
-        $this->assertTrue(isset($context['testing']));
+        $this->assertArrayHasKey('testing', $context);
         $this->assertTrue($context['testing']);
     }
 
     public function testItCanCheckIfKeysAreSet(): void
     {
         $context = new Context();
 
-        $this->assertFalse(isset($context['testing']));
+        $this->assertArrayNotHasKey('testing', $context);
         $context['testing'] = true;
-        $this->assertTrue(isset($context['testing']));
+        $this->assertArrayHasKey('testing', $context);
 
         unset($context['testing']);
-        $this->assertFalse(isset($context['testing']));
+        $this->assertArrayNotHasKey('testing', $context);
     }
 
     public function testItCanUnsetKeys(): void
     {
         $context = new Context();
 
-        $this->assertFalse(isset($context['testing']));
+        $this->assertArrayNotHasKey('testing', $context);
         unset($context['testing']);
-        $this->assertFalse(isset($context['testing']));
+        $this->assertArrayNotHasKey('testing', $context);
 
         $context['test'] = true;
-        $this->assertTrue(isset($context['test']));
+        $this->assertArrayHasKey('test', $context);
         unset($context['test']);
-        $this->assertFalse(isset($context['test']));
+        $this->assertArrayNotHasKey('test', $context);
     }
 
     public function testItCanGetValues(): void