support for PHP 8.5

Author: dg

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-22.04
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
             fail-fast: false
 

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.1 - 8.4",
+		"php": "8.1 - 8.5",
 		"ext-pdo": "*",
 		"nette/caching": "^3.2",
 		"nette/utils": "^4.0"

readme.md

@@ -40,7 +40,7 @@ The recommended way to install is via Composer:
 composer require nette/database
 ```
 
-It requires PHP version 8.1 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.5.
 
 
 Usage

src/Database/Table/ActiveRow.php

@@ -285,6 +285,7 @@ public function accessColumn(?string $key, bool $selectColumn = true): bool
 			$this->dataRefreshed = true;
 		}
 
+		$key ??= '';
 		return isset($this->data[$key]) || array_key_exists($key, $this->data);
 	}
 

src/Database/Table/Selection.php

@@ -644,6 +644,7 @@ protected function saveCacheState(): void
 	 */
 	protected function getRefTable(&$refPath): self
 	{
+		$refPath = '';
 		return $this;
 	}
 
@@ -944,7 +945,7 @@ public function getReferencedTable(ActiveRow $row, ?string $table, ?string $colu
 			}
 		}
 
-		return $selection[$checkPrimaryKey] ?? null;
+		return $selection[$checkPrimaryKey ?? ''] ?? null;
 	}
 
 

tests/Database/Explorer/Explorer.cache.phpt

@@ -120,7 +120,6 @@ test('shared accessed columns in related instances', function () use ($explorer)
 
 	foreach ($relatedStack as $related) {
 		$property = (new ReflectionClass($related))->getProperty('accessedColumns');
-		$property->setAccessible(true);
 		// checks if instances have shared data of accessed columns
 		Assert::same(['id', 'author_id'], array_keys((array) $property->getValue($related)));
 	}

tests/Database/Explorer/SqlBuilder.tryDelimite().phpt

@@ -15,7 +15,6 @@ $explorer = connectToDB();
 
 $sqlBuilder = new Nette\Database\Table\SqlBuilder('book', $explorer);
 $tryDelimite = (new ReflectionClass($sqlBuilder))->getMethod('tryDelimite');
-$tryDelimite->setAccessible(true);
 
 Assert::same(reformat('[hello]'), $tryDelimite->invoke($sqlBuilder, 'hello'));
 Assert::same(reformat(' [hello] '), $tryDelimite->invoke($sqlBuilder, ' hello '));

tests/Database/ResultSet.fetch().phpt

@@ -38,7 +38,7 @@ test('detects duplicate column names in simple query', function () use ($connect
 test('handles cursor management in stored procedures', function () use ($connection, $driverName) {
 	if ($driverName === 'mysql') {
 		$connection->query('CREATE DEFINER = CURRENT_USER PROCEDURE `testProc`(IN param int(10) unsigned) BEGIN SELECT * FROM book WHERE id != param; END;;');
-		$connection->getPdo()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
+		$connection->getPdo()->setAttribute(PHP_VERSION_ID < 80500 ? PDO::MYSQL_ATTR_USE_BUFFERED_QUERY : Pdo\Mysql::ATTR_USE_BUFFERED_QUERY, false);
 
 		$res = $connection->query('CALL testProc(1)');
 		foreach ($res as $row) {