diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-11-16 22:31:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 22:31:10 +0300 |
| commit | 6932c331858c8f379fd00554b67ce6999c99eaad (patch) | |
| tree | d0679de271dcaebe08dd1ea1c8310eb6eb9f25aa | |
| parent | b4edd8f41121edfc762bf1a1b67c376842b0530d (diff) | |
require laster master commit of tedivm/JShrink to fix PHP8 issue (#16721)4.0.0-rc4
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | composer.lock | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/composer.json b/composer.json index 73228fb04c..551ad2e3c0 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "wiki": "https://github.com/matomo-org/matomo/wiki", "source": "https://github.com/matomo-org/matomo" }, - "config":{ + "config": { "platform": { "php": "7.2.5" }, @@ -50,7 +50,7 @@ "symfony/monolog-bridge": "~2.6.0", "szymach/c-pchart": "^2.0", "tecnickcom/tcpdf": "~6.0", - "tedivm/jshrink": "^1.3.1", + "tedivm/jshrink": "dev-master#aed09eace9d498e18d48a5b62a7e5a97dfc0e55d", "twig/twig": "^3.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index b52fecec46..07568d7cf6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a82c0231815fd1bbe5e7c653069a90cd", + "content-hash": "ab7eebfb6b16cc34040667b5759a61de", "packages": [ { "name": "composer/ca-bundle", @@ -1949,16 +1949,16 @@ }, { "name": "tedivm/jshrink", - "version": "v1.3.3", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/tedious/JShrink.git", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a" + "reference": "aed09eace9d498e18d48a5b62a7e5a97dfc0e55d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/aed09eace9d498e18d48a5b62a7e5a97dfc0e55d", + "reference": "aed09eace9d498e18d48a5b62a7e5a97dfc0e55d", "shasum": "" }, "require": { @@ -1991,7 +1991,7 @@ "javascript", "minifier" ], - "time": "2019-06-28T18:11:46+00:00" + "time": "2019-10-07T21:24:34+00:00" }, { "name": "twig/twig", @@ -3710,6 +3710,7 @@ "stability-flags": { "leafo/lessphp": 20, "matomo/matomo-php-tracker": 20, + "tedivm/jshrink": 20, "lox/xhprof": 20 }, "prefer-stable": false, |