Merge branch 'new' into 3.2.x

Author: natanfelles

.editorconfig

@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{md, rst}]
+[*.{md,rst}]
 trim_trailing_whitespace = false
 
 [*.yml]

.github/workflows/tests.yml

@@ -63,7 +63,7 @@ jobs:
       - name: PHPUnit
         env:
           DB_HOST: 127.0.0.1
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Upload coverage results to Coveralls
         env:
@@ -74,7 +74,7 @@ jobs:
           composer global require php-coveralls/php-coveralls
           php-coveralls --coverage_clover=build/logs/clover.xml -v
 
-  mariadb-last:
+  mariadb-latest:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
 
@@ -93,7 +93,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    name: PHP 8.2 - MariaDB - Last
+    name: PHP Latest - MariaDB
 
     steps:
       - name: Checkout
@@ -102,7 +102,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: latest
           ini-values: mysqli.allow_local_infile=On
           tools: composer
           coverage: xdebug
@@ -114,7 +114,7 @@ jobs:
       - name: PHPUnit
         env:
           DB_HOST: 127.0.0.1
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
   mysql:
     runs-on: ubuntu-20.04
@@ -155,9 +155,9 @@ jobs:
         env:
           DB_HOST: 127.0.0.1
           DB_IMAGE: mysql
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
-  mysql-last:
+  mysql-latest:
     runs-on: ubuntu-20.04
     timeout-minutes: 10
 
@@ -174,7 +174,7 @@ jobs:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    name: PHP 8.2 - MySQL - Last
+    name: PHP Latest - MySQL
 
     steps:
       - name: Checkout
@@ -183,7 +183,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: latest
           ini-values: mysqli.allow_local_infile=On
           tools: composer
           coverage: xdebug
@@ -196,4 +196,4 @@ jobs:
         env:
           DB_HOST: 127.0.0.1
           DB_IMAGE: mysql
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit

.gitignore

@@ -4,6 +4,7 @@ build/
 raw-tests/
 vendor/
 .php-cs-fixer.cache
+.phpunit.cache
 .phpunit.result.cache
 composer.lock
 composer.phar

.gitlab-ci.yml

@@ -36,8 +36,8 @@ test:php:
       - build/docs/
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
-test:php-last:
-  image: registry.gitlab.com/aplus-framework/images/base:3
+test:php-latest:
+  image: registry.gitlab.com/aplus-framework/images/base:latest
   stage: test
   timeout: 10 minutes
   cache:
@@ -80,8 +80,8 @@ test:php:mysql:
     - vendor/bin/phpunit --colors=never
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
-test:php:mysql-last:
-  image: registry.gitlab.com/aplus-framework/images/base:3
+test:php:mysql-latest:
+  image: registry.gitlab.com/aplus-framework/images/base:latest
   stage: test
   timeout: 10 minutes
   cache:

composer.json

@@ -40,12 +40,12 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^1.14",
+        "aplus/coding-standard": "^2.1",
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

docker-compose.yml

@@ -10,9 +10,9 @@ services:
       - mariadb
       - mysql
     tty: true
-  package-last:
-    image: registry.gitlab.com/aplus-framework/images/package:3
-    container_name: package-database-last
+  package-latest:
+    image: registry.gitlab.com/aplus-framework/images/package:latest
+    container_name: package-database-latest
     working_dir: /package
     volumes:
       - .:/package

phpunit.xml.dist

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
-         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false"
+         bootstrap="vendor/autoload.php" colors="true" stopOnError="false"
          stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+    <coverage>
         <report>
             <clover outputFile="build/coverage/clover.xml"/>
             <html outputDirectory="build/coverage"/>
@@ -27,4 +24,9 @@
         <env name="DB_SCHEMA" value="framework-tests"/>
         <env name="XDEBUG_MODE" value="coverage"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>

src/Database.php

@@ -85,8 +85,10 @@ class Database
      * @throws mysqli_sql_exception if connections fail
      */
     public function __construct(
-        #[SensitiveParameter] array | string $username,
-        #[SensitiveParameter] string $password = null,
+        #[SensitiveParameter]
+        array | string $username,
+        #[SensitiveParameter]
+        string $password = null,
         string $schema = null,
         string $host = 'localhost',
         int $port = 3306,
@@ -175,13 +177,15 @@ protected function makeConfig(array $config) : array
      * @return static
      */
     protected function connect(
-        #[SensitiveParameter] array | string $username,
-        #[SensitiveParameter] string $password = null,
+        #[SensitiveParameter]
+        array | string $username,
+        #[SensitiveParameter]
+        string $password = null,
         string $schema = null,
         string $host = 'localhost',
         int $port = 3306
     ) : static {
-        if ( ! \is_array($username)) {
+        if (!\is_array($username)) {
             $username = [
                 'host' => $host,
                 'port' => $port,
@@ -285,7 +289,7 @@ public function isOpen() : bool
      */
     public function close() : bool
     {
-        if ( ! $this->isOpen()) {
+        if (!$this->isOpen()) {
             return true;
         }
         $closed = $this->mysqli->close();
@@ -633,7 +637,8 @@ public function exec(#[Language('SQL')] string $statement) : int | string
      * @return Result
      */
     public function query(
-        #[Language('SQL')] string $statement,
+        #[Language('SQL')]
+        string $statement,
         bool $buffered = true
     ) : Result {
         $this->lastQuery = $statement;

src/Debug/DatabaseCollector.php

@@ -72,12 +72,12 @@ public function getActivities() : array
     public function getContents() : string
     {
         \ob_start();
-        if ( ! isset($this->database)) {
+        if (!isset($this->database)) {
             echo '<p>This collector has not been added to a Database instance.</p>';
             return \ob_get_clean(); // @phpstan-ignore-line
         }
         echo $this->showHeader();
-        if ( ! $this->hasData()) {
+        if (!$this->hasData()) {
             echo '<p>Did not run statements.</p>';
             return \ob_get_clean(); // @phpstan-ignore-line
         }

src/Definition/AlterSchema.php

@@ -34,7 +34,7 @@ public function schema(string $schemaName) : static
 
     protected function renderSchema() : ?string
     {
-        if ( ! isset($this->sql['schema'])) {
+        if (!isset($this->sql['schema'])) {
             return null;
         }
         $schema = $this->sql['schema'];
@@ -57,7 +57,7 @@ public function charset(string $charset) : static
 
     protected function renderCharset() : ?string
     {
-        if ( ! isset($this->sql['charset'])) {
+        if (!isset($this->sql['charset'])) {
             return null;
         }
         $charset = $this->database->quote($this->sql['charset']);
@@ -77,7 +77,7 @@ public function collate(string $collation) : static
 
     protected function renderCollate() : ?string
     {
-        if ( ! isset($this->sql['collation'])) {
+        if (!isset($this->sql['collation'])) {
             return null;
         }
         $collation = $this->database->quote($this->sql['collation']);
@@ -95,7 +95,7 @@ public function upgrade() : static
 
     protected function renderUpgrade() : ?string
     {
-        if ( ! isset($this->sql['upgrade'])) {
+        if (!isset($this->sql['upgrade'])) {
             return null;
         }
         if (isset($this->sql['charset']) || isset($this->sql['collation'])) {
@@ -108,9 +108,9 @@ protected function renderUpgrade() : ?string
 
     protected function checkSpecifications() : void
     {
-        if ( ! isset($this->sql['charset'])
-            && ! isset($this->sql['collation'])
-            && ! isset($this->sql['upgrade'])
+        if (!isset($this->sql['charset'])
+            && !isset($this->sql['collation'])
+            && !isset($this->sql['upgrade'])
         ) {
             throw new LogicException(
                 'ALTER SCHEMA must have a specification'