Skip to content

Commit f08ce8c

Browse files
usernaneusernane
authored
Merge pull request #42 from WebFiori/refactoring
Refactoring
2 parents 7bd1f82 + 538cdeb commit f08ce8c

15 files changed

Lines changed: 79 additions & 203 deletions

File tree

‎.github/workflows/php71.yml‎

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

‎.github/workflows/php72.yml‎

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

‎.github/workflows/php73.yml‎

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

‎.github/workflows/php74.yml‎

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

‎.github/workflows/php80.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Clone Repo
22-
uses: actions/checkout@v1
22+
uses: actions/checkout@v4
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -28,8 +28,6 @@ jobs:
2828
extensions: mysqli, mbstring, sqlsrv
2929
tools: phpunit:8.5.13
3030

31-
- name: Shutdown Ubuntu MySQL
32-
run: sudo service mysql stop
3331

3432
- name: Install Dependencies
3533
run: composer install --prefer-source --no-interaction --no-dev
@@ -38,4 +36,6 @@ jobs:
3836
run: phpunit
3937

4038
- name: CodeCov
41-
uses: codecov/codecov-action@v1
39+
uses: codecov/codecov-action@v4
40+
env:
41+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/php81.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Clone Repo
23-
uses: actions/checkout@v1
23+
uses: actions/checkout@v4
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -37,10 +37,7 @@ jobs:
3737
run: phpunit
3838

3939
- name: CodeCov
40-
uses: codecov/codecov-action@v1
41-
42-
- name: SonarCloud
43-
uses: SonarSource/sonarcloud-github-action@master
40+
uses: codecov/codecov-action@v4
4441
env:
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
42+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
43+

‎.github/workflows/php82.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@ jobs:
2020

2121
steps:
2222
- name: Clone Repo
23-
uses: actions/checkout@v1
23+
uses: actions/checkout@v4
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
2727
with:
2828
php-version: ${{ matrix.php }}
2929
extensions: mysqli, mbstring, sqlsrv
3030
tools: phpunit:9.5.20, composer
31-
32-
- name: Shutdown Ubuntu MySQL
33-
run: sudo service mysql stop
3431

3532
- name: Install Dependencies
3633
run: composer install --prefer-source --no-interaction --no-dev
@@ -39,4 +36,6 @@ jobs:
3936
run: phpunit
4037

4138
- name: CodeCov
42-
uses: codecov/codecov-action@v1
39+
uses: codecov/codecov-action@v4
40+
env:
41+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/php83.yml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ master, dev ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, dev ]
88

99
jobs:
1010
test:
@@ -20,17 +20,14 @@ jobs:
2020

2121
steps:
2222
- name: Clone Repo
23-
uses: actions/checkout@v1
23+
uses: actions/checkout@v4
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
2727
with:
2828
php-version: ${{ matrix.php }}
2929
extensions: mysqli, mbstring, sqlsrv
3030
tools: phpunit:9.5.20, composer
31-
32-
- name: Shutdown Ubuntu MySQL
33-
run: sudo service mysql stop
3431

3532
- name: Install Dependencies
3633
run: composer install --prefer-source --no-interaction --no-dev
@@ -39,4 +36,26 @@ jobs:
3936
run: phpunit
4037

4138
- name: CodeCov
42-
uses: codecov/codecov-action@v1
39+
uses: codecov/codecov-action@v4
40+
env:
41+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
42+
43+
- name: SonarCloud Code Scan
44+
uses: sonarsource/sonarqube-scan-action@v4
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
48+
49+
release_prod:
50+
name: Prepare Production Release Branch / Publish Release
51+
needs:
52+
- "test"
53+
runs-on: ubuntu-latest
54+
if: github.ref == 'refs/heads/master'
55+
steps:
56+
- uses: actions/checkout@v4
57+
- uses: google-github-actions/release-please-action@v3
58+
with:
59+
release-type: php
60+
config-file: release-please-config.json
61+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/php70.yml renamed to .github/workflows/php84.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
1-
name: Build PHP 7.0
1+
name: Build PHP 8.4
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, dev ]
66
pull_request:
77
branches: [ master ]
88

99
jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
12-
12+
1313
strategy:
1414
fail-fast: true
1515
matrix:
1616
os: [ ubuntu-latest ]
17-
php: [7.0]
17+
php: [8.4]
1818

1919
name: PHP${{matrix.php}} - ${{matrix.os}}
2020

2121
steps:
2222
- name: Clone Repo
23-
uses: actions/checkout@v1
23+
uses: actions/checkout@v4
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
2727
with:
2828
php-version: ${{ matrix.php }}
2929
extensions: mysqli, mbstring, sqlsrv
30-
tools: phpunit:5.7.27, composer
30+
tools: phpunit:9.5.20, composer
3131

32+
- name: Shutdown Ubuntu MySQL
33+
run: sudo service mysql stop
34+
3235
- name: Install Dependencies
3336
run: composer install --prefer-source --no-interaction --no-dev
34-
37+
3538
- name: Execute Tests
3639
run: phpunit
3740

3841
- name: CodeCov
39-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v4
43+
env:
44+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎README.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@ According to [json.org](https://www.json.org/json-en.html), JSON is a data excha
3131
## Supported PHP Versions
3232
| Build Status |
3333
|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
34-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php70.yml"><img src="https://github.com/WebFiori/json/workflows/php70.yml/badge.svg?branch=master"></a> |
35-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php71.yml"><img src="https://github.com/WebFiori/json/workflows/php71.yml/badge.svg?branch=master"></a> |
36-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php72.yml"><img src="https://github.com/WebFiori/json/workflows/php72.yml/badge.svg?branch=master"></a> |
37-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php73.yml"><img src="https://github.com/WebFiori/json/workflows/php73.yml/badge.svg?branch=master"></a> |
38-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php74.yml"><img src="https://github.com/WebFiori/json/workflows/php74.yml/badge.svg?branch=master"></a> |
3934
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php80.yml"><img src="https://github.com/WebFiori/json/workflows/php80.yml/badge.svg?branch=master"></a> |
4035
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php81.yml"><img src="https://github.com/WebFiori/json/workflows/php81.yml/badge.svg?branch=master"></a> |
4136
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php82.yml"><img src="https://github.com/WebFiori/json/workflows/php82.yml/badge.svg?branch=master"></a> |
4237
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php83.yml"><img src="https://github.com/WebFiori/json/workflows/php83.yml/badge.svg?branch=master"></a> |
38+
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yml"><img src="https://github.com/WebFiori/json/workflows/php84.yml/badge.svg?branch=master"></a> |
4339

4440
## Installation
4541
If you are using composer to manage your dependencies, then it is possible to install the library by including the entry `"webfiori/jsonx":"*"` in the `require` section of your `composer.json` file to install the latest release.

0 commit comments

Comments
 (0)