PHP: upgrade to v8.3 [WIP - readonly]

forrest79 · forrest79 · commit b6f05394c1f9 · 2025-08-24T23:26:06.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4']
       fail-fast: false
 
     services:
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: none
           tools: composer:v2
 
diff --git a/benchmarks/BasicPhpBenchmark.php b/benchmarks/BasicPhpBenchmark.php
@@ -8,13 +8,13 @@
 
 final class BasicPhpBenchmark extends BenchmarkCase
 {
-	private const CONDITION = 1;
-	private const ARRAY = [1];
-	private const NULL_ARRAY = null;
+	private const int CONDITION = 1;
+	private const array ARRAY = [1];
+	private const null NULL_ARRAY = null;
 
 	protected int $defaultRepeat = 1000000;
 
-	private const TEST_ARRAY = [1, 2, 3];
+	private const array TEST_ARRAY = [1, 2, 3];
 
 	private \Closure $updateFunction;
 
diff --git a/benchmarks/GetFieldTypesBenchmark.php b/benchmarks/GetFieldTypesBenchmark.php
@@ -8,7 +8,7 @@
 
 final class GetFieldTypesBenchmark extends BenchmarkCase
 {
-	private const COLUMNS = [
+	private const array COLUMNS = [
 		'col1' => 1,
 		'col2' => 2,
 		'col3' => 3,
diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
 		}
 	],
 	"require": {
-		"php": "^8.1",
-		"ext-pgsql": "^8.1"
+		"php": "^8.3",
+		"ext-pgsql": "^8.3"
 	},
 	"require-dev": {
 		"forrest79/phpcs": "^2.0",
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="PhpFpmRequest">
-	<rule ref="./vendor/forrest79/phpcs/Forrest79CodingStandard/ruleset.xml">
-		<exclude name="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint.MissingNativeTypeHint"/><!-- PHP 8.3+ -->
-	</rule>
+	<rule ref="./vendor/forrest79/phpcs/Forrest79CodingStandard/ruleset.xml"/>
 
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>
diff --git a/src/Db/DataTypeCaches/DbLoader.php b/src/Db/DataTypeCaches/DbLoader.php
@@ -6,7 +6,7 @@
 
 abstract class DbLoader implements Db\DataTypeCache
 {
-	private const LOAD_QUERY = 'SELECT oid, typname FROM pg_catalog.pg_type';
+	private const string LOAD_QUERY = 'SELECT oid, typname FROM pg_catalog.pg_type';
 
 
 	/**
diff --git a/src/Db/Exceptions/ConnectionException.php b/src/Db/Exceptions/ConnectionException.php
@@ -4,16 +4,16 @@
 
 class ConnectionException extends Exception
 {
-	public const NO_CONFIG = 1;
-	public const CANT_CHANGE_CONNECTION_CONFIG_WHEN_CONNECTED = 2;
-	public const CONNECTION_FAILED = 3;
-	public const BAD_CONNECTION = 4;
-	public const CANT_GET_NOTICES = 5;
-	public const ASYNC_CANCEL_FAILED = 6;
-	public const ASYNC_QUERY_SENT_FAILED = 7;
-	public const ASYNC_NO_QUERY_IS_SENT = 8;
-	public const ASYNC_NO_EXECUTE_IS_SENT = 9;
-	public const ASYNC_ANOTHER_QUERY_IS_RUNNING = 10;
+	public const int NO_CONFIG = 1;
+	public const int CANT_CHANGE_CONNECTION_CONFIG_WHEN_CONNECTED = 2;
+	public const int CONNECTION_FAILED = 3;
+	public const int BAD_CONNECTION = 4;
+	public const int CANT_GET_NOTICES = 5;
+	public const int ASYNC_CANCEL_FAILED = 6;
+	public const int ASYNC_QUERY_SENT_FAILED = 7;
+	public const int ASYNC_NO_QUERY_IS_SENT = 8;
+	public const int ASYNC_NO_EXECUTE_IS_SENT = 9;
+	public const int ASYNC_ANOTHER_QUERY_IS_RUNNING = 10;
 
 
 	public static function noConfig(): self
diff --git a/src/Db/Exceptions/DataTypeCacheException.php b/src/Db/Exceptions/DataTypeCacheException.php
@@ -4,7 +4,7 @@
 
 class DataTypeCacheException extends Exception
 {
-	public const CANT_LOAD_TYPES = 1;
+	public const int CANT_LOAD_TYPES = 1;
 
 
 	public static function cantLoadTypes(string $error): self
diff --git a/src/Db/Exceptions/DataTypeParserException.php b/src/Db/Exceptions/DataTypeParserException.php
@@ -4,10 +4,10 @@
 
 class DataTypeParserException extends Exception
 {
-	public const CANT_PARSE_TYPE = 1;
-	public const VALUE_IS_NOT_ARRAY = 2;
-	public const CANT_CONVERT_DATETIME = 3;
-	public const TRY_USE_CONVERT_TO_JSON = 4;
+	public const int CANT_PARSE_TYPE = 1;
+	public const int VALUE_IS_NOT_ARRAY = 2;
+	public const int CANT_CONVERT_DATETIME = 3;
+	public const int TRY_USE_CONVERT_TO_JSON = 4;
 
 
 	public static function cantParseType(string $type, string $value): self
diff --git a/src/Db/Exceptions/QueryException.php b/src/Db/Exceptions/QueryException.php
@@ -6,13 +6,13 @@
 
 class QueryException extends Exception
 {
-	public const QUERY_FAILED = 1;
-	public const ASYNC_QUERY_FAILED = 2;
-	public const PREPARED_STATEMENT_QUERY_FAILED = 3;
-	public const ASYNC_PREPARED_STATEMENT_QUERY_FAILED = 4;
-	public const CANT_PASS_PARAMS = 5;
-	public const MISSING_PARAM = 6;
-	public const EXTRA_PARAM = 7;
+	public const int QUERY_FAILED = 1;
+	public const int ASYNC_QUERY_FAILED = 2;
+	public const int PREPARED_STATEMENT_QUERY_FAILED = 3;
+	public const int ASYNC_PREPARED_STATEMENT_QUERY_FAILED = 4;
+	public const int CANT_PASS_PARAMS = 5;
+	public const int MISSING_PARAM = 6;
+	public const int EXTRA_PARAM = 7;
 
 	private Db\Query|null $query;
 
diff --git a/src/Db/Exceptions/ResultException.php b/src/Db/Exceptions/ResultException.php
@@ -6,16 +6,16 @@
 
 class ResultException extends Exception
 {
-	public const NO_COLUMN = 1;
-	public const COLUMN_NAME_IS_ALREADY_IN_USE = 2;
-	public const FETCH_ASSOC_BAD_DESCRIPTOR = 3;
-	public const FETCH_ASSOC_NO_COLUMN = 4;
-	public const FETCH_ASSOC_ONLY_SCALAR_AS_KEY = 5;
-	public const FETCH_PAIRS_BAD_COLUMNS = 6;
-	public const FETCH_PAIRS_ONLY_SCALAR_AS_KEY = 7;
-	public const FETCH_MUTATOR_BAR_RETURN_TYPE = 8;
-	public const NO_OTHER_ASYNC_RESULT = 9;
-	public const NO_OID_IN_DATA_TYPE_CACHE = 10;
+	public const int NO_COLUMN = 1;
+	public const int COLUMN_NAME_IS_ALREADY_IN_USE = 2;
+	public const int FETCH_ASSOC_BAD_DESCRIPTOR = 3;
+	public const int FETCH_ASSOC_NO_COLUMN = 4;
+	public const int FETCH_ASSOC_ONLY_SCALAR_AS_KEY = 5;
+	public const int FETCH_PAIRS_BAD_COLUMNS = 6;
+	public const int FETCH_PAIRS_ONLY_SCALAR_AS_KEY = 7;
+	public const int FETCH_MUTATOR_BAR_RETURN_TYPE = 8;
+	public const int NO_OTHER_ASYNC_RESULT = 9;
+	public const int NO_OID_IN_DATA_TYPE_CACHE = 10;
 
 
 	public static function noColumn(string $column): self
diff --git a/src/Db/Exceptions/RowException.php b/src/Db/Exceptions/RowException.php
@@ -4,8 +4,8 @@
 
 class RowException extends Exception
 {
-	public const NO_COLUMN = 1;
-	public const NOT_STRING_KEY = 2;
+	public const int NO_COLUMN = 1;
+	public const int NOT_STRING_KEY = 2;
 
 
 	public static function noColumn(string $column): self
diff --git a/src/Fluent/Condition.php b/src/Fluent/Condition.php
@@ -9,8 +9,8 @@
  */
 class Condition implements Db\Sql, \ArrayAccess
 {
-	public const TYPE_AND = 'AND';
-	public const TYPE_OR = 'OR';
+	public const string TYPE_AND = 'AND';
+	public const string TYPE_OR = 'OR';
 
 	private string $type;
 
diff --git a/src/Fluent/Exceptions/ConditionException.php b/src/Fluent/Exceptions/ConditionException.php
@@ -4,10 +4,10 @@
 
 class ConditionException extends Exception
 {
-	public const NO_PARENT = 1;
-	public const NO_QUERY = 2;
-	public const ONLY_STRING_CONDITION_CAN_HAVE_PARAMS = 3;
-	public const BAD_PARAMS_COUNT = 4;
+	public const int NO_PARENT = 1;
+	public const int NO_QUERY = 2;
+	public const int ONLY_STRING_CONDITION_CAN_HAVE_PARAMS = 3;
+	public const int BAD_PARAMS_COUNT = 4;
 
 
 	public static function noParent(): self
diff --git a/src/Fluent/Exceptions/QueryBuilderException.php b/src/Fluent/Exceptions/QueryBuilderException.php
@@ -4,22 +4,22 @@
 
 class QueryBuilderException extends Exception
 {
-	public const BAD_QUERY_TYPE = 1;
-	public const NO_COLUMNS_TO_SELECT = 2;
-	public const NO_ON_CONDITION = 3;
-	public const NO_DATA_TO_INSERT = 4;
-	public const NO_DATA_TO_UPDATE = 5;
-	public const DATA_CANT_CONTAIN_ARRAY = 6;
-	public const NO_MAIN_TABLE = 7;
-	public const NO_CORRESPONDING_TABLE = 8;
-	public const SELECT_ALL_COLUMNS_CANT_BE_COMBINED_WITH_CONCRETE_COLUMN_FOR_INSERT_SELECT_WITH_COLUMN_DETECTION = 9;
-	public const MERGE_NO_USING = 10;
-	public const MERGE_NO_WHEN = 11;
-	public const ON_CONFLICT_NO_DO = 12;
-	public const ON_CONFLICT_DO_WITHOUT_DEFINITION = 13;
-	public const ON_CONFLICT_DO_UPDATE_SET_SINGLE_COLUMN_CAN_BE_ONLY_STRING = 14;
-	public const MISSING_COLUMN_ALIAS = 15;
-	public const CANT_COMBINE_DISTINCT_AND_DISTINCT_ON = 16;
+	public const int BAD_QUERY_TYPE = 1;
+	public const int NO_COLUMNS_TO_SELECT = 2;
+	public const int NO_ON_CONDITION = 3;
+	public const int NO_DATA_TO_INSERT = 4;
+	public const int NO_DATA_TO_UPDATE = 5;
+	public const int DATA_CANT_CONTAIN_ARRAY = 6;
+	public const int NO_MAIN_TABLE = 7;
+	public const int NO_CORRESPONDING_TABLE = 8;
+	public const int SELECT_ALL_COLUMNS_CANT_BE_COMBINED_WITH_CONCRETE_COLUMN_FOR_INSERT_SELECT_WITH_COLUMN_DETECTION = 9;
+	public const int MERGE_NO_USING = 10;
+	public const int MERGE_NO_WHEN = 11;
+	public const int ON_CONFLICT_NO_DO = 12;
+	public const int ON_CONFLICT_DO_WITHOUT_DEFINITION = 13;
+	public const int ON_CONFLICT_DO_UPDATE_SET_SINGLE_COLUMN_CAN_BE_ONLY_STRING = 14;
+	public const int MISSING_COLUMN_ALIAS = 15;
+	public const int CANT_COMBINE_DISTINCT_AND_DISTINCT_ON = 16;
 
 
 	public static function badQueryType(string $type): self
diff --git a/src/Fluent/Exceptions/QueryException.php b/src/Fluent/Exceptions/QueryException.php
@@ -4,15 +4,15 @@
 
 class QueryException extends Exception
 {
-	public const ONLY_ONE_MAIN_TABLE = 1;
-	public const TABLE_ALIAS_ALREADY_EXISTS = 2;
-	public const NON_EXISTING_QUERY_PARAM = 3;
-	public const SQL_MUST_HAVE_ALIAS = 4;
-	public const PARAM_MUST_BE_SCALAR_OR_ENUM_OR_EXPRESSION = 5;
-	public const CANT_UPDATE_QUERY_AFTER_EXECUTE = 6;
-	public const YOU_MUST_EXECUTE_QUERY_BEFORE_THAT = 7;
-	public const MERGE_ONLY_ONE_USING = 8;
-	public const ON_CONFLICT_WHERE_NOT_FOR_CONSTRAINT = 9;
+	public const int ONLY_ONE_MAIN_TABLE = 1;
+	public const int TABLE_ALIAS_ALREADY_EXISTS = 2;
+	public const int NON_EXISTING_QUERY_PARAM = 3;
+	public const int SQL_MUST_HAVE_ALIAS = 4;
+	public const int PARAM_MUST_BE_SCALAR_OR_ENUM_OR_EXPRESSION = 5;
+	public const int CANT_UPDATE_QUERY_AFTER_EXECUTE = 6;
+	public const int YOU_MUST_EXECUTE_QUERY_BEFORE_THAT = 7;
+	public const int MERGE_ONLY_ONE_USING = 8;
+	public const int ON_CONFLICT_WHERE_NOT_FOR_CONSTRAINT = 9;
 
 
 	public static function onlyOneMainTable(): self
diff --git a/src/Fluent/Query.php b/src/Fluent/Query.php
diff --git a/src/Fluent/QueryBuilder.php b/src/Fluent/QueryBuilder.php
diff --git a/tests/Integration/DocsTest.php b/tests/Integration/DocsTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`final class GetFieldTypesBenchmark extends BenchmarkCase`
`10`	`10`	`{`
`11`		`- private const COLUMNS = [`
	`11`	`+ private const array COLUMNS = [`
`12`	`12`	`'col1' => 1,`
`13`	`13`	`'col2' => 2,`
`14`	`14`	`'col3' => 3,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`abstract class DbLoader implements Db\DataTypeCache`
`8`	`8`	`{`
`9`		`- private const LOAD_QUERY = 'SELECT oid, typname FROM pg_catalog.pg_type';`
	`9`	`+ private const string LOAD_QUERY = 'SELECT oid, typname FROM pg_catalog.pg_type';`
`10`	`10`
`11`	`11`
`12`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class DataTypeCacheException extends Exception`
`6`	`6`	`{`
`7`		`- public const CANT_LOAD_TYPES = 1;`
	`7`	`+ public const int CANT_LOAD_TYPES = 1;`
`8`	`8`
`9`	`9`
`10`	`10`	`public static function cantLoadTypes(string $error): self`