From 317d0bd7dc4ed727134bb8dba37e2c0b0e35d00a Mon Sep 17 00:00:00 2001
From: Ian Foulds <ianfoulds@x-act.uk>
Date: Fri, 3 Sep 2021 10:38:44 +0100
Subject: [PATCH 1/2] Remove the routing element data after loading.

---
 assets/js-routing.js | 7 ++++---
 composer.json        | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/js-routing.js b/assets/js-routing.js
index 06fb62c..4b21f0b 100644
--- a/assets/js-routing.js
+++ b/assets/js-routing.js
@@ -5,9 +5,10 @@
 import Router from './router.js';
 
 let routes = [];
-let elem = document.getElementById('xact-js-routing-data');
-if(elem) {
-    routes = JSON.parse(elem.attributes['data-routing-data'].value);
+let routesElement = document.getElementById('xact-js-routing-data');
+if(routesElement) {
+    routes = JSON.parse(routesElement.attributes['data-routing-data'].value);
+    routesElement.remove();
 }
 
 let context = {
diff --git a/composer.json b/composer.json
index e1707d4..60f8994 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
     "description": "A JS routing bundle for Symfony 3.4 using webpack. Derived from the FOS JSRoutingBundle.",
     "type": "symfony-bundle",
     "license": "MIT",
+    "version": "3.4.6",
     "authors": [
         {
             "name": "Ian Foulds",

From a3cf149e5eea80125487aedd1ae5d6c53ce2293c Mon Sep 17 00:00:00 2001
From: Ian Foulds <ianfoulds@x-act.uk>
Date: Fri, 3 Sep 2021 11:05:23 +0100
Subject: [PATCH 2/2] Use phpunit-bridge and update phpunit schema to try and
 overcome Travis errors.

---
 composer.json    |  2 +-
 phpunit.xml.dist | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 60f8994..d4aef22 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,6 @@
     },
     "require-dev": {
         "symfony/debug-pack": "*",
-        "symfony/test-pack": "*"
+       "symfony/phpunit-bridge": "^5.1"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 60e1bd9..4da2265 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         verbose="true"
-         backupGlobals="false"
-         colors="true">
+    xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    verbose="true"
+    backupGlobals="false"
+    colors="true">
 
     <php>
         <ini name="error_reporting" value="-1" />