From e2e20ad6db0f5355d05a85cc32f79ceb0bbabb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Sat, 4 Jan 2025 15:20:36 +0100 Subject: [PATCH] fix path in feature class, minor refactor --- src/Features/DisallowSqliteAttach.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Features/DisallowSqliteAttach.php b/src/Features/DisallowSqliteAttach.php index 2f0f03d1..d1533d51 100644 --- a/src/Features/DisallowSqliteAttach.php +++ b/src/Features/DisallowSqliteAttach.php @@ -43,24 +43,21 @@ class DisallowSqliteAttach implements Feature static::$loadExtensionSupported = method_exists($pdo, 'loadExtension'); } - if (static::$loadExtensionSupported === false) { - return false; - } + if (static::$loadExtensionSupported === false) return false; + if (static::$extensionPath === false) return false; $suffix = match (PHP_OS_FAMILY) { - 'Linux' => '.so', - 'Windows' => '.dll', - 'Darwin' => '.dylib', + 'Linux' => 'so', + 'Windows' => 'dll', + 'Darwin' => 'dylib', default => throw new Exception("The DisallowSqliteAttach feature doesn't support your operating system: " . PHP_OS_FAMILY), }; $arch = php_uname('m'); $arm = $arch === 'aarch64' || $arch === 'arm64'; - static::$extensionPath ??= realpath(base_path('vendor/stancl/tenancy/src/extensions/lib/' . ($arm ? 'arm/' : '') . 'noattach' . $suffix)); - if (static::$extensionPath === false) { - return false; - } + static::$extensionPath ??= realpath(base_path('vendor/stancl/tenancy/extensions/lib/' . ($arm ? 'arm/' : '') . 'noattach.' . $suffix)); + if (static::$extensionPath === false) return false; $pdo->loadExtension(static::$extensionPath); // @phpstan-ignore method.notFound