From 589e735d3351f4d19a4cf23d0e7ea92b5cfb0ba8 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:01:47 +0300 Subject: [PATCH 01/20] Update php81.yml --- .github/workflows/php81.yml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yml index a5bcffc..60dba96 100644 --- a/.github/workflows/php81.yml +++ b/.github/workflows/php81.yml @@ -10,27 +10,13 @@ env: PHP_VERSION: 8.1 jobs: test: - runs-on: "ubuntu-latest" - - name: "PHP 8.1 - Ubuntu-Latest" - - steps: - - name: Clone Repo - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ env.PHP_VERSION }} - extensions: mysqli, mbstring, sqlsrv - tools: phpunit:9.5.20, composer - - - name: Install Dependencies - run: composer install --prefer-source --no-interaction - - - name: Execute Tests - run: phpunit --configuration=tests/phpunit.xml - + uses: WebFiori/workflows/.github/workflows/php-tests.yml@main + with: + php-version: ${{ env.PHP_VERSION }} + + code-coverage: + runs-on: ubuntu-latest + steps: - name: CodeCov uses: codecov/codecov-action@v4 env: From b2f37dd36fdc26b77b70ce6dbfc68d9360709f0b Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:17:22 +0300 Subject: [PATCH 02/20] Update php81.yml --- .github/workflows/php81.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yml index 60dba96..538320f 100644 --- a/.github/workflows/php81.yml +++ b/.github/workflows/php81.yml @@ -21,3 +21,4 @@ jobs: uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + From 18085634a71fa8676edd1ead344aea5b5122bddd Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:18:43 +0300 Subject: [PATCH 03/20] Update php81.yml --- .github/workflows/php81.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yml index 538320f..4038464 100644 --- a/.github/workflows/php81.yml +++ b/.github/workflows/php81.yml @@ -10,7 +10,7 @@ env: PHP_VERSION: 8.1 jobs: test: - uses: WebFiori/workflows/.github/workflows/php-tests.yml@main + uses: WebFiori/workflows/.github/workflows/php-test.yml@main with: php-version: ${{ env.PHP_VERSION }} From 141cffc95c759d775d885411767774f2dc070df6 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:21:56 +0300 Subject: [PATCH 04/20] Update and rename php81.yml to php81.yaml --- .github/workflows/{php81.yml => php81.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{php81.yml => php81.yaml} (86%) diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yaml similarity index 86% rename from .github/workflows/php81.yml rename to .github/workflows/php81.yaml index 4038464..589f2d2 100644 --- a/.github/workflows/php81.yml +++ b/.github/workflows/php81.yaml @@ -10,7 +10,7 @@ env: PHP_VERSION: 8.1 jobs: test: - uses: WebFiori/workflows/.github/workflows/php-test.yml@main + uses: WebFiori/workflows/.github/workflows/php-test.yaml@main with: php-version: ${{ env.PHP_VERSION }} From 708f3558e2ee3595a5367741f55cec3aee31d097 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:25:35 +0300 Subject: [PATCH 05/20] Update php81.yaml From c862dc1fecb52c78c0290d7d25080ce3f66e2aa4 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:35:07 +0300 Subject: [PATCH 06/20] Update php81.yaml --- .github/workflows/php81.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/php81.yaml b/.github/workflows/php81.yaml index 589f2d2..9f9e983 100644 --- a/.github/workflows/php81.yaml +++ b/.github/workflows/php81.yaml @@ -5,14 +5,11 @@ on: branches: [ main ] pull_request: branches: [ main ] -env: - OPERATING_SYS: ubuntu-latest - PHP_VERSION: 8.1 jobs: test: uses: WebFiori/workflows/.github/workflows/php-test.yaml@main with: - php-version: ${{ env.PHP_VERSION }} + php-version: '8.1' code-coverage: runs-on: ubuntu-latest From 664c269d498347d8473ddb27ea890f76bab539f1 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 11:44:18 +0300 Subject: [PATCH 07/20] Update php81.yaml --- .github/workflows/php81.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php81.yaml b/.github/workflows/php81.yaml index 9f9e983..f889ca1 100644 --- a/.github/workflows/php81.yaml +++ b/.github/workflows/php81.yaml @@ -7,15 +7,17 @@ on: branches: [ main ] jobs: test: + name: Run Tests uses: WebFiori/workflows/.github/workflows/php-test.yaml@main with: php-version: '8.1' code-coverage: runs-on: ubuntu-latest + needs: test steps: - name: CodeCov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 5c60b3b5931ff46143d28b06cdc6c18b3394ac83 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 15:37:22 +0300 Subject: [PATCH 08/20] Update php81.yaml --- .github/workflows/php81.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php81.yaml b/.github/workflows/php81.yaml index f889ca1..38529d7 100644 --- a/.github/workflows/php81.yaml +++ b/.github/workflows/php81.yaml @@ -13,11 +13,12 @@ jobs: php-version: '8.1' code-coverage: - runs-on: ubuntu-latest + name: Coverage needs: test - steps: - - name: CodeCov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main + with: + php-version: '8.1' + coverage-file: 'php-8.1-coverage.xml' + + From 02117711d89f4844caf8085a4de912e9cae07b07 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 15:39:32 +0300 Subject: [PATCH 09/20] Update php81.yaml --- .github/workflows/php81.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/php81.yaml b/.github/workflows/php81.yaml index 38529d7..d641afd 100644 --- a/.github/workflows/php81.yaml +++ b/.github/workflows/php81.yaml @@ -19,6 +19,8 @@ jobs: with: php-version: '8.1' coverage-file: 'php-8.1-coverage.xml' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 53bfbefb839d2079e29d23a2f83fe96e0f2149dd Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 16:20:25 +0300 Subject: [PATCH 10/20] Update php83.yml --- .github/workflows/php83.yml | 53 ++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index cad6155..6e8bcbb 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -9,38 +9,31 @@ env: OPERATING_SYS: ubuntu-latest PHP_VERSION: 8.3 jobs: + test: - runs-on: "ubuntu-latest" + name: Run Tests + uses: WebFiori/workflows/.github/workflows/php-test.yaml@main + with: + php-version: '8.1' - name: "PHP 8.3 - Ubuntu-Latest" - - steps: - - name: Clone Repo - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ env.PHP_VERSION }} - extensions: mysqli, mbstring, sqlsrv - tools: phpunit:9.5.20, composer - - - name: Install Dependencies - run: composer install --prefer-source --no-interaction - - - name: Execute Tests - run: phpunit --configuration=tests/phpunit.xml - - - name: CodeCov - uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: SonarCloud Code Scan - uses: sonarsource/sonarqube-scan-action@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + code-coverage: + name: Coverage + needs: test + uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main + with: + php-version: '8.1' + coverage-file: 'php-8.1-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: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} release_prod: name: Prepare Production Release Branch / Publish Release From 02c27232bf593aa29693bbc1b71533f3bc217130 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 16:21:20 +0300 Subject: [PATCH 11/20] Update php83.yml --- .github/workflows/php83.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index 6e8bcbb..993de53 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -12,7 +12,7 @@ jobs: test: name: Run Tests - uses: WebFiori/workflows/.github/workflows/php-test.yaml@main + uses: WebFiori/workflows/.github/workflows/test-php.yaml@main with: php-version: '8.1' From 0c297834af3db697b85aecf8ea22d1aaa9a32e50 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 16:21:45 +0300 Subject: [PATCH 12/20] Update php81.yaml --- .github/workflows/php81.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php81.yaml b/.github/workflows/php81.yaml index d641afd..fead114 100644 --- a/.github/workflows/php81.yaml +++ b/.github/workflows/php81.yaml @@ -8,7 +8,7 @@ on: jobs: test: name: Run Tests - uses: WebFiori/workflows/.github/workflows/php-test.yaml@main + uses: WebFiori/workflows/.github/workflows/test-php.yaml@main with: php-version: '8.1' From d3d9e6e66d6e9f56cdd50eab986593a63b56f16e Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 16:23:12 +0300 Subject: [PATCH 13/20] Update php83.yml --- .github/workflows/php83.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index 993de53..ff19891 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -14,7 +14,7 @@ jobs: name: Run Tests uses: WebFiori/workflows/.github/workflows/test-php.yaml@main with: - php-version: '8.1' + php-version: '8.3' code-coverage: @@ -22,8 +22,8 @@ jobs: needs: test uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main with: - php-version: '8.1' - coverage-file: 'php-8.1-coverage.xml' + php-version: '8.3' + coverage-file: 'php-8.3-coverage.xml' secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -31,6 +31,8 @@ jobs: name: Code Quality needs: test uses: WebFiori/workflows/.github/workflows/quality-sonarcloud.yaml@main + with: + coverage-file: 'php-8.3-coverage.xml' secrets: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From aa7bc4ba93eca5d625009d6b7e3882b260766ba1 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 16:24:41 +0300 Subject: [PATCH 14/20] Update php83.yml --- .github/workflows/php83.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index ff19891..4b08a38 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -34,7 +34,6 @@ jobs: with: coverage-file: 'php-8.3-coverage.xml' secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} release_prod: From 1e17fcb950d42df3647aa5fc1815567c028f1c6a Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 23:55:00 +0300 Subject: [PATCH 15/20] Create phpunit10.xml --- tests/phpunit10.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/phpunit10.xml diff --git a/tests/phpunit10.xml b/tests/phpunit10.xml new file mode 100644 index 0000000..e6d09b3 --- /dev/null +++ b/tests/phpunit10.xml @@ -0,0 +1,28 @@ + + + + + + + + + ./WebFiori/Tests/Json + + + + + + ../WebFiori/Json + + + + + + + + + + From dedf8102ec46ecfb6d072d476a470a3aa5068198 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 23:55:29 +0300 Subject: [PATCH 16/20] Update composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d7950bf..b790d08 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ } }, "scripts":{ - "test": "phpunit --configuration tests/phpunit.xml" + "test": "phpunit --configuration tests/phpunit.xml", + "test-10": "phpunit --configuration tests/phpunit10.xml" }, "require-dev": { "phpunit/phpunit": "^10.0" From 53f2f3d99ca3a842957b4d170635fb5167897b80 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Mon, 28 Jul 2025 23:57:37 +0300 Subject: [PATCH 17/20] Update php83.yml --- .github/workflows/php83.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index 4b08a38..2407fe7 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -15,6 +15,7 @@ jobs: uses: WebFiori/workflows/.github/workflows/test-php.yaml@main with: php-version: '8.3' + phpunit-config: 'tests/phpunit10.xml' code-coverage: From 2c820f15125b84e3eaf6e250588006f86399d1c2 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 30 Jul 2025 01:19:24 +0300 Subject: [PATCH 18/20] Update php83.yml --- .github/workflows/php83.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml index 2407fe7..8ecb808 100644 --- a/.github/workflows/php83.yml +++ b/.github/workflows/php83.yml @@ -37,16 +37,9 @@ jobs: secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - release_prod: + release-prod: name: Prepare Production Release Branch / Publish Release - needs: - - "test" - runs-on: "ubuntu-latest" - if: github.ref == 'refs/heads/main' - steps: - - uses: actions/checkout@v4 - - uses: google-github-actions/release-please-action@v3 - with: - release-type: php - config-file: release-please-config.json - token: ${{ secrets.GITHUB_TOKEN }} + needs: [code-coverage, code-quality] + uses: WebFiori/workflows/.github/workflows/release-php.yaml@main + with: + branch: 'main' From c26b861310b6d01de34ac312b3066c084abdfa24 Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 30 Jul 2025 01:24:50 +0300 Subject: [PATCH 19/20] Update php82.yml --- .github/workflows/php82.yml | 41 ++++++++++++++----------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/php82.yml b/.github/workflows/php82.yml index 3757e10..145a921 100644 --- a/.github/workflows/php82.yml +++ b/.github/workflows/php82.yml @@ -5,33 +5,22 @@ on: branches: [ main, dev ] pull_request: branches: [ main ] -env: - OPERATING_SYS: ubuntu-latest - PHP_VERSION: 8.2 jobs: test: - runs-on: "ubuntu-latest" - - name: "PHP 8.2 - Ubuntu-Latest" + name: Run Tests + uses: WebFiori/workflows/.github/workflows/test-php.yaml@main + with: + php-version: '8.2' + + code-coverage: + name: Coverage + needs: test + uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main + with: + php-version: '8.2' + coverage-file: 'php-8.2-coverage.xml' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - steps: - - name: Clone Repo - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ env.PHP_VERSION }} - extensions: mysqli, mbstring, sqlsrv - tools: phpunit:9.5.20, composer - - - name: Install Dependencies - run: composer install --prefer-source --no-interaction - - - name: Execute Tests - run: phpunit --configuration=tests/phpunit.xml - - name: CodeCov - uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + From 9cbeff8cd1892610c494c37b9df6256e581f663a Mon Sep 17 00:00:00 2001 From: Ibrahim BinAlshikh Date: Wed, 30 Jul 2025 01:25:37 +0300 Subject: [PATCH 20/20] Update php84.yml --- .github/workflows/php84.yml | 44 +++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/.github/workflows/php84.yml b/.github/workflows/php84.yml index b9fc78e..282505e 100644 --- a/.github/workflows/php84.yml +++ b/.github/workflows/php84.yml @@ -5,36 +5,22 @@ on: branches: [ main, dev ] pull_request: branches: [ main ] -env: - OPERATING_SYS: ubuntu-latest - PHP_VERSION: 8.4 jobs: test: - runs-on: "ubuntu-latest" - - name: "PHP 8.4 - Ubuntu-Latest" + name: Run Tests + uses: WebFiori/workflows/.github/workflows/test-php.yaml@main + with: + php-version: '8.4' + + code-coverage: + name: Coverage + needs: test + uses: WebFiori/workflows/.github/workflows/coverage-codecov.yaml@main + with: + php-version: '8.4' + coverage-file: 'php-8.4-coverage.xml' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - steps: - - name: Clone Repo - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ env.PHP_VERSION }} - extensions: mysqli, mbstring, sqlsrv - tools: phpunit:9.5.20, composer - - - name: Shutdown Ubuntu MySQL - run: sudo service mysql stop - - - name: Install Dependencies - run: composer install --prefer-source --no-interaction - - - name: Execute Tests - run: phpunit --configuration=tests/phpunit.xml - - name: CodeCov - uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} +