Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

marc-mabe/php-enum versions #464

Merged
merged 1 commit into from
Apr 2, 2019
Merged

Conversation

marc-mabe
Copy link
Contributor

I'm very happy you are planning to use my small library :)

As you are using base functionality only you can support much more versions of it. This helps a lot in cases you have to deal with more libraries and all have different dependent versions.

Copy link
Contributor

@erayd erayd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me - thanks :-).

@bighappyface - The Travis fail can be ignored; it's just php-cs-fixer introducing some new logic and breaking the syntax test. Again :-(. I will open a separate PR to deal with that when I have some time, but the problem was not triggered by this PR.

@bighappyface bighappyface changed the base branch from 6.0.0-dev to master November 12, 2017 17:41
@wimleers
Copy link

wimleers commented Mar 4, 2019

Is the intent to make json-schema work with both the 2.x and 3.x branches of https://github.com/marc-mabe/php-enum?

@wimleers
Copy link

wimleers commented Mar 4, 2019

(Asking this because it's related to #569.)

@shmax
Copy link
Collaborator

shmax commented Mar 4, 2019

@wimleers Looks like we sort of forgot to follow up on this one. We only use the most basic, vanilla features of php-enum. I had a quick look at the "BC break" tags listed in the 3.0 release, and I didn't see anything that would impact us. On the other hand, with 3.0 he raises the minimal required PHP version to 5.6, and we're still on 5.3. So, we can't fully switch to 3.0 without creating PHP dependency issues, and if we stay on 2.0 then we don't always get the latest and greatest. Any suggestions?

@marc-mabe
Copy link
Contributor Author

PR is rebased now

Is the intent to make json-schema work with both the 2.x and 3.x branches of https://github.com/marc-mabe/php-enum?

yes

@marc-mabe
Copy link
Contributor Author

any update on this ?

Copy link
Collaborator

@shmax shmax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shmax
Copy link
Collaborator

shmax commented Apr 2, 2019

@erayd I'm not really familiar with the version branch strategy. Which one do we target with this?

@marc-mabe
Copy link
Contributor Author

marc-mabe commented Apr 2, 2019

@shmax ^2.0 || ^3.0 is the same as (>= 2.0.0 && < 3.0.0) || (>= 3.0.0 && < 3.0.0) in this case the same as simplified >= 2.0.0 && < 4.0.0.
Normally (if not configured otherwise) composer will take the latest possible version matching this condition and conditions of other depending projects using this same dependency.

@erayd erayd merged commit 6562463 into jsonrainbow:master Apr 2, 2019
@erayd
Copy link
Contributor

erayd commented Apr 2, 2019

Which one do we target with this?

@shmax - exactly what @marc-mabe said above. That constraint should be fine for what we are doing, so long as you're happy that the syntax is the same for the bits you use - I'm assuming that because you approved the PR, that is the case.

@shmax
Copy link
Collaborator

shmax commented Apr 2, 2019

I was talking more about master vs one of our version branches (eg. 5.x.x, 6.0.dev). Master it is, then.

@erayd
Copy link
Contributor

erayd commented Apr 2, 2019

@shmax Always master. Merging PRs directly into 5.x.x causes problems. This one will probably make it into my next backport release though.

@marc-mabe marc-mabe deleted the enum_versions branch August 27, 2019 16:25
@erayd erayd mentioned this pull request Sep 25, 2019
erayd added a commit that referenced this pull request Sep 25, 2019
## Backported PRs
 * #559 ArraysTest for array items with enum validation
 * #567 Don't run checks which assume a defined instance against undefined
 * #575 Tests on PHP 7.3
 * #587 Fixed PHPDoc of Validator::validate() method
 * #583 Fix travis PHP 5.4 and 5.5 config

## Additional PRs (5.x.x only)
These PRs are only applicable to the 5.x.x branch, and have been merged individually.
 * #589 Update validate-json to use spl_autoload_register

## Skipped PRs
 * #464 marc-mabe/php-enum versions (dependency not present in 5.x.x)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants