Skip to content

Commit

Permalink
Merge pull request #107 from SURFnet/maintenance/update-stepup-bundle
Browse files Browse the repository at this point in the history
Update Stepup & Middleware Client Bundle
  • Loading branch information
DRvanR committed Aug 3, 2016
2 parents bd42d58 + 3e4e2ee commit 062dcc5
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 110 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ php:
- 5.6
- 7.0

matrix:
allow_failures:
- php: 7.0

env:
global:
- SYMFONY_ENV=test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Step-up Self-Service

## Requirements

* PHP 5.6 (Note that we test on 7.0 but do not run or support it officially)
* PHP 5.6+ or PHP7
* [Composer](https://getcomposer.org/)
* A web server (Apache, Nginx)
* Graylog2 (or disable this Monolog handler)
Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ parameters:

saml_remote_idp_entity_id:
saml_remote_idp_sso_url:
saml_remote_idp_certificate:
saml_remote_idp_certificate: 'FOR CI ONLY, REPLACE WITH ACTUAL VALUE'
graylog_hostname: g2-dev.stepup.coin.surf.net
asset_version: 1

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"fortawesome/font-awesome": "~4.2.0",
"jms/translation-bundle": "~1.1.0",
"jms/di-extra-bundle": "~1.4.0",
"surfnet/stepup-middleware-client-bundle": "~1.1",
"surfnet/stepup-middleware-client-bundle": "^1.3",
"guzzlehttp/guzzle": "~4",
"surfnet/stepup-saml-bundle": "~2.4",
"surfnet/stepup-bundle": "^1.3.0",
"surfnet/stepup-saml-bundle": "^2.5",
"surfnet/stepup-bundle": "^1.5",
"symfony/swiftmailer-bundle": "~2.3",
"surfnet/stepup-u2f-bundle": "dev-develop",
"mopa/composer-bridge": "~1.5"
Expand Down

0 comments on commit 062dcc5

Please sign in to comment.