Merge pull request #130 from OpenConext/feature/enroll-state-tracking

Store tiqr enrollment data in session to allow hard resets

CHANGELOG.md

@@ -1,6 +1,10 @@
+## 3.1.1
+**Bugfix**
+* Prevent session data collisions during enrollment
+
 ## 3.1.0
 **Feature**
-* Add the enrollment link on the QR code #128 #129:wq
+* Add the enrollment link on the QR code #128 #129
 
 **Chores**
  - Updated travis runtime environment variables #119

composer.json

@@ -23,46 +23,47 @@
     "ext-dom": "*",
     "ext-libxml": "*",
     "ext-zlib": "*",
+    "openconext/monitor-bundle": "^2.1",
     "sensio/framework-extra-bundle": "^5.4",
-    "surfnet/stepup-bundle": "^4.1.0-beta.3",
-    "surfnet/stepup-gssp-bundle": "^3",
-    "surfnet/stepup-saml-bundle": "^4.1.7",
+    "surfnet/stepup-bundle": "^4.1",
+    "surfnet/stepup-gssp-bundle": "^4",
+    "surfnet/stepup-saml-bundle": "^4.3",
     "symfony/asset": "^4.3",
     "symfony/console": "^4.3",
     "symfony/dotenv": "^4.3",
     "symfony/flex": "^1.4",
     "symfony/form": "^4.3",
     "symfony/monolog-bundle": "^3.4",
     "symfony/security-bundle": "^4.3",
-    "symfony/templating": "^4.3",
     "symfony/translation": "^4.3",
     "symfony/twig-bundle": "^4.3",
     "symfony/validator": "^4.3",
     "symfony/webpack-encore-bundle": "^1.6",
     "symfony/yaml": "^4.3",
-    "tiqr/tiqr-server-libphp": "^1.1",
-    "openconext/monitor-bundle": "^2.1"
+    "tiqr/tiqr-server-libphp": "^1.1"
   },
   "require-dev": {
+    "behat/mink": "^1.7",
+    "behat/mink-browserkit-driver": "^1.3",
+    "behat/mink-goutte-driver": "^1.2",
     "behat/symfony2-extension": "^2.1",
-    "symfony/maker-bundle": "~1",
-    "symfony/profiler-pack": "~1",
+    "behatch/contexts": "^3.2",
     "jakub-onderka/php-parallel-lint": "~1",
+    "khanamiryan/qrcode-detector-decoder": "^1.0.3",
+    "league/csv": "^8.2",
     "malukenho/docheader": "^0",
     "mockery/mockery": "^1",
     "phpmd/phpmd": "~2",
     "phpunit/phpcov": "~6",
+    "phpunit/phpunit": "^8.5",
     "sebastian/phpcpd": "~4",
     "squizlabs/php_codesniffer": "~3",
     "symfony/browser-kit": "^4.3",
     "symfony/css-selector": "^3",
-    "symfony/test-pack": "^1.0",
-    "behat/mink": "^1.7",
-    "behatch/contexts": "^3.2",
-    "behat/mink-browserkit-driver": "^1.3",
-    "behat/mink-goutte-driver": "^1.2",
-    "league/csv": "^8.2",
-    "khanamiryan/qrcode-detector-decoder": "^1.0.3"
+    "symfony/maker-bundle": "~1",
+    "symfony/phpunit-bridge": "^5.3",
+    "symfony/stopwatch": "^5.3",
+    "symfony/web-profiler-bundle": "^5.0"
   },
   "scripts": {
     "test": [