Skip to content

Commit

Permalink
Merge pull request #6 from adrian-ziolkowski/prepare_for_zf3_upgr
Browse files Browse the repository at this point in the history
dependency update to ZF3
  • Loading branch information
snapshotpl authored Oct 28, 2016
2 parents eddec6c + 6d776e7 commit 937cea9
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 8 deletions.
25 changes: 23 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,34 @@ matrix:
fast_finish: true
include:
- php: 5.5
env:
- DEPS=lowest
- php: 5.5
env:
- DEPS=latest
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=latest
- php: hhvm
env:
- DEPS=lowest
- php: hhvm
env:
- DEPS=latest

install:
- travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update --no-interaction --prefer-source ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-source --prefer-lowest ; fi
- composer info -i

script:
- ./vendor/bin/phpunit
- ./vendor/bin/phpunit
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"require": {
"php": ">=5.5",
"zendframework/zend-modulemanager": "^2.4",
"zendframework/zend-eventmanager": "^2.4",
"zendframework/zend-eventmanager": "^2.4 || ^3",
"zendframework/zend-http": "^2.4",
"zendframework/zend-mvc": "^2.4",
"zendframework/zend-servicemanager": "^2.4",
"zendframework/zend-stdlib": "^2.4",
"zendframework/zend-mvc": "^2.4 || ^3",
"zendframework/zend-servicemanager": "^2.4 || ^3",
"zendframework/zend-stdlib": "^2.4 || ^3",
"zendframework/zend-psr7bridge": "^0.2",
"php-middleware/request-id": "^3.0.0"
},
Expand All @@ -18,7 +18,7 @@
"zendframework/zend-log": "^2.4",
"zendframework/zend-serializer": "^2.4",
"zendframework/zend-session": "^2.4",
"zendframework/zend-test": "^2.4"
"zendframework/zend-test": "^2.4 || ^3"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 7 additions & 1 deletion test/TestAsset/application.config.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return [
$config = [
// This should be an array of module namespaces used in the application.
'modules' => [
'RstGroup\RequestIdModule'
Expand Down Expand Up @@ -30,3 +30,9 @@
],
],
];

if (class_exists(\Zend\Router\Module::class)) {
$config['modules'][] = 'Zend\Router';
}

return $config;

0 comments on commit 937cea9

Please sign in to comment.