Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ZF3 compatibility, PHP5.5 support dropped
  • Loading branch information
michalbundyra committed Jul 26, 2016
1 parent 6b1959d commit 60f2fa7
Show file tree
Hide file tree
Showing 12 changed files with 4,146 additions and 91 deletions.
10 changes: 4 additions & 6 deletions .gitignore
@@ -1,7 +1,5 @@
.idea
vendor
composer.lock
composer.phar
.idea/
vendor/
phpunit.xml
phpmd.xml
phpdox.xml
.project/
nbproject/
78 changes: 66 additions & 12 deletions .travis.yml
@@ -1,23 +1,77 @@
sudo: false

language: php

php:
- 5.5
- 5.6
- 7
- hhvm
cache:
directories:
- $HOME/.composer/cache
- vendor

env:
global:
- COMPOSER_ARGS="--no-interaction"
- LATEST_DEPS="zendframework/zend-mvc-console"

matrix:
fast_finish: true
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- TEST_COVERAGE=true
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- CS_CHECK=true
- php: 7
env:
- DEPS=latest
- php: nightly
env:
- DEPS=lowest
- php: nightly
env:
- DEPS=locked
- php: nightly
env:
- DEPS=latest
- php: hhvm
env:
- DEPS=lowest
- php: hhvm
env:
- DEPS=locked
- php: hhvm
env:
- DEPS=latest
allow_failures:
- php: nightly
- php: hhvm

before_script:
- composer update --prefer-dist
before_install:
- travis_retry composer self-update

install:
- if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- travis_retry composer install $COMPOSER_ARGS
- composer show

script:
- ./vendor/bin/phpunit --coverage-clover ./build/clover.xml
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php build/coverage-checker.php build/clover.xml 70; fi
- ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/
- if [[ $TEST_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover ./build/clover.xml ; else ./vendor/bin/phpunit ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then php build/coverage-checker.php build/clover.xml 70 ; fi
- if [[ $CHECK_CS == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/ ./config/ ; fi

after_script:
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi
46 changes: 27 additions & 19 deletions composer.json
Expand Up @@ -31,31 +31,34 @@
"email": "guilhermeblanco@hotmail.com"
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/webimpress/DoctrineModule"
}
],
"require": {
"php": "^5.5 || ^7.0",
"doctrine/doctrine-module": "~1.0",
"php": "^5.6 || ^7.0",
"doctrine/doctrine-module": "dev-feature/zf3compat",
"doctrine/orm": ">=2.5,<2.7",
"doctrine/dbal": ">=2.4,<2.7",
"zendframework/zend-stdlib": "^2.7.6",
"zendframework/zend-hydrator": "^1.1",
"zendframework/zend-mvc": "^2.5.2",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"symfony/console": "~2.5|~3.0"
"symfony/console": "^2.3 || ^3.0",
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
"zendframework/zend-hydrator": "^1.1 || ^2.2.1",
"zendframework/zend-mvc": "^2.7.10 || ^3.0.2",
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1.1"
},
"require-dev": {
"zendframework/zend-modulemanager": "^2.6.1",
"zendframework/zend-config": "^2.6",
"zendframework/zend-view": "^2.5.2",
"zendframework/zend-serializer": "^2.6",
"zendframework/zend-log": "^2.5.2",
"zendframework/zend-i18n": "^2.6",
"phpunit/phpunit": "^4.8",
"squizlabs/php_codesniffer": "^2.6.2",
"doctrine/data-fixtures": "^1.2.1",
"doctrine/migrations": "^1.4.1",
"zendframework/zend-console": "^2.6",
"zendframework/zend-code": "^2.5.2",
"doctrine/data-fixtures": "1.0.*",
"zendframework/zend-developer-tools": "^1.0",
"doctrine/migrations": "1.0.*@dev",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2"
"zendframework/zend-developer-tools": "^1.1",
"zendframework/zend-i18n": "^2.7.3",
"zendframework/zend-log": "^2.9",
"zendframework/zend-modulemanager": "^2.7.2",
"zendframework/zend-serializer": "^2.8"
},
"suggest": {
"zendframework/zend-form": "if you want to use form elements backed by Doctrine",
Expand All @@ -66,5 +69,10 @@
"psr-0": {
"DoctrineORMModule\\": "src/"
}
},
"autoload-dev": {
"psr-0": {
"DoctrineORMModuleTest\\": "tests/"
}
}
}

0 comments on commit 60f2fa7

Please sign in to comment.