Skip to content

Commit

Permalink
Merge pull request #9 from Soullivaneuh/symfony-require
Browse files Browse the repository at this point in the history
Improve Symfony requirements. This allows Symfony 3 usage.
  • Loading branch information
ManneW committed Dec 8, 2015
2 parents df58fad + 971c636 commit 2d9c4c8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## MAC OS
.DS_Store

/composer.lock
/vendor/
22 changes: 18 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.3.3
- 5.3
- 5.4
- 5.5
Expand All @@ -10,11 +9,26 @@ php:
- hhvm

matrix:
fast_finish: true
include:
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: SYMFONY_VERSION=2.3.*
- php: 5.6
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION=2.8.*
- php: 5.6
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION="3.1.*@dev"
allow_failures:
- php: 7.0
- php: hhvm
- php: nightly
- env: SYMFONY_VERSION="3.1.*@dev"

before_script:
install:
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- composer install --dev --prefer-source

script: phpunit --coverage-text
11 changes: 10 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@
"name": "mannew/hipchat-bundle",
"description": "Bundle to integrate the HipChat PHP library for their REST API.",
"require": {
"symfony/framework-bundle": "~2.1",
"symfony/framework-bundle": "~2.1|~3.0",
"hipchat/hipchat-php": "~1.4"
},
"require-dev": {
"symfony/console": "~2.1|~3.0"
},
"suggest": {
"symfony/console": "To get HipChat commands"
},
"conflict": {
"symfony/console": "<2.1|>=4.0"
},
"license": "MIT",
"authors": [
{
Expand Down

0 comments on commit 2d9c4c8

Please sign in to comment.