From e0152d3df43f5bcc56bdb922800ca2e9d956b8ae Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 26 Sep 2018 20:47:57 +0200 Subject: [PATCH] Fix #1716 --- composer.json | 2 +- composer.lock | 109 +++++++++++++++----------------------------------- 2 files changed, 33 insertions(+), 78 deletions(-) diff --git a/composer.json b/composer.json index b1fb050916..3a22067015 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "ext-intl": "*", "ext-xml": "*", "ext-zip": "*", - "bacon/bacon-qr-code": "2.*", + "bacon/bacon-qr-code": "1.*", "bunq/sdk_php": "dev-master#8c1faefc111d9b970168a1837ca165d854954941", "davejamesmiller/laravel-breadcrumbs": "5.*", "doctrine/dbal": "2.*", diff --git a/composer.lock b/composer.lock index b9f4762001..0ee40dde37 100644 --- a/composer.lock +++ b/composer.lock @@ -4,39 +4,36 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "364135d1fab7e47564deae52ea0c12c2", + "content-hash": "9297702ac3c2fc200aac5fc68821bdd6", "packages": [ { "name": "bacon/bacon-qr-code", - "version": "2.0.0", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/Bacon/BaconQrCode.git", - "reference": "eaac909da3ccc32b748a65b127acd8918f58d9b0" + "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/eaac909da3ccc32b748a65b127acd8918f58d9b0", - "reference": "eaac909da3ccc32b748a65b127acd8918f58d9b0", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee", + "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee", "shasum": "" }, "require": { - "dasprid/enum": "^1.0", "ext-iconv": "*", - "php": "^7.1" + "php": "^5.4|^7.0" }, "require-dev": { - "phly/keep-a-changelog": "^1.4", - "phpunit/phpunit": "^6.4", - "squizlabs/php_codesniffer": "^3.1" + "phpunit/phpunit": "^4.8" }, "suggest": { - "ext-imagick": "to generate QR code images" + "ext-gd": "to generate QR code images" }, "type": "library", "autoload": { - "psr-4": { - "BaconQrCode\\": "src/" + "psr-0": { + "BaconQrCode": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -53,7 +50,7 @@ ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2018-04-25T17:53:56+00:00" + "time": "2017-10-17T09:59:25+00:00" }, { "name": "bunq/sdk_php", @@ -119,48 +116,6 @@ ], "time": "2018-09-01T12:54:04+00:00" }, - { - "name": "dasprid/enum", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/DASPRiD/Enum.git", - "reference": "631ef6e638e9494b0310837fa531bedd908fc22b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/631ef6e638e9494b0310837fa531bedd908fc22b", - "reference": "631ef6e638e9494b0310837fa531bedd908fc22b", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "^6.4", - "squizlabs/php_codesniffer": "^3.1" - }, - "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/" - } - ], - "description": "PHP 7.1 enum implementation", - "keywords": [ - "enum", - "map" - ], - "time": "2017-10-25T22:45:27+00:00" - }, { "name": "davejamesmiller/laravel-breadcrumbs", "version": "5.1.2", @@ -683,16 +638,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.5", + "version": "2.1.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3" + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/54859fabea8b3beecbb1a282888d5c990036b9e3", - "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786", + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786", "shasum": "" }, "require": { @@ -736,7 +691,7 @@ "validation", "validator" ], - "time": "2018-08-16T20:49:45+00:00" + "time": "2018-09-25T20:47:26+00:00" }, { "name": "erusev/parsedown", @@ -1067,16 +1022,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.4", + "version": "v5.7.6", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f6e8f6562120e0063313e81716666cfcd362569b" + "reference": "93e761bb5367166ce98ba908d5eb0edd6be76792" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f6e8f6562120e0063313e81716666cfcd362569b", - "reference": "f6e8f6562120e0063313e81716666cfcd362569b", + "url": "https://api.github.com/repos/laravel/framework/zipball/93e761bb5367166ce98ba908d5eb0edd6be76792", + "reference": "93e761bb5367166ce98ba908d5eb0edd6be76792", "shasum": "" }, "require": { @@ -1204,20 +1159,20 @@ "framework", "laravel" ], - "time": "2018-09-18T13:34:05+00:00" + "time": "2018-09-25T14:29:00+00:00" }, { "name": "laravel/passport", - "version": "v7.0.1", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "90124969cdd4ff39d4cd5a608c23bbe16e772f7e" + "reference": "7bb53d1ae4f8f375cc9461d232053958740002da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/90124969cdd4ff39d4cd5a608c23bbe16e772f7e", - "reference": "90124969cdd4ff39d4cd5a608c23bbe16e772f7e", + "url": "https://api.github.com/repos/laravel/passport/zipball/7bb53d1ae4f8f375cc9461d232053958740002da", + "reference": "7bb53d1ae4f8f375cc9461d232053958740002da", "shasum": "" }, "require": { @@ -1273,7 +1228,7 @@ "oauth", "passport" ], - "time": "2018-08-13T14:45:04+00:00" + "time": "2018-09-25T14:23:48+00:00" }, { "name": "laravelcollective/html", @@ -1885,16 +1840,16 @@ }, { "name": "nesbot/carbon", - "version": "1.33.0", + "version": "1.34.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "55667c1007a99e82030874b1bb14d24d07108413" + "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/55667c1007a99e82030874b1bb14d24d07108413", - "reference": "55667c1007a99e82030874b1bb14d24d07108413", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", + "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", "shasum": "" }, "require": { @@ -1936,7 +1891,7 @@ "datetime", "time" ], - "time": "2018-08-07T08:39:47+00:00" + "time": "2018-09-20T19:36:25+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -2547,7 +2502,7 @@ }, { "name": "rcrowe/twigbridge", - "version": "v0.9.7", + "version": "v0.9.8", "source": { "type": "git", "url": "https://github.com/rcrowe/TwigBridge.git",