Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Finalize PHP 7.2 support #70

Merged
merged 11 commits into from
Apr 25, 2018
Merged

Finalize PHP 7.2 support #70

merged 11 commits into from
Apr 25, 2018
+1,992 −37

Conversation

weierophinney
Copy link
Member

This patch incorporates each of:

and makes a few additional changes:

  • Allows PHPUnit 7 versions.
  • Ensures that PHP 7.2 is required during testing.
  • Ensures PHP 5.6 and PHP 7.0 will get appropriate PHPUnit versions during testing.
  • Fixes a testing issue when using PHPUnit 7 versions.

kokspflanze and others added 11 commits July 11, 2017 21:22
@kokspflanze
travis update, build lowest, locked and latest, also add php-nightly
9bf4d79
@kokspflanze
php-nightly update if xdebug.ini not exist
863d7c9
@kokspflanze
added php 7.2 in matrix
9a077fe
@kokspflanze
removed nightly
cafd30c
@snapshotpl
Impove testing and add php 7.2
c7f7b2a
@michalbundyra
Updated to php-coveralls/php-coveralls
eb3975c 
With version 2 package has been renamed from "satooshi/php-coveralls"
to "php-coveralls/php-coveralls", and the script has been renamed
from "coveralls" to "php-coveralls"
@weierophinney
Merge pull request zendframework#56 from kokspflanze/feature/build_up…
3b26cf1 
…date

travis update, build lowest, locked and latest, also add php-nightly
@weierophinney
Merge pull request zendframework#66 from snapshotpl/php72
b9cecc6 
Impove testing and add php 7.2 support

Conflicts:
	.travis.yml
@weierophinney
Merge pull request zendframework#69 from webimpress/hotfix/php-coveralls
245a561 
Updated to php-coveralls/php-coveralls

Conflicts:
	.travis.yml
@weierophinney
Allow PHPUnit 7 series
025d242
@weierophinney
Replace assertContainsOnly calls in SharedEventManagerTest
ea81011 
The behavior of `assertContainsOnly()` changed in PHPUnit 7, and now
expects the first argument is a string type. Previously, we were passing
an instance to find in the array. Now we pull the single discovered
listener off and test using `assertSame()`.
@weierophinney weierophinney merged commit ea81011 into zendframework:master Apr 25, 2018
weierophinney added a commit that referenced this pull request Apr 25, 2018
@weierophinney
Merge branch 'feature/php-7.2-support'
b4c6ffb 
Close #70
Close #69
Close #66
Close #56
weierophinney added a commit that referenced this pull request Apr 25, 2018
@weierophinney
Merge branch 'feature/php-7.2-support' into develop
66c3684 
Forward port #70
Forward port #69
Forward port #66
Forward port #56

Conflicts:
	.travis.yml
	composer.json
@weierophinney weierophinney deleted the feature/php-7.2-support branch April 25, 2018 15:26
@weierophinney weierophinney mentioned this pull request Apr 25, 2018
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@weierophinney @kokspflanze @snapshotpl @michalbundyra