From 77b0a68e275380cb41234126b5dce78e588a3614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Wed, 22 Jun 2022 09:54:37 +0200 Subject: [PATCH] updated dependency to monarc/backoffice and new QRCode backend. --- VERSION.json | 2 +- composer.json | 8 +- composer.lock | 214 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 200 insertions(+), 24 deletions(-) diff --git a/VERSION.json b/VERSION.json index 99a44ed..6c759e0 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":12, "hotfix":0} +{"major":2, "minor":12, "hotfix":1} diff --git a/composer.json b/composer.json index 5f02465..0393b01 100644 --- a/composer.json +++ b/composer.json @@ -50,13 +50,17 @@ "laminas/laminas-permissions-rbac": "^3.0", "laminas/laminas-log": "^2.11", "laminas/laminas-i18n": "^2.9", - "laminas/laminas-dependency-plugin": "^2.0" + "laminas/laminas-dependency-plugin": "^2.0", + "endroid/qr-code": "^4.4" }, "require-dev": { "roave/security-advisories": "dev-master" }, "config": { - "bin-dir": "bin/" + "bin-dir": "bin/", + "allow-plugins": { + "laminas/laminas-dependency-plugin": true + } }, "minimum-stability": "dev", "prefer-stable": true diff --git a/composer.lock b/composer.lock index bb87147..4722e61 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,62 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "294b3d582dc944b78c66110f80f6b81d", + "content-hash": "c6c7811ae0510ebd7e6437c3d1309285", "packages": [ + { + "name": "bacon/bacon-qr-code", + "version": "2.0.7", + "source": { + "type": "git", + "url": "https://github.com/Bacon/BaconQrCode.git", + "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c", + "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c", + "shasum": "" + }, + "require": { + "dasprid/enum": "^1.0.3", + "ext-iconv": "*", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phly/keep-a-changelog": "^2.1", + "phpunit/phpunit": "^7 | ^8 | ^9", + "spatie/phpunit-snapshot-assertions": "^4.2.9", + "squizlabs/php_codesniffer": "^3.4" + }, + "suggest": { + "ext-imagick": "to generate QR code images" + }, + "type": "library", + "autoload": { + "psr-4": { + "BaconQrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "BaconQrCode is a QR code generator for PHP.", + "homepage": "https://github.com/Bacon/BaconQrCode", + "support": { + "issues": "https://github.com/Bacon/BaconQrCode/issues", + "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.7" + }, + "time": "2022-03-14T02:02:36+00:00" + }, { "name": "brick/math", "version": "0.9.3", @@ -529,6 +583,53 @@ "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "dasprid/enum", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/DASPRiD/Enum.git", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "^7 | ^8 | ^9", + "squizlabs/php_codesniffer": "^3.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "DASPRiD\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "PHP 7.1 enum implementation", + "keywords": [ + "enum", + "map" + ], + "support": { + "issues": "https://github.com/DASPRiD/Enum/issues", + "source": "https://github.com/DASPRiD/Enum/tree/1.0.3" + }, + "time": "2020-10-02T16:03:48+00:00" + }, { "name": "doctrine/annotations", "version": "1.13.2", @@ -1872,6 +1973,78 @@ ], "time": "2022-05-03T09:16:53+00:00" }, + { + "name": "endroid/qr-code", + "version": "4.4.9", + "source": { + "type": "git", + "url": "https://github.com/endroid/qr-code.git", + "reference": "bf087fa1e93a1b7310e2d94d187e26ae51db199d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/endroid/qr-code/zipball/bf087fa1e93a1b7310e2d94d187e26ae51db199d", + "reference": "bf087fa1e93a1b7310e2d94d187e26ae51db199d", + "shasum": "" + }, + "require": { + "bacon/bacon-qr-code": "^2.0.5", + "php": "^7.4||^8.0" + }, + "require-dev": { + "endroid/quality": "dev-master", + "ext-gd": "*", + "khanamiryan/qrcode-detector-decoder": "^1.0.4", + "setasign/fpdf": "^1.8.2" + }, + "suggest": { + "ext-gd": "Enables you to write PNG images", + "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator", + "roave/security-advisories": "Makes sure package versions with known security issues are not installed", + "setasign/fpdf": "Enables you to use the PDF writer" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "Endroid\\QrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen van den Enden", + "email": "info@endroid.nl" + } + ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/qr-code", + "keywords": [ + "code", + "endroid", + "php", + "qr", + "qrcode" + ], + "support": { + "issues": "https://github.com/endroid/qr-code/issues", + "source": "https://github.com/endroid/qr-code/tree/4.4.9" + }, + "funding": [ + { + "url": "https://github.com/endroid", + "type": "github" + } + ], + "time": "2022-05-10T07:25:08+00:00" + }, { "name": "laminas/laminas-authentication", "version": "2.10.1", @@ -4161,16 +4334,16 @@ }, { "name": "monarc/backoffice", - "version": "v2.12.0-p1", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-backoffice.git", - "reference": "1c737361d057317094421fe4a2d5c40e4e3c14d1" + "reference": "84b97e791fd2865d220fa6f5fa2f9353f8569964" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-backoffice/zipball/1c737361d057317094421fe4a2d5c40e4e3c14d1", - "reference": "1c737361d057317094421fe4a2d5c40e4e3c14d1", + "url": "https://api.github.com/repos/monarc-project/zm-backoffice/zipball/84b97e791fd2865d220fa6f5fa2f9353f8569964", + "reference": "84b97e791fd2865d220fa6f5fa2f9353f8569964", "shasum": "" }, "require": { @@ -4235,9 +4408,9 @@ "description": "Backoffice for monarc/monarc-backoffice application", "support": { "issues": "https://github.com/monarc-project/zm-backoffice/issues", - "source": "https://github.com/monarc-project/zm-backoffice/tree/v2.12.0-p1" + "source": "https://github.com/monarc-project/zm-backoffice/tree/v2.12.1" }, - "time": "2022-06-21T13:07:34+00:00" + "time": "2022-06-22T07:44:38+00:00" }, { "name": "monarc/core", @@ -4389,26 +4562,25 @@ }, { "name": "ocramius/proxy-manager", - "version": "2.12.1", + "version": "2.13.1", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "37b219af4c150ff8a30ab0d10d2d68be1148ecc9" + "reference": "e32bc1986fb6fa318ce35e573c654e3ddfb4848d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/37b219af4c150ff8a30ab0d10d2d68be1148ecc9", - "reference": "37b219af4c150ff8a30ab0d10d2d68be1148ecc9", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/e32bc1986fb6fa318ce35e573c654e3ddfb4848d", + "reference": "e32bc1986fb6fa318ce35e573c654e3ddfb4848d", "shasum": "" }, "require": { - "composer-runtime-api": "^2.0.0", + "composer-runtime-api": "^2.1.0", "laminas/laminas-code": "^4.3.0", "php": "~7.4.1 || ~8.0.0", "webimpress/safe-writer": "^2.2.0" }, "conflict": { - "composer/composer": "<2.0.14", "doctrine/annotations": "<1.6.1", "laminas/laminas-stdlib": "<3.2.1", "thecodingmachine/safe": "<1.3.3", @@ -4465,7 +4637,7 @@ ], "support": { "issues": "https://github.com/Ocramius/ProxyManager/issues", - "source": "https://github.com/Ocramius/ProxyManager/tree/2.12.1" + "source": "https://github.com/Ocramius/ProxyManager/tree/2.13.1" }, "funding": [ { @@ -4477,7 +4649,7 @@ "type": "tidelift" } ], - "time": "2022-03-05T18:39:36+00:00" + "time": "2022-03-05T18:42:03+00:00" }, { "name": "psr/cache", @@ -6487,12 +6659,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b" + "reference": "bd1c2ed6f37c9a9e81417b8367865c0bbeabed55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0a2664d739af6996ce1a24a35cb59ed2bbd27f4b", - "reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bd1c2ed6f37c9a9e81417b8367865c0bbeabed55", + "reference": "bd1c2ed6f37c9a9e81417b8367865c0bbeabed55", "shasum": "" }, "conflict": { @@ -6633,7 +6805,7 @@ "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", "grumpydictator/firefly-iii": "<5.6.5", - "guzzlehttp/guzzle": "<6.5.7|>=7,<7.4.4", + "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", "guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1", "helloxz/imgurl": "= 2.31|<=2.31", "hillelcoren/invoice-ninja": "<5.3.35", @@ -6979,7 +7151,7 @@ "type": "tidelift" } ], - "time": "2022-06-17T21:04:24+00:00" + "time": "2022-06-21T17:12:40+00:00" } ], "aliases": [], @@ -6995,5 +7167,5 @@ "ext-pdo": "*" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.3.0" }