ci: Updated Workflows

.github/workflows/php81.yaml

@@ -1,10 +1,15 @@
-name: Build PHP 8.1
+name: PHP 8.1
 
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -104,7 +109,7 @@ jobs:
   code-coverage:
     name: Coverage
     needs: test
-    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main
+    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@v1.2.1
     with:
       php-version: '8.1'
       coverage-file: 'php-8.1-coverage.xml'

.github/workflows/php82.yml

@@ -1,11 +1,15 @@
-name: Build PHP 8.2
+name: PHP 8.2
 
 on:
   push:
     branches: [ main, dev ]
   pull_request:
     branches: [ main ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -105,7 +109,7 @@ jobs:
   code-coverage:
     name: Coverage
     needs: test
-    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main
+    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@v1.2.1
     with:
       php-version: '8.2'
       coverage-file: 'php-8.2-coverage.xml'

.github/workflows/php83.yml

@@ -1,11 +1,15 @@
-name: Build PHP 8.3
+name: PHP 8.3
 
 on:
   push:
     branches: [ main, dev ]
   pull_request:
     branches: [ main, dev ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -105,7 +109,7 @@ jobs:
   code-coverage:
     name: Coverage
     needs: test
-    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main
+    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@v1.2.1
     with:
       php-version: '8.3'
       coverage-file: 'php-8.3-coverage.xml'

.github/workflows/php84.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ main ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -106,23 +110,9 @@ jobs:
   code-coverage:
     name: Coverage
     needs: test
-    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main
+    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@v1.2.1
     with:
       php-version: '8.4'
       coverage-file: 'php-8.4-coverage.xml'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  code-quality:
-    name: Code Quality
-    needs: test
-    uses: WebFiori/workflows/.github/workflows/quality-sonarcloud.yaml@main
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-  release-prod:
-    name: Prepare Production Release Branch / Publish Release
-    needs: [code-coverage, code-quality]
-    uses: WebFiori/workflows/.github/workflows/release-php.yaml@main
-    with:
-      branch: 'main'

.github/workflows/php85.yml

@@ -0,0 +1,132 @@
+name: PHP 8.5
+
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    env:
+      SA_SQL_SERVER_PASSWORD: ${{ secrets.SA_SQL_SERVER_PASSWORD }}
+      MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+
+    services:
+      sqlserver:
+        image: mcr.microsoft.com/mssql/server:2019-latest
+        env:
+          SA_PASSWORD: ${{ secrets.SA_SQL_SERVER_PASSWORD }}
+          ACCEPT_EULA: Y
+          MSSQL_PID: Express
+        ports:
+          - "1433:1433"  
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+          MYSQL_DATABASE: testing_db
+          MYSQL_ROOT_HOST: '%'
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    strategy: 
+      fail-fast: true
+
+    name: Run PHPUnit Tests 
+
+    steps: 
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.5
+          extensions: mysqli, mbstring, sqlsrv
+          tools: phpunit:12.5.4, composer
+
+      - name: Install ODBC Driver for SQL Server
+        run: |
+          curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
+          curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          sudo apt update
+          sudo ACCEPT_EULA=Y apt install mssql-tools18 unixodbc-dev msodbcsql18
+
+      - name: Wait for SQL Server
+        run: |
+          for i in {1..12}; do
+            if /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P '${{ secrets.SA_SQL_SERVER_PASSWORD }}' -Q 'SELECT 1' -C > /dev/null 2>&1; then
+              echo "SQL Server is ready"
+              break
+            fi
+            echo "Waiting for SQL Server... ($i/12)"
+            sleep 10
+          done
+
+      - name: Create SQL Server Database
+        run: /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P '${{ secrets.SA_SQL_SERVER_PASSWORD }}' -Q 'create database testing_db' -C
+
+      - name: Setup MySQL Client
+        run: |
+          sudo apt update
+          sudo apt install mysql-client-core-8.0
+
+      - name: Wait for MySQL
+        run: |
+          until mysqladmin ping -h 127.0.0.1 --silent; do
+            echo 'waiting for mysql...'
+            sleep 1
+          done
+
+      - name: Create MySQL Database
+        run: |
+          mysql -h 127.0.0.1 -u root -p${{ secrets.MYSQL_ROOT_PASSWORD }} -e "CREATE DATABASE IF NOT EXISTS testing_db;"
+
+      - name: Install Dependencies
+        run: composer install --prefer-source --no-interaction
+
+      - name: Execute Tests
+        run: phpunit --configuration=tests/phpunit10.xml --coverage-clover=clover.xml
+
+      - name: Rename coverage report
+        run: |
+          mv clover.xml php-8.5-coverage.xml
+
+      - name: Upload Coverage Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: code-coverage
+          path: php-8.5-coverage.xml
+
+
+  code-coverage:
+    name: Coverage
+    needs: test
+    uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@v1.2.1
+    with:
+      php-version: '8.5'
+      coverage-file: 'php-8.5-coverage.xml'
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  code-quality:
+    name: Code Quality
+    needs: test
+    uses: WebFiori/workflows/.github/workflows/quality-sonarcloud.yaml@v1.2.1
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+  release-prod:
+    name: Prepare Production Release Branch / Publish Release
+    needs: [code-coverage, code-quality]
+    uses: WebFiori/workflows/.github/workflows/release-php.yaml@v1.2.1
+    with:
+      branch: 'main'

.gitignore

@@ -16,3 +16,4 @@ App/Config/*
 *.Identifier
 tests/clover.xml
 /.vscode
+/App

README.md

@@ -5,7 +5,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/WebFiori/framework/actions"><img src="https://github.com/WebFiori/framework/actions/workflows/php84.yml/badge.svg?branch=main"></a>
+  <a href="https://github.com/WebFiori/framework/actions"><img src="https://github.com/WebFiori/framework/actions/workflows/php85.yml/badge.svg?branch=main"></a>
   <a href="https://codecov.io/gh/WebFiori/framework">
     <img src="https://codecov.io/gh/WebFiori/framework/branch/main/graph/badge.svg" />
   </a>
@@ -34,7 +34,7 @@ WebFiori Framework is a mini web development framework which is built using PHP
 |<a target="_blank" href="https://github.com/WebFiori/framework/actions/workflows/php82.yml"><img src="https://github.com/WebFiori/framework/actions/workflows/php82.yml/badge.svg?branch=main"></a>|
 |<a target="_blank" href="https://github.com/WebFiori/framework/actions/workflows/php83.yml"><img src="https://github.com/WebFiori/framework/actions/workflows/php83.yml/badge.svg?branch=main"></a>|
 |<a target="_blank" href="https://github.com/WebFiori/framework/actions/workflows/php84.yml"><img src="https://github.com/WebFiori/framework/actions/workflows/php84.yml/badge.svg?branch=main"></a><br>|
-
+|<a target="_blank" href="https://github.com/WebFiori/framework/actions/workflows/php85.yml"><img src="https://github.com/WebFiori/framework/actions/workflows/php85.yml/badge.svg?branch=main"></a><br>|
 
 ## Key Features
 

WebFiori/Framework/App.php

@@ -384,11 +384,14 @@ public static function initiate(string $appFolder = 'App', string $publicFolder
              */
             define('PUBLIC_FOLDER', $publicFolder);
         }
-        if (!defined('WF_CORE_PATH')) {
+        if (!defined('WF_CORE_PATHS')) {
             /**
-             * Path to WebFiori's core library.
+             * Possible Paths to WebFiori's core library.
              */
-            define('WF_CORE_PATH', ROOT_PATH.DS.'vendor'.DS.'webfiori'.DS.'framework'.DS.'WebFiori'.DS.'Framework');
+            define('WF_CORE_PATHS', [
+                ROOT_PATH.DS.'vendor'.DS.'webfiori'.DS.'framework'.DS.'WebFiori'.DS.'Framework',
+                ROOT_PATH.DS.'WebFiori'.DS.'Framework'
+            ]);
         }
         self::initAutoLoader();
         self::checkStandardLibs();
@@ -649,20 +652,22 @@ private static function initAutoLoader() {
          * Initialize autoloader.
          */
         if (!class_exists('WebFiori\Framework\Autoload\ClassLoader',false)) {
-            $autoloader = WF_CORE_PATH.DIRECTORY_SEPARATOR.'Autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php';
-
-            if (!file_exists($autoloader)) {
-                throw new \Exception('Unable to locate the autoloader class.');
-            }
-            require_once $autoloader;
-        }
-        self::$AU = ClassLoader::get();
+            foreach (WF_CORE_PATHS as $path) {
+                $autoloader = $path.DIRECTORY_SEPARATOR.'Autoload'.DIRECTORY_SEPARATOR.'ClassLoader.php';
 
-        if (!class_exists(APP_DIR.'\\Init\\InitAutoLoad')) {
-            Ini::createAppDirs();
-            Ini::get()->createIniClass('InitAutoLoad', 'Add user-defined directories to the set of directories at which the framework will search for classes.');
+                if (file_exists($autoloader)) {
+                    require_once $autoloader;
+                    self::$AU = ClassLoader::get();
+                }
+                if (!class_exists(APP_DIR.'\\Init\\InitAutoLoad')) {
+                    Ini::createAppDirs();
+                    Ini::get()->createIniClass('InitAutoLoad', 'Add user-defined directories to the set of directories at which the framework will search for classes.');
+                }
+                self::call(APP_DIR.'\\Init\\InitAutoLoad::init');
+                return;
+            }
         }
-        self::call(APP_DIR.'\\Init\\InitAutoLoad::init');
+        throw new \Exception('Unable to locate the autoloader class.');
     }
     /**
      * Initialize global constants which has information about framework version.

WebFiori/Framework/Cli/Commands/CreateCommand.php

@@ -15,12 +15,17 @@
 use WebFiori\Framework\Cli\CLIUtils;
 use WebFiori\Framework\Cli\Helpers\ClassInfoReader;
 use WebFiori\Framework\Cli\Helpers\CreateAPITestCase;
+use WebFiori\Framework\Cli\Helpers\CreateAttributeTable;
 use WebFiori\Framework\Cli\Helpers\CreateBackgroundTask;
 use WebFiori\Framework\Cli\Helpers\CreateCLIClassHelper;
+use WebFiori\Framework\Cli\Helpers\CreateCleanArchStack;
 use WebFiori\Framework\Cli\Helpers\CreateDBAccessHelper;
+use WebFiori\Framework\Cli\Helpers\CreateDomainEntity;
 use WebFiori\Framework\Cli\Helpers\CreateFullRESTHelper;
 use WebFiori\Framework\Cli\Helpers\CreateMiddleware;
 use WebFiori\Framework\Cli\Helpers\CreateMigration;
+use WebFiori\Framework\Cli\Helpers\CreateRepository;
+use WebFiori\Framework\Cli\Helpers\CreateRestService;
 use WebFiori\Framework\Cli\Helpers\CreateTableObj;
 use WebFiori\Framework\Cli\Helpers\CreateThemeHelper;
 use WebFiori\Framework\Cli\Helpers\CreateWebService;
@@ -82,11 +87,20 @@ public function exec() : int {
         } else if ($answer == 'Database table class.') {
             $create = new CreateTableObj($this);
             $create->readClassInfo();
+        } else if ($answer == 'Attribute-based table schema (Clean Architecture).') {
+            $create = new CreateAttributeTable($this);
+            $create->writeClass();
         } else if ($answer == 'Entity class from table.') {
             $this->createEntityFromQuery();
+        } else if ($answer == 'Pure domain entity (Clean Architecture).') {
+            $create = new CreateDomainEntity($this);
+            $create->writeClass();
         } else if ($answer == 'Web service.') {
             $create = new CreateWebService($this);
             $create->readClassInfo();
+        } else if ($answer == 'Annotation-based REST service (Clean Architecture).') {
+            $create = new CreateRestService($this);
+            $create->writeClass();
         } else if ($answer == 'Middleware.') {
             $create = new CreateMiddleware($this);
             $create->readClassInfo();
@@ -108,6 +122,12 @@ public function exec() : int {
             $create->readEntityInfo();
             $create->confirnIncludeColsUpdate();
             $create->writeClass();
+        } else if ($answer == 'Repository class (Clean Architecture).') {
+            $create = new CreateRepository($this);
+            $create->writeClass();
+        } else if ($answer == 'Complete clean architecture stack (Entity + Table + Repository).') {
+            $create = new CreateCleanArchStack($this);
+            return $create->writeClasses();
         } else if ($answer == 'Complete REST backend (Database table, entity, database access and web services).') {
             $create = new CreateFullRESTHelper($this);
             $create->readInfo();
@@ -127,13 +147,18 @@ public function exec() : int {
     private function getWhat() {
         $options = [];
         $options['table'] = 'Database table class.';
+        $options['table-attributes'] = 'Attribute-based table schema (Clean Architecture).';
         $options['entity'] = 'Entity class from table.';
+        $options['domain-entity'] = 'Pure domain entity (Clean Architecture).';
         $options['web-service'] = 'Web service.';
+        $options['rest-service'] = 'Annotation-based REST service (Clean Architecture).';
         $options['task'] = 'Background Task.';
         $options['middleware'] = 'Middleware.';
         $options['command'] = 'CLI Command.';
         $options['theme'] = 'Theme.';
         $options['db'] = 'Database access class based on table.';
+        $options['repository'] = 'Repository class (Clean Architecture).';
+        $options['clean-stack'] = 'Complete clean architecture stack (Entity + Table + Repository).';
         $options['rest'] = 'Complete REST backend (Database table, entity, database access and web services).';
         $options['api-test'] = 'Web service test case.';
         $options['migration'] = 'Database migration.';