Merge pull request #207 from nextras/php8.2

build with PHP 8.2
nextras · Apr 10, 2023 · 65ea548 · 65ea548
2 parents 7df2b5e + d7f4f68
commit 65ea548
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ '8.1' ]
+        php-version: [ '8.1', '8.2' ]
 
     steps:
       - name: Checkout
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1' ]
+        php-version: [ '8.1', '8.2' ]
 
     runs-on: ubuntu-latest
 

diff --git a/src/Drivers/PdoPgsql/PdoPgsqlDriver.php b/src/Drivers/PdoPgsql/PdoPgsqlDriver.php
@@ -158,6 +158,8 @@ protected function processInitialSettings(array $params): void
 			$params['connectionTz'] = date('P');
 		}
 
+		$this->loggedQuery("SET intervalstyle = 'iso_8601'");
+
 		$this->connectionTz = new DateTimeZone($params['connectionTz']);
 		if (str_contains($this->connectionTz->getName(), ':')) {
 			$this->loggedQuery('SET TIME ZONE INTERVAL ' . $this->convertStringToSql($this->connectionTz->getName()) . ' HOUR TO MINUTE');

diff --git a/src/Drivers/PdoPgsql/PdoPgsqlResultNormalizerFactory.php b/src/Drivers/PdoPgsql/PdoPgsqlResultNormalizerFactory.php
@@ -53,8 +53,7 @@ public function __construct()
 
 		$this->intervalNormalizer = static function($value): ?DateInterval {
 			if ($value === null) return null;
-			$interval = DateInterval::createFromDateString($value);
-			return $interval !== false ? $interval : null;
+			return new DateInterval($value);
 		};
 
 		$this->varBitNormalizer = static function($value) {

diff --git a/src/Drivers/Pgsql/PgsqlDriver.php b/src/Drivers/Pgsql/PgsqlDriver.php
@@ -102,6 +102,7 @@ public function connect(array $params, ILogger $logger): void
 
 		$this->resultNormalizationFactory = new PgsqlResultNormalizerFactory();
 
+		$this->loggedQuery("SET intervalstyle = 'iso_8601'");
 		$this->connectionTz = new DateTimeZone($params['connectionTz']);
 		if (str_contains($this->connectionTz->getName(), ':')) {
 			$this->loggedQuery('SET TIME ZONE INTERVAL ' . pg_escape_literal($connection, $this->connectionTz->getName()) . ' HOUR TO MINUTE');

diff --git a/src/Drivers/Pgsql/PgsqlResultNormalizerFactory.php b/src/Drivers/Pgsql/PgsqlResultNormalizerFactory.php
@@ -60,8 +60,7 @@ public function __construct()
 
 		$this->intervalNormalizer = static function ($value): ?DateInterval {
 			if ($value === null) return null;
-			$interval = DateInterval::createFromDateString($value);
-			return $interval !== false ? $interval : null;
+			return new DateInterval($value);
 		};
 
 		$this->varBitNormalizer = static function ($value) {

diff --git a/tests/cases/integration/types.postgres.phpt b/tests/cases/integration/types.postgres.phpt
@@ -21,7 +21,7 @@ class TypesPostgresTest extends IntegrationTestCase
 		$result = $this->connection->query("
 			SELECT
 			-- driver specific
-			'1 day 01:00:00'::interval,
+			'1 day 1 hour'::interval,
 			'0100'::bit(4),
 			'100'::varbit,
 			'YES'::bool,
@@ -42,7 +42,8 @@ class TypesPostgresTest extends IntegrationTestCase
 		");
 
 		$row = $result->fetch();
-		Assert::equal(DateInterval::createFromDateString('1 day 01:00:00'), $row->interval);
+		Assert::equal(1, $row->interval->d);
+		Assert::equal(1, $row->interval->h);
 		Assert::same(4, $row->bit);
 		Assert::same(4, $row->varbit);
 		Assert::same(true, $row->bool);