Skip to content

Commit

Permalink
Merge 0607201 into 3b58647
Browse files Browse the repository at this point in the history
  • Loading branch information
gregurco committed Nov 16, 2017
2 parents 3b58647 + 0607201 commit 36c4289
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 6 deletions.
26 changes: 24 additions & 2 deletions .travis.yml
Expand Up @@ -5,24 +5,46 @@ sudo: false
php:
- 7.0
- 7.1
- 7.2
- nightly

env:
- SYMFONY_VERSION=2.7.* # LTS
- SYMFONY_VERSION=2.8.* # LTS
- SYMFONY_VERSION=3.2.*
- SYMFONY_VERSION=3.3.*
- DEPENDENCIES='dev' SYMFONY_VERSION='3.4.*@dev' # LTS, remove "dev" when released
- DEPENDENCIES='dev' SYMFONY_VERSION='4.0.*@dev'

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

before_install:
- composer self-update
- if [ "$DEPENDENCIES" == "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer --no-update require symfony/symfony:${SYMFONY_VERSION}; fi;

install:
- composer install
- composer update

script:
- mkdir -p build/logs
- php vendor/bin/phpunit -c phpunit.xml.dist --coverage-text
- php vendor/bin/phpunit --coverage-text

matrix:
exclude:
- php: 7
env: DEPENDENCIES='dev' SYMFONY_VERSION='4.0.*@dev' # requires PHP ^7.1.3
- php: 7
env: SYMFONY_VERSION=dev-master # requires PHP ^7.1.3
allow_failures:
- php: 7.1
env: DEPENDENCIES='dev' SYMFONY_VERSION='4.0.*@dev'
- php: 7.2
env: DEPENDENCIES='dev' SYMFONY_VERSION='4.0.*@dev'
- php: nightly
- env: SYMFONY_VERSION=dev-master

after_success:
- travis_retry php vendor/bin/coveralls
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -22,10 +22,10 @@
"php": "^7.0",
"guzzlehttp/guzzle": "^6.0",
"eightpoints/guzzle-bundle": "~7.0",
"symfony/http-kernel": "~2.3|~3.0",
"symfony/config": "~2.3|~3.0",
"symfony/dependency-injection": "~2.3|~3.0",
"symfony/expression-language": "~2.3|~3.0"
"symfony/http-kernel": "~2.7|~3.0|~4.0",
"symfony/config": "~2.7|~3.0|~4.0",
"symfony/dependency-injection": "~2.7|~3.0|~4.0",
"symfony/expression-language": "~2.7|~3.0|~4.0"
},

"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions src/GuzzleBundleWssePlugin.php
Expand Up @@ -34,6 +34,7 @@ public function loadForClient(array $config, ContainerBuilder $container, string
if ($config['username'] && $config['password']) {
$wsse = new Definition('%guzzle_bundle_wsse_plugin.middleware.wsse.class%');
$wsse->setArguments([$config['username'], $config['password'], $config['created_at']]);
$wsse->setPublic(true);

$wsseServiceName = sprintf('guzzle_bundle_wsse_plugin.middleware.wsse.%s', $clientName);

Expand Down

0 comments on commit 36c4289

Please sign in to comment.