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.

Sign up for GitHub

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

Jump to bottom

Add support for PHPUnit 6 using class_alias in shim.php #4142

Merged
merged 21 commits into from Apr 25, 2017
Merged

Add support for PHPUnit 6 using class_alias in shim.php #4142

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
39e14ba
Modify version constraints to allow the installation of PHPUnit 6.
MontealegreLuis Apr 17, 2017
306f7ca
Add aliases for PHPUnit 6.
MontealegreLuis Apr 17, 2017
e83b690
Use an updated implementation of TestListener for PHPUnit 6
MontealegreLuis Apr 17, 2017
138e1db
Add shim for method setExpectedException
MontealegreLuis Apr 17, 2017
93bbd64
Add shim file for loggers removed in PHPUnit 6
MontealegreLuis Apr 18, 2017
8d200f9
Class name for exception is different for PHPUnit 6.
MontealegreLuis Apr 18, 2017
4baa1d9
Add missing setExpectedException method.
MontealegreLuis Apr 18, 2017
007103a
Fix version constraint for the mock-objects package when using PHPUni…
MontealegreLuis Apr 18, 2017
b09e7dd
Check PHP version in shim.php.
MontealegreLuis Apr 18, 2017
e0ad583
Add phpunit5-loggers.php and the PHPUnit listener to Nitpick's ignore…
MontealegreLuis Apr 19, 2017
ae3f359
Fix class names in WebDriverTest use underscores instead of namespace…
MontealegreLuis Apr 19, 2017
ac1ba42
Replace namespaces with underscores.
MontealegreLuis Apr 19, 2017
0a972ef
Use method setExpectedException instead of the annotations.
MontealegreLuis Apr 19, 2017
4f20990
Add method addWarning to Listener instead of providing 2 different im…
MontealegreLuis Apr 19, 2017
1df1b81
Change tests using setExpectedException to inherit Codeception/Test/…
MontealegreLuis Apr 19, 2017
43ed899
Use method_exists instead of class_exists
MontealegreLuis Apr 19, 2017
9080fe0
Fix versions range for PHPUnit related packages.
MontealegreLuis Apr 19, 2017
ffd1fa6
Improve the readability of the condition to add the classes alias
MontealegreLuis Apr 19, 2017
d3acef7
Remove extra space in version constraint.
MontealegreLuis Apr 20, 2017
0d9eff4
Add deprecation warning when using PHPUnit 6.
MontealegreLuis Apr 22, 2017
2f06caa
Invert if statement to better match the comment description.
MontealegreLuis Apr 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions composer.json
View file
Open in desktop
Expand Up @@ -18,8 +18,9 @@
"php": ">=5.4.0 <8.0",
"ext-json": "*",
"ext-mbstring": "*",
"phpunit/phpunit": ">4.8.20 <6.0",
"phpunit/php-code-coverage": ">=2.2.4 <5.0",
"phpunit/phpunit": ">4.8.20 <6.1",
Copy link
Member

Choose a reason for hiding this comment

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

<7.0 should be fine, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure about this one, I read this comment on the issue #3995 (comment) and I tried to use a small range for the versions. If that's not a problem for you all, I can use a wider set of versions then.

"phpunit/php-code-coverage": ">=2.2.4 < 4.1 || ^5.0",
"phpunit/phpunit-mock-objects": ">2.3 <3.5 || ^4.0",
Copy link
Member

Choose a reason for hiding this comment

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

Have you got a reason to exclude php-code-coverage 4.1 and phpunit-mock-objects 3.5?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same reason for this one. What would be your preferred set of values for these versions?

Copy link
Member

Choose a reason for hiding this comment

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

"phpunit/php-code-coverage": ">=2.2.4 < 6.0",
"phpunit/phpunit-mock-objects": ">2.3 <5.0",

"facebook/webdriver": ">=1.0.1 <2.0",
"guzzlehttp/guzzle": ">=4.1.4 <7.0",
"guzzlehttp/psr7": "~1.0",
Expand All @@ -31,7 +32,7 @@
"symfony/css-selector": ">=2.7 <4.0",
"symfony/dom-crawler": ">=2.7.5 <4.0",
"behat/gherkin": "~4.4.0",
"sebastian/comparator": "~1.1",
"sebastian/comparator": ">1.1 <1.2 || ^2.0",
Copy link
Member

Choose a reason for hiding this comment

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

Same here, why are you excluding 1.2?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was just being cautious, as in the other ones. Please let me know what range would work better.

Copy link
Member

Choose a reason for hiding this comment

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

~1.1 actually allowed 1.2.* but you forbidden it.

">1.1 <3.0"

"sebastian/diff": "^1.4",
"stecman/symfony-console-completion": "^0.7.0"
},
Expand Down