Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jsonrainbow/json-schema
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.1.0
Choose a base ref
...
head repository: jsonrainbow/json-schema
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.2.0
Choose a head ref
  • 12 commits
  • 31 files changed
  • 5 contributors

Commits on Feb 6, 2025

  1. Use phpstan's int-mask-of<T> (#779)

    * Better phpstan typing
    
    * Better phpstan typing
    jack-worman authored Feb 6, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    56f34b8 View commit details

Commits on Feb 10, 2025

  1. More-phpstan-typing (#781)

    jack-worman authored Feb 10, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    afee666 View commit details
  2. feat: welcome first time contributors (#782)

    * feat: welcome first time contributers
    
    * docs: add changelog entry
    DannyvdSluijs authored Feb 10, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7660882 View commit details

Commits on Feb 21, 2025

  1. fix: add required permissions for welcome action (#789)

    This PR adds the required permissions for making comments on the issues
    and pull requests
    
    References:
    -
    https://github.com/jsonrainbow/json-schema/actions/runs/13372875791/job/37345272696#step:2:1
    -
    wow-actions/welcome#9 (comment)
    DannyvdSluijs authored Feb 21, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f84193e View commit details
  2. fix: Upgrade php cs fixer to latest (#783)

    Fixes #598
    DannyvdSluijs authored Feb 21, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    ec0eab0 View commit details

Commits on Feb 26, 2025

  1. fix: Create deep copy before checking each sub schema in oneOf (#791)

    This PR creates a deep copy of the value before passing it by reference
    for validating sub schemas of a `oneOf` with type coercion enabled.
    
    Fixes #790
    DannyvdSluijs authored Feb 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7eea9e4 View commit details
  2. fix: Create deep copy before checking each sub schema in anyOf (#792)

    Fixes #711
    DannyvdSluijs authored Feb 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4406698 View commit details
  3. Correctly set the schema ID when passing it as assoc array (#794)

    Replaces #769 due to lack of permissions to update PR
    Closes #767.
    
    ---------
    
    Co-authored-by: Dalibor Karlović <dalibor.karlovic@sigwin.hr>
    DannyvdSluijs and dkarlovi authored Feb 26, 2025

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    649793d View commit details
  4. fix: create deep copy before checking each sub schema in oneOf when o…

    …nly check_mode_apply_defaults is set (#795)
    
    Fixes #510
    DannyvdSluijs authored Feb 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a94f60c View commit details
  5. fix: property is passed as integer and cannot be accessed (#784)

    aistis- authored Feb 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b62fea7 View commit details
  6. refactor: cleanup redundant checks (#796)

    Fixes #793 removing PHP 5.5 and HHVM checks
    DannyvdSluijs authored Feb 26, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d9d665f View commit details
  7. docs: release 6.2.0

    DannyvdSluijs committed Feb 26, 2025
    Copy the full SHA
    460c0a0 View commit details
26 changes: 26 additions & 0 deletions .github/workflows/welcome.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Welcome
on:
pull_request:
types: [opened, closed]
issues:
types: [opened]
jobs:
run:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: wow-actions/welcome@v1
with:
FIRST_ISSUE: |
🚀 @{{ author }}, thanks for your contribution! Every idea, bug report, and discussion helps make this project better. Your input is invaluable, and we appreciate the time you took to share it. A maintainer will review it soon—stay awesome! 💡✨
FIRST_PR: |
🎉 You're making a difference! We appreciate your effort and dedication. A reviewer will check it out soon, but in the meantime, give yourself a pat on the back. Keep up the great work! 💪🚀
FIRST_PR_MERGED: |
💖 Welcome @{{ author }} as first-time contributor! Your efforts matter, and we’re so grateful for your contribution. Open source thrives because of people like you. Keep going, keep learning, and know that your work is truly valued. 🌱✨
STAR_MESSAGE: |
⭐ Enjoying contributing? Star the project! ⭐Your contributions help this project grow, and we'd love your support in another way too! If you find this repo helpful, consider leaving a star 🌟 on GitHub.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@ coverage
.project
.settings
.php_cs
.php_cs.cache
.php-cs-fixer.cache
composer.lock
docs-api
phpunit.xml
.phpunit.result.cache
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

$finder = new PhpCsFixer\Finder();
$config = new PhpCsFixer\Config('json-schema');
$finder->in(__DIR__);
$finder->in([__DIR__ . '/src', __DIR__ . '/tests']);

/* Based on ^2.1 of php-cs-fixer */
$config
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [6.2.0] - 2025-02-26
### Added
- Welcome first time contributors ([#782](https://github.com/jsonrainbow/json-schema/pull/782))

### Fixed
- Add required permissions for welcome action ([#789](https://github.com/jsonrainbow/json-schema/pull/789))
- Upgrade php cs fixer to latest ([#783](https://github.com/jsonrainbow/json-schema/pull/783))
- Create deep copy before checking each sub schema in oneOf ([#791](https://github.com/jsonrainbow/json-schema/pull/791))
- Create deep copy before checking each sub schema in anyOf ([#792](https://github.com/jsonrainbow/json-schema/pull/792))
- Correctly set the schema ID when passing it as assoc array ([#794](https://github.com/jsonrainbow/json-schema/pull/794))
- Create deep copy before checking each sub schema in oneOf when only check_mode_apply_defaults is set ([#795](https://github.com/jsonrainbow/json-schema/pull/795))
- Additional property casted into int when actually is numeric string ([#784](https://github.com/jsonrainbow/json-schema/pull/784))

### Changed
- Used PHPStan's int-mask-of<T> type where applicable ([#779](https://github.com/jsonrainbow/json-schema/pull/779))
- Fixed some PHPStan errors ([#781](https://github.com/jsonrainbow/json-schema/pull/781))
- Cleanup redundant checks ([#796](https://github.com/jsonrainbow/json-schema/pull/796))

## [6.1.0] - 2025-02-04
### Added
- Add return types in the test suite ([#748](https://github.com/jsonrainbow/json-schema/pull/748))
@@ -91,4 +109,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix: Clean up `.gitattributes` ([#687](https://github.com/jsonrainbow/json-schema/pull/687))
- Fix: Order `friendsofphp/php-cs-fixer` rules ([#688](https://github.com/jsonrainbow/json-schema/pull/688))
- HTTP to HTTPS redirection breaks remote reference resolution ([#709](https://github.com/jsonrainbow/json-schema/pull/709))
- Corrected several typos and code style issues
- Corrected several typos and code style issues
4 changes: 1 addition & 3 deletions bin/validate-json
Original file line number Diff line number Diff line change
@@ -60,10 +60,8 @@ if (count($arArgs) == 1) {

/**
* Show the json parse error that happened last
*
* @return void
*/
function showJsonError()
function showJsonError(): void
{
$constants = get_defined_constants(true);
$json_errors = [];
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
"icecave/parity": "^3.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20 || ~2.19.0",
"friendsofphp/php-cs-fixer": "3.3.0",
"json-schema/json-schema-test-suite": "1.2.0",
"phpunit/phpunit": "^8.5",
"phpspec/prophecy": "^1.19",
@@ -78,6 +78,7 @@
"style-fix": "php-cs-fixer fix --verbose",
"test": "phpunit",
"testOnly": "phpunit --colors --filter",
"phpstan": "@php phpstan"
"phpstan": "@php phpstan",
"phpstan-generate-baseline": "@php phpstan --generate-baseline"
}
}
Loading