Skip to content

Commit 0b24db0

Browse files
usernaneusernane
authored
Merge pull request #47 from WebFiori/dev
Dev
2 parents 4c5fe72 + c7ae980 commit 0b24db0

26 files changed

Lines changed: 950 additions & 798 deletions

‎.github/workflows/php80.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/php81.yml‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@ name: Build PHP 8.1
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
8-
7+
branches: [ main ]
8+
env:
9+
OPERATING_SYS: ubuntu-latest
10+
PHP_VERSION: 8.1
911
jobs:
1012
test:
11-
runs-on: ${{ matrix.os }}
12-
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [8.1]
13+
runs-on: "ubuntu-latest"
1814

19-
name: PHP${{matrix.php}} - ${{matrix.os}}
15+
name: "PHP 8.1 - Ubuntu-Latest"
2016

2117
steps:
2218
- name: Clone Repo
@@ -25,19 +21,17 @@ jobs:
2521
- name: Setup PHP
2622
uses: shivammathur/setup-php@v2
2723
with:
28-
php-version: ${{ matrix.php }}
24+
php-version: ${{ env.PHP_VERSION }}
2925
extensions: mysqli, mbstring, sqlsrv
3026
tools: phpunit:9.5.20, composer
3127

32-
3328
- name: Install Dependencies
34-
run: composer install --prefer-source --no-interaction --no-dev
29+
run: composer install --prefer-source --no-interaction
3530

3631
- name: Execute Tests
37-
run: phpunit
32+
run: phpunit --configuration=tests/phpunit.xml
3833

3934
- name: CodeCov
4035
uses: codecov/codecov-action@v4
4136
env:
42-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
43-
37+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/php82.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@ name: Build PHP 8.2
22

33
on:
44
push:
5-
branches: [ master, dev ]
5+
branches: [ main, dev ]
66
pull_request:
7-
branches: [ master ]
8-
7+
branches: [ main ]
8+
env:
9+
OPERATING_SYS: ubuntu-latest
10+
PHP_VERSION: 8.2
911
jobs:
1012
test:
11-
runs-on: ${{ matrix.os }}
12-
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [8.2]
13+
runs-on: "ubuntu-latest"
1814

19-
name: PHP${{matrix.php}} - ${{matrix.os}}
15+
name: "PHP 8.2 - Ubuntu-Latest"
2016

2117
steps:
2218
- name: Clone Repo
@@ -25,17 +21,17 @@ jobs:
2521
- name: Setup PHP
2622
uses: shivammathur/setup-php@v2
2723
with:
28-
php-version: ${{ matrix.php }}
24+
php-version: ${{ env.PHP_VERSION }}
2925
extensions: mysqli, mbstring, sqlsrv
3026
tools: phpunit:9.5.20, composer
3127

3228
- name: Install Dependencies
33-
run: composer install --prefer-source --no-interaction --no-dev
29+
run: composer install --prefer-source --no-interaction
3430

3531
- name: Execute Tests
36-
run: phpunit
32+
run: phpunit --configuration=tests/phpunit.xml
3733

3834
- name: CodeCov
3935
uses: codecov/codecov-action@v4
4036
env:
41-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
37+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/php83.yml‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@ name: Build PHP 8.3
22

33
on:
44
push:
5-
branches: [ master, dev ]
5+
branches: [ main, dev ]
66
pull_request:
7-
branches: [ master, dev ]
8-
7+
branches: [ main, dev ]
8+
env:
9+
OPERATING_SYS: ubuntu-latest
10+
PHP_VERSION: 8.3
911
jobs:
1012
test:
11-
runs-on: ${{ matrix.os }}
12-
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [8.3]
13+
runs-on: "ubuntu-latest"
1814

19-
name: PHP${{matrix.php}} - ${{matrix.os}}
15+
name: "PHP 8.3 - Ubuntu-Latest"
2016

2117
steps:
2218
- name: Clone Repo
@@ -25,23 +21,23 @@ jobs:
2521
- name: Setup PHP
2622
uses: shivammathur/setup-php@v2
2723
with:
28-
php-version: ${{ matrix.php }}
24+
php-version: ${{ env.PHP_VERSION }}
2925
extensions: mysqli, mbstring, sqlsrv
3026
tools: phpunit:9.5.20, composer
3127

3228
- name: Install Dependencies
33-
run: composer install --prefer-source --no-interaction --no-dev
29+
run: composer install --prefer-source --no-interaction
3430

3531
- name: Execute Tests
36-
run: phpunit
32+
run: phpunit --configuration=tests/phpunit.xml
3733

3834
- name: CodeCov
3935
uses: codecov/codecov-action@v4
4036
env:
4137
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4238

4339
- name: SonarCloud Code Scan
44-
uses: sonarsource/sonarqube-scan-action@v4
40+
uses: sonarsource/sonarqube-scan-action@v5
4541
env:
4642
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4743
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -50,8 +46,8 @@ jobs:
5046
name: Prepare Production Release Branch / Publish Release
5147
needs:
5248
- "test"
53-
runs-on: ubuntu-latest
54-
if: github.ref == 'refs/heads/master'
49+
runs-on: "ubuntu-latest"
50+
if: github.ref == 'refs/heads/main'
5551
steps:
5652
- uses: actions/checkout@v4
5753
- uses: google-github-actions/release-please-action@v3

‎.github/workflows/php84.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@ name: Build PHP 8.4
22

33
on:
44
push:
5-
branches: [ master, dev ]
5+
branches: [ main, dev ]
66
pull_request:
7-
branches: [ master ]
8-
7+
branches: [ main ]
8+
env:
9+
OPERATING_SYS: ubuntu-latest
10+
PHP_VERSION: 8.4
911
jobs:
1012
test:
11-
runs-on: ${{ matrix.os }}
12-
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [8.4]
13+
runs-on: "ubuntu-latest"
1814

19-
name: PHP${{matrix.php}} - ${{matrix.os}}
15+
name: "PHP 8.4 - Ubuntu-Latest"
2016

2117
steps:
2218
- name: Clone Repo
@@ -25,20 +21,20 @@ jobs:
2521
- name: Setup PHP
2622
uses: shivammathur/setup-php@v2
2723
with:
28-
php-version: ${{ matrix.php }}
24+
php-version: ${{ env.PHP_VERSION }}
2925
extensions: mysqli, mbstring, sqlsrv
3026
tools: phpunit:9.5.20, composer
3127

3228
- name: Shutdown Ubuntu MySQL
3329
run: sudo service mysql stop
3430

3531
- name: Install Dependencies
36-
run: composer install --prefer-source --no-interaction --no-dev
32+
run: composer install --prefer-source --no-interaction
3733

3834
- name: Execute Tests
39-
run: phpunit
35+
run: phpunit --configuration=tests/phpunit.xml
4036

4137
- name: CodeCov
4238
uses: codecov/codecov-action@v4
4339
env:
44-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
40+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ clover.xml
88
vendor/*
99
composer.lock
1010
.php-cs-fixer.cache
11+
json-output/json-file.json

0 commit comments

Comments
 (0)