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

Commit 4fff35b

Browse files
authored
Merge pull request #345 from weierophinney/feature/zend-hydrator-3
Allow usage with zend-hydrator v3
2 parents 47ab908 + f92ada5 commit 4fff35b

File tree

5 files changed

+155
-122
lines changed

5 files changed

+155
-122
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ matrix:
2121
- mysql
2222
env:
2323
- DEPS=locked
24-
- LEGACY_DEPS="phpunit/phpunit"
24+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
2525
- TEST_INTEGRATION=true
2626
- TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
2727
- php: 5.6
@@ -35,7 +35,7 @@ matrix:
3535
- mysql
3636
env:
3737
- DEPS=locked
38-
- LEGACY_DEPS="phpunit/phpunit"
38+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
3939
- TEST_INTEGRATION=true
4040
- TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
4141
- php: 7.0
@@ -49,6 +49,7 @@ matrix:
4949
- mysql
5050
env:
5151
- DEPS=locked
52+
- LEGACY_DEPS="zendframework/zend-hydrator"
5253
- CS_CHECK=true
5354
- TEST_COVERAGE=true
5455
- TEST_INTEGRATION=true

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"phpunit/phpunit": "^5.7.25 || ^6.4.4",
2424
"zendframework/zend-coding-standard": "~1.0.0",
2525
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
26-
"zendframework/zend-hydrator": "^1.1 || ^2.1",
26+
"zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
2727
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
2828
},
2929
"suggest": {

0 commit comments

Comments
 (0)