Skip to content

Commit

Permalink
Merge pull request #310 from formapro-forks/symfony30
Browse files Browse the repository at this point in the history
PHP7 support
  • Loading branch information
makasim committed Dec 11, 2015
2 parents b127135 + 4d10555 commit 5b2780e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 15 deletions.
34 changes: 24 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@
language: php

php:
- 5.5
- 5.6
- hhvm

env:
- SYMFONY_VERSION=2.7.*
global:
- SYMFONY_DEPRECATIONS_HELPER=weak

sudo: false

cache:
directories:
- $HOME/.composer/cache

matrix:
include:
- php: 5.5
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION=2.8.*
- php: 7.0
env: SYMFONY_VERSION=2.8.*
- php: hhvm
env: SYMFONY_VERSION=2.8.*
allow_failures:
- php: hhvm

before_script:
- curl -sS https://getcomposer.org/installer | php
- php composer.phar require symfony/symfony:${SYMFONY_VERSION} --no-update
- php composer.phar update
before_install:
- composer self-update
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi;

install:
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
- composer install --prefer-source

notifications:
email:
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@
}
],
"require": {
"php": ">=5.5.0",
"payum/core": "~1.0",
"php": "^5.5.0|^7.0",
"payum/core": "~1.1",
"symfony/framework-bundle": "~2.7",
"symfony/twig-bundle": "~2.7",
"symfony/form": "~2.7",
"symfony/validator": "~2.7"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"twig/twig": "~1.16",
"twig/twig": "~1.16|~2.0",
"symfony/expression-language": "~2.7",
"symfony/browser-kit": "~2.7",
"symfony/class-loader": "~2.7",
"symfony/phpunit-bridge": "~2.7",
"sonata-project/admin-bundle": "~2.0",
"doctrine/orm": "2.3.*",
"payum/payum": "~1.0",
"payum/payum": "~1.1",
"payum/omnipay-bridge": "~1.0",
"payum/jms-payment-bridge": "~1.0",
"omnipay/dummy": "~2.0",
Expand All @@ -69,7 +69,7 @@
"ext-soap": "*"
},
"suggest": {
"sonata-project/admin-bundle": "If you want to configure payments in the backend."
"sonata-project/admin-bundle": "~2.0 If you want to configure payments in the backend."
},
"autoload": {
"psr-4": { "Payum\\Bundle\\PayumBundle\\": "" }
Expand Down

0 comments on commit 5b2780e

Please sign in to comment.