Merge branch 'refs/heads/2.x' into development

Author: natanfelles

.github/workflows/tests.yml

@@ -11,9 +11,6 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
 
-    strategy:
-      fail-fast: true
-
     services:
       mariadb:
         image: mariadb
@@ -26,16 +23,16 @@ 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.1 - MariaDB
+    name: PHP 8.3 - MariaDB
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
           ini-values: mysqli.allow_local_infile=On
           tools: composer
           coverage: xdebug
@@ -78,9 +75,6 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
 
-    strategy:
-      fail-fast: true
-
     services:
       mariadb:
         image: mariadb
@@ -97,7 +91,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 ---
-image: registry.gitlab.com/aplus-framework/images/base:2
+image: registry.gitlab.com/aplus-framework/images/base:4
 
 include:
   - template: Security/SAST.gitlab-ci.yml

composer.json

@@ -29,13 +29,13 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "aplus/mvc": "^3.0"
+        "php": ">=8.3",
+        "aplus/mvc": "^4.0"
     },
     "require-dev": {
         "ext-xdebug": "*",
         "aplus/coding-standard": "^2.1",
-        "aplus/testing": "^2.0",
+        "aplus/testing": "^3.0",
         "ergebnis/composer-normalize": "^2.26",
         "phpmd/phpmd": "^2.12",
         "phpstan/phpstan": "^1.7"

docker-compose.yml

@@ -1,8 +1,8 @@
 version: "3"
 services:
   package:
-    image: registry.gitlab.com/aplus-framework/images/package:2
-    container_name: package-cli-commands
+    image: registry.gitlab.com/aplus-framework/images/package:4
+    container_name: package-dev-commands
     working_dir: /package
     volumes:
       - .:/package
@@ -11,7 +11,7 @@ services:
     tty: true
   package-latest:
     image: registry.gitlab.com/aplus-framework/images/package:latest
-    container_name: package-cli-commands-latest
+    container_name: package-dev-commands-latest
     working_dir: /package
     volumes:
       - .:/package

src/AbstractMigration.php

@@ -21,6 +21,7 @@
 abstract class AbstractMigration extends Command
 {
     protected string $migratorInstance = 'default';
+    protected string $group = 'Migrations';
 
     protected function runMigration(string $direction, int | string $arg = null) : void
     {
@@ -33,16 +34,16 @@ protected function runMigration(string $direction, int | string $arg = null) : v
         }
         $method = 'migrate' . $direction;
         CLI::write(
-            CLI::style('Migrator Instance:', CLI::FG_YELLOW, formats: [CLI::FM_BOLD])
+            CLI::style('Migrator Instance:', 'yellow', formats: ['bold'])
             . ' ' . $this->migratorInstance
         );
         CLI::newLine();
         $count = 0;
         $time = $start = \microtime(true);
         // @phpstan-ignore-next-line
         foreach (App::migrator($this->migratorInstance)->{$method}($arg) as $item) {
-            CLI::write('- Migrated to ' . CLI::style($item, CLI::FG_GREEN)
-                . ' in ' . CLI::style((string) \round(\microtime(true) - $time, 6), CLI::FG_YELLOW) . ' seconds.');
+            CLI::write('- Migrated to ' . CLI::style($item, 'green')
+                . ' in ' . CLI::style((string) \round(\microtime(true) - $time, 6), 'yellow') . ' seconds.');
             $time = \microtime(true);
             $count++;
         }

src/DatabaseCommand.php

@@ -25,6 +25,7 @@ abstract class DatabaseCommand extends Command
     protected array $options = [
         '--instance' => 'Database instance name.',
     ];
+    protected string $group = 'Database';
 
     public function setDatabase() : static
     {

src/MakeRoutes.php

@@ -30,6 +30,7 @@ class MakeRoutes extends Command
         '-o' => 'Overwrite the file if it exists.',
         '-s' => 'Show file contents.',
     ];
+    protected string $group = 'Routing';
 
     public function run() : void
     {

src/MigrationVersion.php

@@ -22,6 +22,7 @@ class MigrationVersion extends Command
 {
     protected string $description = 'Shows last migration version name.';
     protected string $migratorInstance = 'default';
+    protected string $group = 'Migrations';
 
     public function run() : void
     {

src/Routes.php

@@ -24,6 +24,7 @@ class Routes extends Command
     protected string $description = 'Shows routes list.';
     protected string $usage = 'routes [options]';
     protected string $routerInstance = 'default';
+    protected string $group = 'Routing';
 
     public function run() : void
     {
@@ -32,15 +33,15 @@ public function run() : void
             $this->routerInstance = $instance;
         }
         CLI::write(
-            CLI::style('Router Instance:', CLI::FG_YELLOW, formats: [CLI::FM_BOLD])
+            CLI::style('Router Instance:', 'yellow', formats: ['bold'])
             . ' ' . $this->routerInstance
         );
         CLI::newLine();
         $data = $this->collectData();
         $count = \count($data);
         $this->showCollectionsSet($count);
         foreach ($data as $index => $collection) {
-            CLI::write(CLI::style('Route Collection ' . ($index + 1), CLI::FG_YELLOW, formats: [CLI::FM_BOLD]));
+            CLI::write(CLI::style('Route Collection ' . ($index + 1), 'yellow', formats: ['bold']));
             $this->writeHeader('Origin', $collection['origin']);
             if (isset($collection['name'])) {
                 $this->writeHeader('Name', $collection['name']);
@@ -64,21 +65,21 @@ public function run() : void
     protected function showCollectionsSet(int $count) : void
     {
         if ($count === 0) {
-            CLI::write('No Route Collection has been set.', CLI::FG_RED);
+            CLI::write('No Route Collection has been set.', 'red');
             return;
         }
         $plural = $count > 1;
         CLI::write(
             'There ' . ($plural ? 'are' : 'is') . ' ' . $count
             . ' Route Collection' . ($plural ? 's' : '') . ' set:',
-            CLI::FG_GREEN
+            'green'
         );
         CLI::newLine();
     }
 
     protected function writeHeader(string $field, string $value) : void
     {
-        CLI::write(CLI::style($field . ':', formats: [CLI::FM_BOLD]) . ' ' . $value);
+        CLI::write(CLI::style($field . ':', formats: ['bold']) . ' ' . $value);
     }
 
     /**

src/Seed.php

@@ -28,13 +28,14 @@ class Seed extends Command
     protected array $options = [
         '--instance' => 'Database instance name.',
     ];
+    protected string $group = 'Database';
 
     public function run() : void
     {
         // @phpstan-ignore-next-line
         $this->databaseInstance = $this->getConsole()->getOption('instance') ?? 'default';
         CLI::write(
-            CLI::style('Database Instance:', CLI::FG_YELLOW, formats: [CLI::FM_BOLD])
+            CLI::style('Database Instance:', 'yellow', formats: ['bold'])
             . ' ' . $this->databaseInstance
         );
         CLI::newLine();