Merge branch 'release-2.x'

README.md

@@ -1,18 +1,18 @@
 Step-up Registration Authority
 ==============================
 
-[![Build Status](https://travis-ci.org/SURFnet/Stepup-RA.svg)](https://travis-ci.org/SURFnet/Stepup-RA) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/SURFnet/Stepup-RA/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/SURFnet/Stepup-RA/?branch=develop) [![SensioLabs Insight](https://insight.sensiolabs.com/projects/8f9557e9-d8b8-4625-9e2a-60587d3cb3f0/mini.png)](https://insight.sensiolabs.com/projects/8f9557e9-d8b8-4625-9e2a-60587d3cb3f0)
+[![Build Status](https://travis-ci.org/OpenConext/Stepup-RA.svg)](https://travis-ci.org/OpenConext/Stepup-RA) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/OpenConext/Stepup-RA/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/OpenConext/Stepup-RA/?branch=develop) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/8f9557e9-d8b8-4625-9e2a-60587d3cb3f0/mini.png)](https://insight.sensiolabs.com/projects/8f9557e9-d8b8-4625-9e2a-60587d3cb3f0)
 
-This component is part of "Step-up Authentication as-a Service" and requires other supporting components to function. See [Stepup-Deploy](https://github.com/SURFnet/Stepup-Deploy) for an overview. 
+This component is part of "Step-up Authentication as-a Service" and requires other supporting components to function. See [Stepup-Deploy](https://github.com/OpenConext/Stepup-Deploy) for an overview. 
 
 ## Requirements
 
  * PHP 5.6+ or PHP7
  * [Composer](https://getcomposer.org/)
  * A web server (Apache, Nginx)
  * Graylog2 (or disable this Monolog handler)
- * A working [Gateway](https://github.com/SURFnet/Stepup-Gateway)
- * Working [Middleware](https://github.com/SURFnet/Stepup-Middleware)
+ * A working [Gateway](https://github.com/OpenConext/Stepup-Gateway)
+ * Working [Middleware](https://github.com/OpenConext/Stepup-Middleware)
 
 ## Installation
 

composer.json

@@ -23,22 +23,26 @@
         "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.3",
+        "surfnet/stepup-middleware-client-bundle": "^2.0",
         "surfnet/stepup-saml-bundle": "^2.5",
-        "surfnet/stepup-bundle": "^1.5",
+        "surfnet/stepup-bundle": "^1.7",
         "surfnet/stepup-u2f-bundle": "dev-develop",
-        "guzzlehttp/guzzle": "~4",
+        "guzzlehttp/guzzle": "^6",
         "symfony/swiftmailer-bundle": "~2.3",
         "knplabs/knp-paginator-bundle": "~2.4",
         "mopa/composer-bridge": "~1.5",
         "ramsey/uuid": "^3.5"
     },
     "require-dev": {
         "sensio/generator-bundle": "~2.3",
-        "ibuildings/qa-tools": "~1.1,>=1.1.27",
         "liip/rmt": "1.1.*",
         "matthiasnoback/symfony-config-test": "^1.2",
-        "mockery/mockery": "^0.9.5"
+        "mockery/mockery": "^0.9.5",
+        "phpmd/phpmd": "^2.0",
+        "phpunit/phpunit": "^4.0",
+        "sensiolabs/security-checker": "^2.0",
+        "sebastian/phpcpd": "^2.0",
+        "squizlabs/php_codesniffer": "^1.0"
     },
     "scripts": {
         "post-install-cmd": [