Simplify code

cycle · Oct 31, 2023 · 29bbcd0 · 29bbcd0
1 parent 403839f
commit 29bbcd0
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 48 deletions.
diff --git a/src/Database.php b/src/Database.php
@@ -219,12 +219,9 @@ public function withoutCache(): self
         }
 
         if ($this->driver instanceof Driver) {
-            if ($database->readDriver === $database->driver) {
-                $database->readDriver = $database->readDriver->withoutCache();
-                $database->driver = $database->readDriver;
-            } else {
-                $database->driver = $database->driver->withoutCache();
-            }
+            $database->driver = $database->readDriver === $database->driver
+                ? ($database->readDriver = $database->driver->withoutCache())
+                : $database->driver->withoutCache();
 
             return $database;
         }

diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -101,6 +101,11 @@ public function isReadonly(): bool
 
     public function withoutCache(): static
     {
+        if ($this->useCache === false) {
+            // Cache already disabled
+            return $this;
+        }
+
         $driver = clone $this;
         $driver->useCache = false;
 

diff --git a/tests/Database/Unit/DatabaseTest.php b/tests/Database/Unit/DatabaseTest.php
@@ -5,6 +5,7 @@
 namespace Cycle\Database\Tests\Unit;
 
 use Cycle\Database\Database;
+use Cycle\Database\DatabaseInterface;
 use Cycle\Database\Driver\Driver;
 use Cycle\Database\Driver\DriverInterface;
 use PHPUnit\Framework\TestCase;
@@ -23,10 +24,8 @@ public function testWithoutCacheWithoutReadDriver(): void
 
         $newDb = $database->withoutCache();
 
-        $ref = new \ReflectionProperty($newDb, 'readDriver');
-        $ref->setAccessible(true);
-
-        $this->assertNull($ref->getValue($newDb));
+        $this->assertNull($this->readProperty($newDb, 'readDriver'));
+        $this->assertsame($driver, $database->getDriver());
         $this->assertNotSame($driver, $newDb->getDriver());
     }
 
@@ -38,17 +37,12 @@ public function testWithoutCacheWithSameDriverAndReadDriver(): void
             ->expects($this->once())
             ->method('withoutCache');
 
-        $database = new Database('default', '', $driver, $driver);
-
-        $newDb = $database->withoutCache();
+        $db = new Database('default', '', $driver, $driver);
 
-        $refDriver = new \ReflectionProperty($newDb, 'driver');
-        $refDriver->setAccessible(true);
+        $newDb = $db->withoutCache();
 
-        $refReadDriver = new \ReflectionProperty($newDb, 'readDriver');
-        $refReadDriver->setAccessible(true);
-
-        $this->assertSame($refDriver->getValue($newDb), $refReadDriver->getValue($newDb));
+        $this->assertSame($db->getDriver(DatabaseInterface::WRITE), $db->getDriver(DatabaseInterface::READ));
+        $this->assertSame($newDb->getDriver(DatabaseInterface::WRITE), $newDb->getDriver(DatabaseInterface::READ));
     }
 
     public function testWithoutCacheWithDriverAndReadDriver(): void
@@ -64,54 +58,37 @@ public function testWithoutCacheWithDriverAndReadDriver(): void
             ->expects($this->once())
             ->method('withoutCache');
 
-        $database = new Database('default', '', $driver, $readDriver);
-
-        $newDb = $database->withoutCache();
-
-        $refDriver = new \ReflectionProperty($newDb, 'driver');
-        $refDriver->setAccessible(true);
+        $db = new Database('default', '', $driver, $readDriver);
 
-        $refReadDriver = new \ReflectionProperty($newDb, 'readDriver');
-        $refReadDriver->setAccessible(true);
+        $newDb = $db->withoutCache();
 
-        $this->assertNotSame($refDriver->getValue($newDb), $refReadDriver->getValue($newDb));
-        $this->assertNotSame($driver, $refDriver->getValue($newDb));
-        $this->assertNotSame($readDriver, $refReadDriver->getValue($newDb));
+        $this->assertNotSame($newDb->getDriver(DatabaseInterface::WRITE), $newDb->getDriver(DatabaseInterface::READ));
+        $this->assertNotSame($driver, $newDb->getDriver(DatabaseInterface::WRITE));
+        $this->assertNotSame($readDriver, $newDb->getDriver(DatabaseInterface::READ));
     }
 
     public function testWithoutCacheWithoutReadDriverAndWithoutMethod(): void
     {
         $driver = $this->createMock(DriverInterface::class);
-
         $database = new Database('default', '', $driver);
 
         $newDb = $database->withoutCache();
 
-        $ref = new \ReflectionProperty($newDb, 'readDriver');
-        $ref->setAccessible(true);
-
-        $this->assertNull($ref->getValue($newDb));
+        $this->assertNull($this->readProperty($newDb, 'readDriver'));
         $this->assertSame($driver, $newDb->getDriver());
     }
 
     public function testWithoutCacheWithDriverAndReadDriverWithoutMethod(): void
     {
         $driver = $this->createMock(DriverInterface::class);
         $readDriver = $this->createMock(DriverInterface::class);
-
         $database = new Database('default', '', $driver, $readDriver);
 
         $newDb = $database->withoutCache();
 
-        $refDriver = new \ReflectionProperty($newDb, 'driver');
-        $refDriver->setAccessible(true);
-
-        $refReadDriver = new \ReflectionProperty($newDb, 'readDriver');
-        $refReadDriver->setAccessible(true);
-
-        $this->assertNotSame($refDriver->getValue($newDb), $refReadDriver->getValue($newDb));
-        $this->assertSame($driver, $refDriver->getValue($newDb));
-        $this->assertSame($readDriver, $refReadDriver->getValue($newDb));
+        $this->assertNotSame($newDb->getDriver(DatabaseInterface::WRITE), $newDb->getDriver(DatabaseInterface::READ));
+        $this->assertSame($driver, $newDb->getDriver(DatabaseInterface::WRITE));
+        $this->assertSame($readDriver, $newDb->getDriver(DatabaseInterface::READ));
     }
 
     public function testWithoutCacheWithSameDriversAndWithoutMethod(): void
@@ -128,8 +105,17 @@ public function testWithoutCacheWithSameDriversAndWithoutMethod(): void
         $refReadDriver = new \ReflectionProperty($newDb, 'readDriver');
         $refReadDriver->setAccessible(true);
 
-        $this->assertSame($refDriver->getValue($newDb), $refReadDriver->getValue($newDb));
-        $this->assertSame($driver, $refDriver->getValue($newDb));
-        $this->assertSame($driver, $refReadDriver->getValue($newDb));
+        $this->assertSame($newDb->getDriver(DatabaseInterface::WRITE), $newDb->getDriver(DatabaseInterface::READ));
+        $this->assertSame($driver, $newDb->getDriver(DatabaseInterface::WRITE));
+        $this->assertSame($driver, $newDb->getDriver(DatabaseInterface::READ));
+    }
+
+    private function readProperty(object $object, string $property): mixed
+    {
+        $fn = function () use ($property) {
+            return $this->$property;
+        };
+
+        return $fn->call($object);
     }
 }
diff --git a/tests/Database/Unit/Driver/AbstractDriverTest.php b/tests/Database/Unit/Driver/AbstractDriverTest.php
@@ -167,6 +167,22 @@ public function testWithoutCache(): void
         $this->assertFalse($ref->getValue($driver->withoutCache()));
     }
 
+    public function testWithoutCacheTwice(): void
+    {
+        $driver = TestDriver::create(new SQLiteDriverConfig(queryCache: true));
+
+        $ncDriver = $driver->withoutCache();
+
+        $this->assertSame($ncDriver, $ncDriver->withoutCache());
+    }
+
+    public function testWithoutCacheOnWithoutCacheInitially(): void
+    {
+        $driver = TestDriver::create(new SQLiteDriverConfig(queryCache: false));
+
+        $this->assertSame($driver, $driver->withoutCache());
+    }
+
     public function testPdoNotClonedAfterCacheDisabled(): void
     {
         $ref = new \ReflectionMethod(Driver::class, 'getPDO');