php 8.1

Author: codemasher

.github/workflows/ci.yml

@@ -16,9 +16,15 @@ jobs:
 
   static-code-analysis:
     name: "Static Code Analysis"
-
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: true
+      matrix:
+        php-version:
+          - "8.1"
+          - "8.2"
+
     env:
       PHAN_ALLOW_XDEBUG: 0
       PHAN_DISABLE_XDEBUG_WARN: 1
@@ -30,20 +36,21 @@ jobs:
       - name: "Install PHP"
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "7.4"
+          php-version: ${{ matrix.php-version }}
           tools: pecl
           coverage: none
           extensions: ast, curl, json, simplexml, zlib
 
       - name: "Update dependencies with composer"
-        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-source
+        uses: ramsey/composer-install@v2
 
       - name: "Run phan"
-        run: php vendor/bin/phan
+        run: php vendor/bin/phan --target-php-version=${{ matrix.php-version }}
+
 
   build-docs:
     name: "Build and publish Docs"
-
+    if: github.ref_name == 'main'
     runs-on: ubuntu-latest
 
     steps:
@@ -62,15 +69,16 @@ jobs:
         run: phpdoc --config=phpdoc.xml
 
       - name: "Publish Docs to gh-pages"
-        uses: JamesIves/github-pages-deploy-action@v4.3.4
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           BRANCH: gh-pages
           FOLDER: docs
           CLEAN: true
 
+
   tests:
     name: "Unit Tests"
-
+    needs: static-code-analysis
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -80,9 +88,8 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
 
     steps:
 #      - name: "Configure git to avoid issues with line endings"
@@ -161,8 +168,8 @@ jobs:
           extensions: mbstring, odbc, pdo_odbc, mysqli, pdo_mysql, pgsql, pdo_pgsql, sqlite3, pdo_sqlite, sqlsrv, pdo_sqlsrv, pdo_firebird
 #          ini-values:
 
-      - name: "Install dependencies with composer"
-        run: composer update --no-ansi --no-interaction --no-progress --no-suggest --prefer-source
+      - name: "Update dependencies with composer"
+        uses: ramsey/composer-install@v2
 
       - name: "Run tests with phpunit"
         run: php vendor/phpunit/phpunit/phpunit --configuration=phpunit.xml.dist

.phan/config.php

@@ -14,7 +14,8 @@
 	// Note that the **only** effect of choosing `'5.6'` is to infer
 	// that functions removed in php 7.0 exist.
 	// (See `backward_compatibility_checks` for additional options)
-	'target_php_version' => '7.4',
+	'target_php_version' => null,
+	'minimum_target_php_version' => '8.1',
 
 	// A list of directories that should be parsed for class and
 	// method information. After excluding the directories

composer.json

@@ -4,7 +4,8 @@
 	"homepage": "https://github.com/chillerlan/php-database",
 	"license": "MIT",
 	"type": "library",
-	"minimum-stability": "stable",
+	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"keywords": [
 		"database", "query", "builder", "querybuilder", "driver", "mysql",
         "postgres", "mariadb", "firebird", "sqlite", "mssql"
@@ -21,19 +22,19 @@
 		"source": "https://github.com/chillerlan/php-database"
 	},
 	"require": {
-		"php": "^7.4 || ^8.0",
+		"php": "^8.1",
 		"ext-json": "*",
 		"ext-mbstring": "*",
-		"chillerlan/php-settings-container": "^2.1.4",
+		"chillerlan/php-settings-container": "^3.0",
 		"psr/simple-cache": "^1.0",
 		"psr/log": "^1.1 || ^2.0 || ^3.0"
 	},
 	"require-dev": {
 		"chillerlan/php-dotenv": "^2.1.2",
-		"chillerlan/php-cache": "^4.1",
-		"monolog/monolog": "^2.3",
-		"phan/phan": "^5.3",
-		"phpunit/phpunit": "^9.5"
+		"chillerlan/php-cache": "dev-main#fca6963aefb689b333c511e3807809b9f88e0c0d",
+		"monolog/monolog": "^3.3",
+		"phan/phan": "^5.4",
+		"phpunit/phpunit": "^10.0"
 	},
 	"autoload": {
 		"psr-4": {

phpunit.xml

@@ -1,23 +1,19 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheResultFile=".build/phpunit.result.cache"
          colors="true"
-         verbose="true"
 >
-	<coverage>
-		<include>
-			<directory suffix=".php">./src</directory>
-		</include>
-		<report>
-			<clover outputFile=".build/coverage/clover.xml"/>
-			<xml outputDirectory=".build/coverage/coverage-xml"/>
-		</report>
-	</coverage>
 	<testsuites>
 		<testsuite name="php-database test suite">
 			<directory suffix=".php">./tests</directory>
+			<!-- abstract classes because phpunit 10 -.- -->
+			<exclude>./tests/DBTestAbstract.php</exclude>
+			<exclude>./tests/Drivers/DriverTestAbstract.php</exclude>
+			<exclude>./tests/Drivers/PDODriverTestAbstract.php</exclude>
+			<exclude>./tests/Query/QueryTestAbstract.php</exclude>
+			<!-- excluded tests on CI -->
 			<exclude>./tests/Drivers/PDOFirebirdTest.php</exclude>
 			<exclude>./tests/Drivers/MSSqlSrvTest.php</exclude>
 			<exclude>./tests/Drivers/PDOMSSqlSrvTest.php</exclude>
@@ -31,6 +27,15 @@
 			<exclude>./tests/Query/PostgresTest.php</exclude>
 		</testsuite>
 	</testsuites>
+	<coverage>
+		<include>
+			<directory suffix=".php">./src</directory>
+		</include>
+		<report>
+			<clover outputFile=".build/coverage/clover.xml"/>
+			<xml outputDirectory=".build/coverage/coverage-xml"/>
+		</report>
+	</coverage>
 	<logging>
 		<junit outputFile=".build/logs/junit.xml"/>
 	</logging>