PHP: deprecated fixes for v8.5

Author: forrest79

phpstan.neon

@@ -80,12 +80,6 @@ parameters:
 			count: 2
 			path: src/Fluent/Condition.php
 
-		-
-			rawMessage: 'Array key must be integer or string, but string|null given.'
-			identifier: shipmonk.unsafeArrayKey
-			count: 3
-			path: src/Fluent/Query.php
-
 		-
 			rawMessage: Overwriting variable $column while changing its type from bool to string
 			identifier: shipmonk.variableTypeOverwritten
@@ -304,12 +298,6 @@ parameters:
 			count: 3
 			path: tests/Integration/FetchMutatorTest.php
 
-		-
-			rawMessage: 'Array key must be integer or string, but null given.'
-			identifier: shipmonk.unsafeArrayKey
-			count: 1
-			path: tests/Integration/FetchTest.php
-
 		-
 			rawMessage: Cannot assign offset 1 to Forrest79\PhPgSql\Db\Row.
 			identifier: offsetAssign.dimType

src/Fluent/Query.php

@@ -504,11 +504,11 @@ public function havingOr(array $conditions = []): Condition
 	private function getConditionParam(string $param, string|null $alias = null): Condition
 	{
 		if ($param === self::PARAM_ON_CONDITIONS) {
-			if (!isset($this->params[$param][$alias])) {
-				$this->params[$param][$alias] = Condition::createAnd();
+			if (!isset($this->params[$param][$alias ?? ''])) {
+				$this->params[$param][$alias ?? ''] = Condition::createAnd();
 			}
 
-			return $this->params[$param][$alias];
+			return $this->params[$param][$alias ?? ''];
 		} else if (($param === self::PARAM_WHERE) || ($param === self::PARAM_HAVING)) {
 			if ($this->params[$param] === null) {
 				$this->params[$param] = Condition::createAnd();

tests/Integration/FetchTest.php

@@ -332,7 +332,7 @@ public function testFetchAssocObjectAsNull(): void
 		$row = $result->fetchAssoc('test_column=id');
 
 		Tester\Assert::same('', \key($row));
-		Tester\Assert::same(1, $row[null]);
+		Tester\Assert::same(1, $row['']);
 
 		$result->free();
 	}