From bbcc3a423fb3ad4ce26ce9fea1d0f152e5c139c7 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 22 Mar 2025 13:58:32 +0100 Subject: [PATCH 1/3] Cast to bool as for other boolean options --- src/Sqlsrv/SqlsrvDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sqlsrv/SqlsrvDriver.php b/src/Sqlsrv/SqlsrvDriver.php index 772ec827..77b43a4f 100644 --- a/src/Sqlsrv/SqlsrvDriver.php +++ b/src/Sqlsrv/SqlsrvDriver.php @@ -87,7 +87,7 @@ public function __construct(array $options) $options['password'] = $options['password'] ?? ''; $options['database'] = $options['database'] ?? ''; $options['select'] = isset($options['select']) ? (bool) $options['select'] : true; - $options['trust_certificate'] = $options['trust_certificate'] ?? false; + $options['trust_certificate'] = isset($options['trust_certificate']) ? (bool) $options['trust_certificate'] : false; // Finalize initialisation parent::__construct($options); From 4d10f720a1fea1a55cc43e3eeff5b030cb4ef2e2 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 22 Mar 2025 14:01:13 +0100 Subject: [PATCH 2/3] Code style --- src/Sqlsrv/SqlsrvDriver.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Sqlsrv/SqlsrvDriver.php b/src/Sqlsrv/SqlsrvDriver.php index 77b43a4f..6a625b2b 100644 --- a/src/Sqlsrv/SqlsrvDriver.php +++ b/src/Sqlsrv/SqlsrvDriver.php @@ -82,11 +82,11 @@ public static function isSupported() public function __construct(array $options) { // Get some basic values from the options. - $options['host'] = $options['host'] ?? 'localhost'; - $options['user'] = $options['user'] ?? ''; - $options['password'] = $options['password'] ?? ''; - $options['database'] = $options['database'] ?? ''; - $options['select'] = isset($options['select']) ? (bool) $options['select'] : true; + $options['host'] = $options['host'] ?? 'localhost'; + $options['user'] = $options['user'] ?? ''; + $options['password'] = $options['password'] ?? ''; + $options['database'] = $options['database'] ?? ''; + $options['select'] = isset($options['select']) ? (bool) $options['select'] : true; $options['trust_certificate'] = isset($options['trust_certificate']) ? (bool) $options['trust_certificate'] : false; // Finalize initialisation @@ -116,12 +116,12 @@ public function connect() // Build the connection configuration array. $config = [ - 'Database' => $this->options['database'], - 'uid' => $this->options['user'], - 'pwd' => $this->options['password'], + 'Database' => $this->options['database'], + 'uid' => $this->options['user'], + 'pwd' => $this->options['password'], 'TrustServerCertificate' => $this->options['trust_certificate'], - 'CharacterSet' => 'UTF-8', - 'ReturnDatesAsStrings' => true, + 'CharacterSet' => 'UTF-8', + 'ReturnDatesAsStrings' => true, ]; // Attempt to connect to the server. From cf63cf9662128a2fc1c25d2a68c788b8c8844b40 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 22 Mar 2025 14:01:58 +0100 Subject: [PATCH 3/3] Re-order config --- src/Sqlsrv/SqlsrvDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sqlsrv/SqlsrvDriver.php b/src/Sqlsrv/SqlsrvDriver.php index 6a625b2b..8e08016e 100644 --- a/src/Sqlsrv/SqlsrvDriver.php +++ b/src/Sqlsrv/SqlsrvDriver.php @@ -119,9 +119,9 @@ public function connect() 'Database' => $this->options['database'], 'uid' => $this->options['user'], 'pwd' => $this->options['password'], - 'TrustServerCertificate' => $this->options['trust_certificate'], 'CharacterSet' => 'UTF-8', 'ReturnDatesAsStrings' => true, + 'TrustServerCertificate' => $this->options['trust_certificate'], ]; // Attempt to connect to the server.