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

Fix integration test syntax error #4343

Merged
merged 1 commit into from
Apr 30, 2016
Merged

Fix integration test syntax error #4343

merged 1 commit into from
Apr 30, 2016

Conversation

nevvermind
Copy link
Contributor

Not sure how this one got into mainline, but it makes all CI integration tests fail.

And, no, phpstorm didn't pick it up as an error. :trollface:

@vkublytskyi
Copy link

@nevvermind, thank you for catching and fixing this issue. We will merge it ASAP.
Internal ticket MAGETWO-52414

@Vinai
Copy link
Contributor

Vinai commented Apr 29, 2016

The value assignment during property declaration using __DIR__ is valid PHP syntax for 5.6 and 7.0.
Maybe instead of fixing it this is an opportunity to drop support for 5.5? (half j/k) :)

@nevvermind
Copy link
Contributor Author

Sooo... instead of merging a simple fix, M2 should bump their PHP version?
Why not both? 😜

@magento-team magento-team merged commit 18e7cbf into magento:develop Apr 30, 2016
magento-team pushed a commit that referenced this pull request Apr 30, 2016
magento-team pushed a commit that referenced this pull request Apr 30, 2016
@nevvermind nevvermind deleted the bugfix/expression-in-property-declaration branch April 30, 2016 08:46
@melnikovi
Copy link
Member

@nevvermind your pull request has been accepted, thank you for contribution. We have to modify it, because we have two tests that extend this one.

@piotrekkaminski piotrekkaminski self-assigned this May 13, 2016
magento-engcom-team pushed a commit that referenced this pull request Mar 16, 2018
magento-engcom-team pushed a commit that referenced this pull request Mar 16, 2018
magento-engcom-team pushed a commit that referenced this pull request Mar 16, 2018
magento-engcom-team pushed a commit that referenced this pull request Mar 16, 2018
magento-engcom-team pushed a commit that referenced this pull request Mar 16, 2018
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.

6 participants