feat(igbinary): check if extension is loaded, and disable auto select…

… driver
h4kuna · Jul 30, 2024 · 7b9c575 · 7b9c575
1 parent a32fd62
commit 7b9c575
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/Driver/IgBinary.php b/src/Driver/IgBinary.php
@@ -10,6 +10,8 @@ final class IgBinary implements Driver
 {
 	use StaticClass;
 
+	private static ?bool $extension = null;
+
 	private const NULL = "\x00";
 
 	/** @var array<string> */
@@ -52,6 +54,10 @@ public static function decode(string $value)
 		return $data;
 	}
 
+	public static function isIgbinaryLoaded(): bool
+	{
+		return self::$extension ??= extension_loaded('igbinary');
+	}
 
 	public static function serializationCheckIgbinary(string $value): bool
 	{

diff --git a/src/Driver/Php.php b/src/Driver/Php.php
@@ -29,7 +29,7 @@ public static function decode(string $value)
 				return false;
 			}
 			error_clear_last();
-			if (IgBinary::serializationCheckIgbinary($value) === true) {
+			if (IgBinary::isIgbinaryLoaded() && IgBinary::serializationCheckIgbinary($value)) {
 				return IgBinary::decode($value);
 			}
 

diff --git a/src/Driver/SetUp.php b/src/Driver/SetUp.php
@@ -27,10 +27,6 @@ public static function decode(string $value)
 
 	private static function boot(): void
 	{
-		if (extension_loaded('igbinary')) {
-			Serialize::setUp(IgBinary::class);
-		} else {
-			Serialize::setUp(Php::class);
-		}
+		Serialize::setUp(Php::class);
 	}
 }
diff --git a/tests/src/DisableAutoInstallTest.php → tests/src/CheckDefaulDriverTest.php b/tests/src/DisableAutoInstallTest.php → tests/src/CheckDefaulDriverTest.php
@@ -9,7 +9,6 @@
 use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
-Serialize::setUp(Php::class);
 
 $data = Serialize::encode('foo');
 Assert::same('foo', Php::decode($data));

diff --git a/tests/src/AutoInstallTest.php → tests/src/IgBinaryForceTest.php b/tests/src/AutoInstallTest.php → tests/src/IgBinaryForceTest.php
@@ -7,6 +7,7 @@
 use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
+Serialize::setUp(IgBinary::class);
 
 $data = Serialize::encode('foo');
 Assert::same('foo', IgBinary::decode($data));