From c7e1efd67a4be1d8e3d8628c5a4730e0ee1fa17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20HULARD?= <s.hulard@chstudio.fr>
Date: Tue, 18 Feb 2020 10:40:03 +0100
Subject: [PATCH 1/4] Add a new function `wpmautic_base_script`

Since we'll allow to not load the tracking script when rendering the
page we must allow users to retrieve the script URL to load it by themselves if they need to.
---
 wpmautic.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/wpmautic.php b/wpmautic.php
index 072d7e5..df7ef0d 100644
--- a/wpmautic.php
+++ b/wpmautic.php
@@ -120,13 +120,28 @@ function wpmautic_injector() {
 	}
 }
 
+/**
+ * Generate the mautic script URL to be used outside of the plugin when
+ * necessary
+ *
+ * @return string
+ */
+function wpmautic_base_script() {
+	$base_url = wpmautic_option( 'base_url', '' );
+	if ( empty( $base_url ) ) {
+		return;
+	}
+
+	return $base_url . '/mtc.js';
+}
+
 /**
  * Writes Tracking JS to the HTML source
  *
  * @return void
  */
 function wpmautic_inject_script() {
-	$base_url = wpmautic_option( 'base_url', '' );
+	$base_url = wpmautic_base_script();
 	if ( empty( $base_url ) ) {
 		return;
 	}
@@ -137,7 +152,7 @@ function wpmautic_inject_script() {
 	(function(w,d,t,u,n,a,m){w['MauticTrackingObject']=n;
 		w[n]=w[n]||function(){(w[n].q=w[n].q||[]).push(arguments)},a=d.createElement(t),
 		m=d.getElementsByTagName(t)[0];a.async=1;a.src=u;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','<?php echo esc_url( $base_url ); ?>/mtc.js','mt');
+	})(window,document,'script','<?php echo esc_url( $base_url ); ?>','mt');
 
 	mt('send', 'pageview'<?php echo count( $attrs ) > 0 ? ', ' . wp_json_encode( $attrs ) : ''; ?>);
 </script>

From 6515cee3a1998f77d478aac5fb3f78e36286cd09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20HULARD?= <s.hulard@chstudio.fr>
Date: Tue, 18 Feb 2020 10:41:03 +0100
Subject: [PATCH 2/4] Script location: Add a new value - disabled.

This new value will tell the plugin to not load the tracking script in the page by default, hello GDPR ^^.
---
 options.php                     | 17 +++++++++++++++--
 tests/OptionsTest.php           |  8 ++++++++
 tests/OptionsValidationTest.php | 16 ++++++++++++++++
 tests/ScriptInjectionTest.php   | 18 ++++++++++++++++++
 tests/SettingsTest.php          | 13 +++++++++++++
 wpmautic.php                    |  4 ++--
 6 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/options.php b/options.php
index f467228..ebbd0c3 100644
--- a/options.php
+++ b/options.php
@@ -132,13 +132,26 @@ function wpmautic_script_location() {
 
 	?>
 	<fieldset id="wpmautic_script_location">
+		<label>
+			<input
+				type="radio"
+				name="wpmautic_options[script_location]"
+				value="disabled"
+				<?php
+				if ( 'disabled' === $position ) :
+					?>
+					checked<?php endif; ?>
+			/>
+			<?php echo wp_kses( __( 'Tracking script will not be loaded when rendering the page; this means that Mautic tracking capability is disabled but you can still use shortcodes to embed Mautic dynamic contents. Use this option to comply with GDPR regulation rules, then load the script by yourself if user accepted tracking.', 'wp-mautic' ), $allowed_tags ); ?>
+		</label>
+		<br/>
 		<label>
 			<input
 				type="radio"
 				name="wpmautic_options[script_location]"
 				value="header"
 				<?php
-				if ( 'footer' !== $position ) :
+				if ( 'footer' !== $position && 'disabled' !== $position ) :
 					?>
 					checked<?php endif; ?>
 			/>
@@ -224,7 +237,7 @@ function wpmautic_options_validate( $input ) {
 	$options['script_location'] = isset( $input['script_location'] )
 		? trim( $input['script_location'] )
 		: 'header';
-	if ( ! in_array( $options['script_location'], array( 'header', 'footer' ), true ) ) {
+	if ( ! in_array( $options['script_location'], array( 'header', 'footer', 'disabled' ), true ) ) {
 		$options['script_location'] = 'header';
 	}
 
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
index 8b6a9b8..d49ea4d 100644
--- a/tests/OptionsTest.php
+++ b/tests/OptionsTest.php
@@ -46,6 +46,14 @@ public function test_script_location_with_value()
         $this->assertEquals('footer', wpmautic_option('script_location'));
     }
 
+    public function test_script_location_with_disabled_value()
+    {
+        update_option('wpmautic_options', array(
+            'script_location' => 'disabled'
+        ));
+        $this->assertEquals('disabled', wpmautic_option('script_location'));
+    }
+
     public function test_fallback_activated_when_empty()
     {
         update_option('wpmautic_options', array());
diff --git a/tests/OptionsValidationTest.php b/tests/OptionsValidationTest.php
index 5d1b562..9e515f8 100644
--- a/tests/OptionsValidationTest.php
+++ b/tests/OptionsValidationTest.php
@@ -33,6 +33,22 @@ public function test_validation_with_invalid_script_location()
         $this->assertEquals('header', $options['script_location']);
     }
 
+    public function test_validation_with_footer_script_location()
+    {
+        $options = wpmautic_options_validate(array(
+            'script_location' => 'footer'
+        ));
+        $this->assertEquals('footer', $options['script_location']);
+    }
+
+    public function test_validation_with_disabled_script_location()
+    {
+        $options = wpmautic_options_validate(array(
+            'script_location' => 'disabled'
+        ));
+        $this->assertEquals('disabled', $options['script_location']);
+    }
+
     public function test_validation_with_whitespaces_in_values()
     {
         $options = wpmautic_options_validate(array(
diff --git a/tests/ScriptInjectionTest.php b/tests/ScriptInjectionTest.php
index 0cfcda7..178de00 100644
--- a/tests/ScriptInjectionTest.php
+++ b/tests/ScriptInjectionTest.php
@@ -83,6 +83,24 @@ public function test_script_is_injected_in_footer_when_requested()
         $this->assertContains(sprintf("%s/mtracking.gif?d=", $base_url), $output);
     }
 
+    public function test_script_is_not_injected_when_disabled()
+    {
+        $base_url = 'http://example.com';
+        update_option('wpmautic_options', array(
+            'base_url' => $base_url,
+            'fallback_activated' => false,
+            'script_location' => 'disabled'
+        ));
+        do_action('plugins_loaded');
+
+        $output = $this->renderRawPage();
+
+        $this->assertNotContains(sprintf("(window,document,'script','{$base_url}/mtc.js','mt')"), $output);
+        $this->assertNotContains("['MauticTrackingObject']", $output);
+        $this->assertNotContains("mt('send', 'pageview')", $output);
+        $this->assertNotContains(sprintf("%s/mtracking.gif?d=", $base_url), $output);
+    }
+
     public function test_script_is_injected_with_custom_attributes_when_defined()
     {
         $base_url = 'http://example.com';
diff --git a/tests/SettingsTest.php b/tests/SettingsTest.php
index 9ad2e22..a1690dd 100644
--- a/tests/SettingsTest.php
+++ b/tests/SettingsTest.php
@@ -64,6 +64,19 @@ public function test_script_location_setting()
         $this->assertRegExp('/value="header"\s+checked/', $output);
     }
 
+    public function test_script_location_setting_with_disabled_checked()
+    {
+        update_option('wpmautic_options', array(
+            'script_location' => 'disabled'
+        ));
+
+        wpmautic_script_location();
+        $output = $this->getActualOutput();
+        $this->assertContains("wpmautic_script_location", $output);
+        $this->assertContains("wpmautic_options[script_location]", $output);
+        $this->assertRegExp('/value="disabled"\s+checked/', $output);
+    }
+
     public function test_script_location_setting_with_footer_checked()
     {
         update_option('wpmautic_options', array(
diff --git a/wpmautic.php b/wpmautic.php
index df7ef0d..9e922fc 100644
--- a/wpmautic.php
+++ b/wpmautic.php
@@ -111,11 +111,11 @@ function wpmautic_injector() {
 	$script_location = wpmautic_option( 'script_location' );
 	if ( 'header' === $script_location ) {
 		add_action( 'wp_head', 'wpmautic_inject_script' );
-	} else {
+	} elseif ( 'footer' === $script_location ) {
 		add_action( 'wp_footer', 'wpmautic_inject_script' );
 	}
 
-	if ( true === wpmautic_option( 'fallback_activated', false ) ) {
+	if ( 'disabled' !== $script_location && true === wpmautic_option( 'fallback_activated', false ) ) {
 		add_action( 'wp_footer', 'wpmautic_inject_noscript' );
 	}
 }

From b62811e28bf2a7e427f18506d9849e23a672caf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20HULARD?= <s.hulard@chstudio.fr>
Date: Tue, 18 Feb 2020 11:04:22 +0100
Subject: [PATCH 3/4] Travis: Explicitly start mysql service during build.

Also move to test on PHP7.4 stable and WordPress 5.3
---
 .travis.yml   |   8 +-
 composer.json |   2 +-
 composer.lock | 210 +++++++++++++++++++++++++-------------------------
 wpmautic.php  |   2 +-
 4 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b528b9..c3b94c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 
-sudo: false
-
 env:
   global:
     - WP_PHPUNIT=phpunit
@@ -26,11 +24,15 @@ matrix:
       env: WP_VERSION=4.4
     - php: 7.0
       env: WP_VERSION=4.9
+    - php: 7.4
+      env: WP_VERSION=5.3
     - php: 7.3
       env: WP_VERSION=5.2
     - php: 7.3
       env: WP_VERSION=5.0 WP_MULTISITE=1 COVERAGE=1 OUTDATED=1
     - php: 7.3
+      env: WP_VERSION=5.3 WP_MULTISITE=1 COVERAGE=1 OUTDATED=1
+    - php: 7.4
       env: WP_VERSION=master
     - php: hhvm
       env: WP_VERSION=4.7
@@ -65,7 +67,7 @@ before_script:
   - |
     # Install the specified version of PHPUnit depending on the PHP version:
     case "$TRAVIS_PHP_VERSION" in
-      7.3|7.2|7.1|hhvm|nightly)
+      7.4|7.3|7.2|7.1|hhvm|nightly)
         echo "Using bundled PHPUnit (7.*)"
         composer install --no-interaction --prefer-source
         export WP_PHPUNIT=vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 2e0e7c9..acd377a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "php": "^5.2|^7.0.0"
+        "php": "^7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
diff --git a/composer.lock b/composer.lock
index 3a4b701..f81ef23 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,32 +4,34 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3b3a0586a1f86963d3d9c36a4e4f6551",
+    "content-hash": "caa95701e2f1c035fc302847b2180a7e",
     "packages": [],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^6.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
+                "phpbench/phpbench": "^0.13",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
@@ -54,25 +56,25 @@
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22T11:58:36+00:00"
+            "time": "2019-10-21T16:45:58+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.8.1",
+            "version": "1.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
                 "shasum": ""
             },
             "require": {
@@ -107,7 +109,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2018-06-11T23:09:50+00:00"
+            "time": "2020-01-17T21:11:47+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -213,35 +215,33 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -263,31 +263,32 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
+            "version": "4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
+                "doctrine/instantiator": "^1.0.5",
                 "mockery/mockery": "^1.0",
+                "phpdocumentor/type-resolver": "0.4.*",
                 "phpunit/phpunit": "^6.4"
             },
             "type": "library",
@@ -314,41 +315,40 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
+            "time": "2019-12-28T18:55:12+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.1",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "^7.1",
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -361,42 +361,43 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "v1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
+                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
+                "phpspec/phpspec": "^2.5 || ^3.2",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.10.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -424,7 +425,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "time": "2020-01-20T15:57:02+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1032,16 +1033,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.0",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
                 "shasum": ""
             },
             "require": {
@@ -1068,6 +1069,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -1076,17 +1081,13 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -1095,7 +1096,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2019-09-14T09:02:43+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -1380,16 +1381,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.4.0",
+            "version": "3.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
+                "reference": "dceec07328401de6211037abbb18bda423677e26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
-                "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26",
+                "reference": "dceec07328401de6211037abbb18bda423677e26",
                 "shasum": ""
             },
             "require": {
@@ -1422,25 +1423,25 @@
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
                 "standards"
             ],
-            "time": "2018-12-19T23:57:18+00:00"
+            "time": "2020-01-30T22:20:29+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
+                "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
                 "shasum": ""
             },
             "require": {
@@ -1452,7 +1453,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.14-dev"
                 }
             },
             "autoload": {
@@ -1468,13 +1469,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Gert de Pagter",
                     "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -1485,20 +1486,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2020-01-13T11:15:53+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.0",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
                 "shasum": ""
             },
             "require": {
@@ -1525,36 +1526,33 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
+            "time": "2019-06-13T22:48:21+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.4.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
+                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "vimeo/psalm": "<3.6.0"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -1576,7 +1574,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-12-25T11:19:39+00:00"
+            "time": "2020-02-14T12:15:55+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
@@ -1628,7 +1626,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^5.2|^7.0.0"
+        "php": "^7.1"
     },
     "platform-dev": []
 }
diff --git a/wpmautic.php b/wpmautic.php
index 9e922fc..b357558 100644
--- a/wpmautic.php
+++ b/wpmautic.php
@@ -6,7 +6,7 @@
  * Description: This plugin will allow you to add Mautic (Free Open Source Marketing Automation) tracking to your site
  * Version: 2.2.2
  * Requires at least: 4.6
- * Tested up to: 5.1
+ * Tested up to: 5.3
  * Author: Mautic community
  * Author URI: http://mautic.org
  * Text Domain: wp-mautic

From 10bda5f3e5120a376d71672804d64f00010826d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20HULARD?= <s.hulard@chstudio.fr>
Date: Tue, 18 Feb 2020 11:18:56 +0100
Subject: [PATCH 4/4] Changelog: Describe changes since last release.

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7179e1..7ccf760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Refine wording on the settings page, to be more meaningful.
+- Introduce readme.txt generator to avoid manual manipulation during release.
+- Add Makefile to simplify the command to run inside the project.
+- Add a new `script_location` value to disable script rendering on page load (GDPR compliance).
+
+### Changes
+- We are now compatible with PHP 7.4 and WordPress 5.3.*
 
 ## [v2.2.2] - 2017-11-13
 ### Changed