Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: swarrot/SwarrotBundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.1
Choose a base ref
...
head repository: swarrot/SwarrotBundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.2
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 19, 2015

  1. Correct composer version

    odolbeau committed Oct 19, 2015

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    b476aea View commit details
  2. Merge pull request #72 from odolbeau/bump-version

    Correct composer version
    odolbeau committed Oct 19, 2015
    Copy the full SHA
    effaacf View commit details

Commits on Nov 1, 2015

  1. Fix README

    iamluc committed Nov 1, 2015
    Copy the full SHA
    cb9e1fa View commit details
  2. Merge pull request #74 from iamluc/iamluc-patch-1

    Fix README
    odolbeau committed Nov 1, 2015
    Copy the full SHA
    23c9fdb View commit details

Commits on Nov 19, 2015

  1. Copy the full SHA
    50b0f5c View commit details
  2. Merge pull request #75 from jderusse/swymfony-3

    Allow Symfony 3 to be installed
    odolbeau committed Nov 19, 2015
    Copy the full SHA
    dbe5b18 View commit details
Showing with 20 additions and 7 deletions.
  1. +16 −3 .travis.yml
  2. +1 −1 README.md
  3. +3 −3 composer.json
19 changes: 16 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
language: php

php: [5.4, 5.5, 5.6]
php: [5.4, 5.5, 5.6, 7.0]

sudo: false

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

matrix:
fast_finish: true
include:
- php: 5.4
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: DEPENDENCIES=dev SYMFONY_VERSION="2.8.x-dev" COMPOSER_FLAGS="--prefer-stable"
- php: 5.6
env: DEPENDENCIES=dev SYMFONY_VERSION="3.0.x-dev" COMPOSER_FLAGS="--prefer-stable"

before_install:
- echo "extension=amqp.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- composer self-update
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/framework-bundle:"$SYMFONY_VERSION"; fi
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/console:"$SYMFONY_VERSION"; fi

install:
- composer install -n
- composer update $COMPOSER_FLAGS
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ Update `config_test.yml` for example:

```yaml
parameters:
swarrot.publisher.class: SP\Utils\Swarrot\PublisherBlackhole
swarrot.publisher.class: Swarrot\SwarrotBundle\Broker\BlackholePublisher
```

## License
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
"php": ">=5.4",
"swarrot/swarrot": "~2.0",
"psr/log": "~1.0",
"symfony/framework-bundle": "~2.4",
"symfony/console": "~2.4"
"symfony/framework-bundle": "~2.4|~3.0",
"symfony/console": "~2.4|~3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.5"
@@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
"dev-master": "1.4-dev"
}
}
}