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

Commit 7856f35

Browse files
committed
Upgrade to PHP 5.6 and PHPUnit 5.7/6.0
This patch updates the package to: - Set the minimum supported PHP version to 5.6. - Set the supported PHPUnit version to either 5.7 or 6.0, depending on PHP version used. A number of test changes were required: - All references to `PHPUnit_Framework_TestCase` were updated to the namespaced version. In any case where the class was not imported, an import statement was created. - All `setExpectedException()` calls were updated to `expectException()`, and, if an expected message was provided, `expectExceptionMessage()` - A number of `getMock()` calls still existed without usage of `getMockBuilder()`; these were updated. - A zend-servicemanager test trait for testing container compatibility between zend-servicemanager versions differs from v2 to v3; the two instances in this particular suite were updated to override the necessary tests to vary strategy based on which PHP version was detected. - New test failures were discovered in the flash messenger tests due to differences in how PHPUnit handles global state; these were corrected.
1 parent 37ca3b9 commit 7856f35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+742
-349
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"require": {
16-
"php": "^5.5 || ^7.0",
16+
"php": "^5.6 || ^7.0",
1717
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
1818
"zendframework/zend-loader": "^2.5",
1919
"zendframework/zend-stdlib": "^2.7 || ^3.0"
@@ -40,7 +40,7 @@
4040
"zendframework/zend-session": "^2.6.2",
4141
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
4242
"zendframework/zend-uri": "^2.5",
43-
"phpunit/phpunit": "^4.6",
43+
"phpunit/phpunit": "^5.7||^6.0",
4444
"zendframework/zend-coding-standard": "~1.0.0"
4545
},
4646
"suggest": {

0 commit comments

Comments
 (0)