Backports for 5.2.7 #495
Merged
Backports for 5.2.7 #495
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
Fix: Remove unused parameter
Fix: Remove unused private method
Fix: No need to specify path to bin directory
Fix: Use more appropriate assertions
Fix: Remove unused argument from method call
Fix: Case mismatch
Fix: Consistently indent with 2 spaces
Fix: Add PHP 7.2 to build matrix
Fix: No need to update composer itself
Enhancement: Implicitly enable no_unused_imports fixer
Fix: Remove unused argument
Fix: Keep rules sorted in .php_cs.dist
[BUGFIX] Apply defaults in $ref'ed property / item definitions
This commit deliberately tests in a way that violates the spec. Versions of this library prior to 6.0.0 allow properties adjacent to $ref to override properties with the same name from the $ref'ed schema. This is explicitly in violation of the spec, but cannot be changed in 5.x.x, as it results in a significant behavioral change that may break end users' application logic. This issue is resolved in 6.0.0, and siblings of $ref are correctly ignored from 6.0.0 onwards.
|
@erayd something is funny about this PR. Travis isn't picking it up and is indicating an issue: https://travis-ci.org/justinrainbow/json-schema/requests See the top-most item for #495. Thoughts? |
|
@bighappyface I suspect it's having problems because I opened it against master, then changed the base branch to 5.x.x before the Travis job started, but after it was notified of the PR. If I add another commit to this, or rebase it, that should restart Travis in an unconfused state. I'm not at my desk right now, but will do that once I'm back in a few hours. |
|
@bighappyface I've added a commit to it (after running the style-fixer), and Travis now seems happy. |
bighappyface
approved these changes
Feb 14, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bugfixes from 6.0.0 that can be backported to 5.2.7 without breaking backwards-compatibility.
Backported PRs
PHPUnit\Framework\TestCaseinstead ofPHPUnit_Framework_TestCase.php_cs.dist$ref'ed property / item definitionsSkipped PRs
check()andcoerce()as deprecated) - not deprecated in 5.x.x