mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-18 05:00:36 +00:00
Code Issues Projects Releases Wiki Activity

Lock scheb/two-factor-bundle to avoid issue with ListenerInterface / TwoFactorListener

Browse source 
- v4.6.0 introduce a fix for "deprecated listener for Symfony < 4.3"
- but sentry-symfony 3.3.0 introduce a bug in the workaround previous fix
- which was fixed in sentry-symfony 3.4.2
- we can't upgrade to that version because it requires sentry/sdk 2.1 which use `php-http/guzzle6-adapter` instead of curl
- as we are using guzzle5, we can't upgrade and fix the listerner issue
This commit is contained in:
Jeremy Benoist 2020-05-25 07:14:00 +02:00
parent 2a74acb77f
commit 0cf743f6fb
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 94 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -80,7 +80,7 @@
"php-http/httplug-bundle": "^1.14",
"pragmarx/recovery": "^0.1.0",
"predis/predis": "v1.1.x-dev",
"scheb/two-factor-bundle": "^4.4",
"scheb/two-factor-bundle": "4.5.0",
"sensio/distribution-bundle": "^5.0",
"sensio/framework-extra-bundle": "^5.2",
"sentry/sentry-symfony": "^3.0",

124
composer.lock generated
View file

@ -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": "1c4d8b91a6e26715d15ccc11af7a362e",
"content-hash": "9460c8c5f1534c0655a9639167c3e1a1",
"packages": [
{
"name": "bdunogier/guzzle-site-authenticator",
@ -841,6 +841,20 @@
"orm",
"persistence"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-bundle",
"type": "tidelift"
}
],
"time": "2020-04-23T10:38:48+00:00"
},
{
@ -1490,6 +1504,20 @@
"orm",
"persistence"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence",
"type": "tidelift"
}
],
"time": "2020-03-21T15:13:52+00:00"
},
{
@ -7499,51 +7527,45 @@
},
{
"name": "scheb/two-factor-bundle",
"version": "v4.16.0",
"version": "v4.5.0",
"source": {
"type": "git",
"url": "https://github.com/scheb/two-factor-bundle.git",
"reference": "44ae7d1394296ed54aa621dd96516786ade2eeed"
"reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/44ae7d1394296ed54aa621dd96516786ade2eeed",
"reference": "44ae7d1394296ed54aa621dd96516786ade2eeed",
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/8dd92c33aeff4a5274e782629a0c1df4bbf77db2",
"reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2",
"shasum": ""
},
"require": {
"lcobucci/jwt": "^3.2",
"paragonie/constant_time_encoding": "^2.2",
"php": "^7.1.3",
"spomky-labs/otphp": "^9.1|^10.0",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/event-dispatcher": "^3.4|^4.0|^5.0",
"symfony/framework-bundle": "^3.4|^4.0|^5.0",
"symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/http-kernel": "^3.4|^4.0|^5.0",
"symfony/property-access": "^3.4|^4.0|^5.0",
"symfony/security-bundle": "^3.4|^4.0|^5.0",
"symfony/twig-bundle": "^3.4|^4.0|^5.0"
"spomky-labs/otphp": "^9.1",
"symfony/config": "^3.4|^4.0",
"symfony/dependency-injection": "^3.4|^4.0",
"symfony/event-dispatcher": "^3.4|^4.0",
"symfony/framework-bundle": "^3.4|^4.0",
"symfony/http-foundation": "^3.4|^4.0",
"symfony/http-kernel": "^3.4|^4.0",
"symfony/property-access": "^3.4|^4.0",
"symfony/security-bundle": "^3.4|^4.0",
"symfony/twig-bundle": "^3.4|^4.0"
},
"require-dev": {
"doctrine/persistence": "^1.3",
"escapestudios/symfony2-coding-standard": "^3.9",
"phpunit/phpunit": "^7.0|^8.0|^9.0",
"squizlabs/php_codesniffer": "^3.5",
"doctrine/lexer": "^1.0.1",
"doctrine/orm": "^2.6",
"phpunit/phpunit": "^7.0|^8.0",
"swiftmailer/swiftmailer": "^6.0",
"symfony/polyfill-php80": "^1.15",
"symfony/yaml": "^3.4|^4.0|^5.0",
"vimeo/psalm": "^3.11"
"symfony/yaml": "^3.4|^4.0"
},
"type": "symfony-bundle",
"autoload": {
"psr-4": {
"Scheb\\TwoFactorBundle\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -7564,7 +7586,7 @@
"two-factor",
"two-step"
],
"time": "2020-05-08T19:32:30+00:00"
"time": "2019-08-07T18:26:54+00:00"
},
{
"name": "sensio/distribution-bundle",
@ -9670,6 +9692,20 @@
"keywords": [
"framework"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-28T17:41:57+00:00"
},
{
@ -9931,8 +9967,8 @@
"authors": [
{
"name": "Sander Kromwijk",
"role": "Original developer",
"email": "s.kromwijk@gmail.co"
"email": "s.kromwijk@gmail.co",
"role": "Original developer"
},
{
"name": "Nicolas Lœuillet",
@ -10128,7 +10164,7 @@
"email": "adrien.brault@gmail.com"
},
{
"name": "William Durand",
"name": "William DURAND",
"email": "william.durand1@gmail.com"
}
],
@ -10178,7 +10214,7 @@
],
"authors": [
{
"name": "William Durand",
"name": "William DURAND",
"email": "william.durand1@gmail.com"
}
],
@ -10386,6 +10422,12 @@
"Xdebug",
"performance"
],
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
}
],
"time": "2020-03-01T12:26:26+00:00"
},
{
@ -10575,6 +10617,20 @@
"Fixture",
"persistence"
],
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle",
"type": "tidelift"
}
],
"time": "2020-04-02T16:40:37+00:00"
},
{
@ -10666,6 +10722,12 @@
}
],
"description": "A tool to automatically fix PHP code style",
"funding": [
{
"url": "https://github.com/keradus",
"type": "github"
}
],
"time": "2020-04-15T18:51:10+00:00"
},
{