Skip to content

Commit b99ed3d

Browse files
usernaneusernane
committed
Merge branch 'main' into dev
2 parents e8222f3 + d1605b5 commit b99ed3d

6 files changed

Lines changed: 42 additions & 19 deletions

File tree

.github/workflows/php82.yml renamed to .github/workflows/php82.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build PHP 8.2
22

33
on:
44
push:
5-
branches: [ main, dev ]
5+
branches: [ main ]
66
pull_request:
77
branches: [ main ]
88
jobs:
@@ -11,6 +11,7 @@ jobs:
1111
uses: WebFiori/workflows/.github/workflows/test-php.yaml@main
1212
with:
1313
php-version: '8.2'
14+
phpunit-config: "tests/phpunit10.xml"
1415

1516
code-coverage:
1617
name: Coverage

.github/workflows/php83.yml renamed to .github/workflows/php83.yaml

File renamed without changes.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build PHP 8.4
22

33
on:
44
push:
5-
branches: [ main, dev ]
5+
branches: [ main ]
66
pull_request:
77
branches: [ main ]
88
jobs:
@@ -11,6 +11,7 @@ jobs:
1111
uses: WebFiori/workflows/.github/workflows/test-php.yaml@main
1212
with:
1313
php-version: '8.4'
14+
phpunit-config: "tests/phpunit10.xml"
1415

1516
code-coverage:
1617
name: Coverage

‎CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# Changelog
22

3+
## [4.0.0](https://github.com/WebFiori/json/compare/v3.3.2...v4.0.0) (2025-07-30)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* This major version introduces significant improvements and may contain breaking changes from previous versions. Please review the changelog and update your code accordingly.
9+
10+
### Features
11+
12+
* upgrade to version 4.0.0 ([ff8a02e](https://github.com/WebFiori/json/commit/ff8a02ecba0f040d0be0f3f123c08b1e9f9d1b8a))
13+
14+
15+
### Bug Fixes
16+
17+
* Multiple Issues ([98bc0e5](https://github.com/WebFiori/json/commit/98bc0e5b1c0f17e6ea5ee9cb369b6aff4fa7d493))
18+
19+
20+
### Miscellaneous Chores
21+
22+
* Enhance PHP Docs ([e0bf363](https://github.com/WebFiori/json/commit/e0bf36390856cf462048722876c8e85055f8378b))
23+
* Moved Files ([3ceb92d](https://github.com/WebFiori/json/commit/3ceb92d35f5545e79620c8d37236fefcb630942d))
24+
* Remove PHP 8.0 ([c7ae980](https://github.com/WebFiori/json/commit/c7ae98052264ef34848f27aba36c0d893cffef78))
25+
326
## [3.3.2](https://github.com/WebFiori/json/compare/v3.3.1...v3.3.2) (2025-01-28)
427

528

‎README.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
A helper class library for creating JSON or JSONx strings in PHP. It can be used to create well-formatted JSON strings from any variable type (strings, numbers, booleans, arrays, and even objects).
44

55
<p align="center">
6-
<a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yml">
7-
<img src="https://github.com/WebFiori/json/actions/workflows/php84.yml/badge.svg?branch=main">
6+
<a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yaml">
7+
<img src="https://github.com/WebFiori/json/actions/workflows/php84.yaml/badge.svg?branch=main">
88
</a>
99
<a href="https://codecov.io/gh/WebFiori/json">
1010
<img src="https://codecov.io/gh/WebFiori/json/branch/main/graph/badge.svg" />
@@ -57,10 +57,10 @@ According to [json.org](https://www.json.org/json-en.html), JSON is a data excha
5757
## Supported PHP Versions
5858
| Build Status |
5959
|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
60-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php81.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php81.yml/badge.svg?branch=main"></a> |
61-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php82.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php82.yml/badge.svg?branch=main"></a> |
62-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php83.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php83.yml/badge.svg?branch=main"></a> |
63-
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php84.yml/badge.svg?branch=main"></a> |
60+
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php81.yaml"><img src="https://github.com/WebFiori/json/actions/workflows/php81.yaml/badge.svg?branch=main"></a> |
61+
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php82.yaml"><img src="https://github.com/WebFiori/json/actions/workflows/php82.yaml/badge.svg?branch=main"></a> |
62+
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php83.yaml"><img src="https://github.com/WebFiori/json/actions/workflows/php83.yaml/badge.svg?branch=main"></a> |
63+
| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yaml"><img src="https://github.com/WebFiori/json/actions/workflows/php84.yaml/badge.svg?branch=main"></a> |
6464

6565
## Installation
6666
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:
@@ -530,5 +530,3 @@ try {
530530
#### Static Methods
531531
- `Json::decode($jsonStr): Json`
532532
- `Json::fromJsonFile($pathToJsonFile): Json`
533-
534-
For more information and advanced use cases, check [the official documentation](https://webfiori.com/learn/webfiori-json).

‎composer.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "webfiori/jsonx",
33
"type": "library",
44
"description": "PHP library for creating well-formatted JSON strings.",
5-
"version": "3.3.2",
5+
"version": "4.0.0",
66
"keywords": [
77
"JSON",
88
"PHP",
@@ -12,21 +12,21 @@
1212
"require": {
1313
"php": ">=8.0"
1414
},
15-
"autoload" :{
16-
"psr-4":{
17-
"WebFiori\\Json\\":"WebFiori/Json"
15+
"autoload": {
16+
"psr-4": {
17+
"WebFiori\\Json\\": "WebFiori/Json"
1818
}
1919
},
20-
"autoload-dev" :{
21-
"psr-4":{
22-
"WebFiori\\Tests\\":"tests/WebFiori/Tests"
20+
"autoload-dev": {
21+
"psr-4": {
22+
"WebFiori\\Tests\\": "tests/WebFiori/Tests"
2323
}
2424
},
25-
"scripts":{
25+
"scripts": {
2626
"test": "phpunit --configuration tests/phpunit.xml",
2727
"test-10": "phpunit --configuration tests/phpunit10.xml"
2828
},
2929
"require-dev": {
3030
"phpunit/phpunit": "^10.0"
3131
}
32-
}
32+
}

0 commit comments

Comments
 (0)