aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2020-05-25 07:14:00 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2020-05-25 07:14:00 +0200
commit0cf743f6fbfbc449c599ee0271e4e62ece0e47ac (patch)
treeeaa2d7c76e3c24b3979afc866565c031a2861036
parent2a74acb77ff7f6bd107a9d7856c89da62d429e24 (diff)
downloadwallabag-0cf743f6fbfbc449c599ee0271e4e62ece0e47ac.tar.gz
wallabag-0cf743f6fbfbc449c599ee0271e4e62ece0e47ac.tar.zst
wallabag-0cf743f6fbfbc449c599ee0271e4e62ece0e47ac.zip
Lock scheb/two-factor-bundle to avoid issue with ListenerInterface / TwoFactorListener
- 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
-rw-r--r--composer.json2
-rw-r--r--composer.lock124
2 files changed, 94 insertions, 32 deletions
diff --git a/composer.json b/composer.json
index eb17e4fe..6133f5e8 100644
--- a/composer.json
+++ b/composer.json
@@ -80,7 +80,7 @@
80 "php-http/httplug-bundle": "^1.14", 80 "php-http/httplug-bundle": "^1.14",
81 "pragmarx/recovery": "^0.1.0", 81 "pragmarx/recovery": "^0.1.0",
82 "predis/predis": "v1.1.x-dev", 82 "predis/predis": "v1.1.x-dev",
83 "scheb/two-factor-bundle": "^4.4", 83 "scheb/two-factor-bundle": "4.5.0",
84 "sensio/distribution-bundle": "^5.0", 84 "sensio/distribution-bundle": "^5.0",
85 "sensio/framework-extra-bundle": "^5.2", 85 "sensio/framework-extra-bundle": "^5.2",
86 "sentry/sentry-symfony": "^3.0", 86 "sentry/sentry-symfony": "^3.0",
diff --git a/composer.lock b/composer.lock
index 1d16fb05..88a3d4ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "content-hash": "1c4d8b91a6e26715d15ccc11af7a362e", 7 "content-hash": "9460c8c5f1534c0655a9639167c3e1a1",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "bdunogier/guzzle-site-authenticator", 10 "name": "bdunogier/guzzle-site-authenticator",
@@ -841,6 +841,20 @@
841 "orm", 841 "orm",
842 "persistence" 842 "persistence"
843 ], 843 ],
844 "funding": [
845 {
846 "url": "https://www.doctrine-project.org/sponsorship.html",
847 "type": "custom"
848 },
849 {
850 "url": "https://www.patreon.com/phpdoctrine",
851 "type": "patreon"
852 },
853 {
854 "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-bundle",
855 "type": "tidelift"
856 }
857 ],
844 "time": "2020-04-23T10:38:48+00:00" 858 "time": "2020-04-23T10:38:48+00:00"
845 }, 859 },
846 { 860 {
@@ -1490,6 +1504,20 @@
1490 "orm", 1504 "orm",
1491 "persistence" 1505 "persistence"
1492 ], 1506 ],
1507 "funding": [
1508 {
1509 "url": "https://www.doctrine-project.org/sponsorship.html",
1510 "type": "custom"
1511 },
1512 {
1513 "url": "https://www.patreon.com/phpdoctrine",
1514 "type": "patreon"
1515 },
1516 {
1517 "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence",
1518 "type": "tidelift"
1519 }
1520 ],
1493 "time": "2020-03-21T15:13:52+00:00" 1521 "time": "2020-03-21T15:13:52+00:00"
1494 }, 1522 },
1495 { 1523 {
@@ -7499,51 +7527,45 @@
7499 }, 7527 },
7500 { 7528 {
7501 "name": "scheb/two-factor-bundle", 7529 "name": "scheb/two-factor-bundle",
7502 "version": "v4.16.0", 7530 "version": "v4.5.0",
7503 "source": { 7531 "source": {
7504 "type": "git", 7532 "type": "git",
7505 "url": "https://github.com/scheb/two-factor-bundle.git", 7533 "url": "https://github.com/scheb/two-factor-bundle.git",
7506 "reference": "44ae7d1394296ed54aa621dd96516786ade2eeed" 7534 "reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2"
7507 }, 7535 },
7508 "dist": { 7536 "dist": {
7509 "type": "zip", 7537 "type": "zip",
7510 "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/44ae7d1394296ed54aa621dd96516786ade2eeed", 7538 "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/8dd92c33aeff4a5274e782629a0c1df4bbf77db2",
7511 "reference": "44ae7d1394296ed54aa621dd96516786ade2eeed", 7539 "reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2",
7512 "shasum": "" 7540 "shasum": ""
7513 }, 7541 },
7514 "require": { 7542 "require": {
7515 "lcobucci/jwt": "^3.2", 7543 "lcobucci/jwt": "^3.2",
7516 "paragonie/constant_time_encoding": "^2.2", 7544 "paragonie/constant_time_encoding": "^2.2",
7517 "php": "^7.1.3", 7545 "php": "^7.1.3",
7518 "spomky-labs/otphp": "^9.1|^10.0", 7546 "spomky-labs/otphp": "^9.1",
7519 "symfony/config": "^3.4|^4.0|^5.0", 7547 "symfony/config": "^3.4|^4.0",
7520 "symfony/dependency-injection": "^3.4|^4.0|^5.0", 7548 "symfony/dependency-injection": "^3.4|^4.0",
7521 "symfony/event-dispatcher": "^3.4|^4.0|^5.0", 7549 "symfony/event-dispatcher": "^3.4|^4.0",
7522 "symfony/framework-bundle": "^3.4|^4.0|^5.0", 7550 "symfony/framework-bundle": "^3.4|^4.0",
7523 "symfony/http-foundation": "^3.4|^4.0|^5.0", 7551 "symfony/http-foundation": "^3.4|^4.0",
7524 "symfony/http-kernel": "^3.4|^4.0|^5.0", 7552 "symfony/http-kernel": "^3.4|^4.0",
7525 "symfony/property-access": "^3.4|^4.0|^5.0", 7553 "symfony/property-access": "^3.4|^4.0",
7526 "symfony/security-bundle": "^3.4|^4.0|^5.0", 7554 "symfony/security-bundle": "^3.4|^4.0",
7527 "symfony/twig-bundle": "^3.4|^4.0|^5.0" 7555 "symfony/twig-bundle": "^3.4|^4.0"
7528 }, 7556 },
7529 "require-dev": { 7557 "require-dev": {
7530 "doctrine/persistence": "^1.3", 7558 "doctrine/lexer": "^1.0.1",
7531 "escapestudios/symfony2-coding-standard": "^3.9", 7559 "doctrine/orm": "^2.6",
7532 "phpunit/phpunit": "^7.0|^8.0|^9.0", 7560 "phpunit/phpunit": "^7.0|^8.0",
7533 "squizlabs/php_codesniffer": "^3.5",
7534 "swiftmailer/swiftmailer": "^6.0", 7561 "swiftmailer/swiftmailer": "^6.0",
7535 "symfony/polyfill-php80": "^1.15", 7562 "symfony/yaml": "^3.4|^4.0"
7536 "symfony/yaml": "^3.4|^4.0|^5.0",
7537 "vimeo/psalm": "^3.11"
7538 }, 7563 },
7539 "type": "symfony-bundle", 7564 "type": "symfony-bundle",
7540 "autoload": { 7565 "autoload": {
7541 "psr-4": { 7566 "psr-4": {
7542 "Scheb\\TwoFactorBundle\\": "" 7567 "Scheb\\TwoFactorBundle\\": ""
7543 }, 7568 }
7544 "exclude-from-classmap": [
7545 "/Tests/"
7546 ]
7547 }, 7569 },
7548 "notification-url": "https://packagist.org/downloads/", 7570 "notification-url": "https://packagist.org/downloads/",
7549 "license": [ 7571 "license": [
@@ -7564,7 +7586,7 @@
7564 "two-factor", 7586 "two-factor",
7565 "two-step" 7587 "two-step"
7566 ], 7588 ],
7567 "time": "2020-05-08T19:32:30+00:00" 7589 "time": "2019-08-07T18:26:54+00:00"
7568 }, 7590 },
7569 { 7591 {
7570 "name": "sensio/distribution-bundle", 7592 "name": "sensio/distribution-bundle",
@@ -9670,6 +9692,20 @@
9670 "keywords": [ 9692 "keywords": [
9671 "framework" 9693 "framework"
9672 ], 9694 ],
9695 "funding": [
9696 {
9697 "url": "https://symfony.com/sponsor",
9698 "type": "custom"
9699 },
9700 {
9701 "url": "https://github.com/fabpot",
9702 "type": "github"
9703 },
9704 {
9705 "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
9706 "type": "tidelift"
9707 }
9708 ],
9673 "time": "2020-04-28T17:41:57+00:00" 9709 "time": "2020-04-28T17:41:57+00:00"
9674 }, 9710 },
9675 { 9711 {
@@ -9931,8 +9967,8 @@
9931 "authors": [ 9967 "authors": [
9932 { 9968 {
9933 "name": "Sander Kromwijk", 9969 "name": "Sander Kromwijk",
9934 "role": "Original developer", 9970 "email": "s.kromwijk@gmail.co",
9935 "email": "s.kromwijk@gmail.co" 9971 "role": "Original developer"
9936 }, 9972 },
9937 { 9973 {
9938 "name": "Nicolas LÅ“uillet", 9974 "name": "Nicolas LÅ“uillet",
@@ -10128,7 +10164,7 @@
10128 "email": "adrien.brault@gmail.com" 10164 "email": "adrien.brault@gmail.com"
10129 }, 10165 },
10130 { 10166 {
10131 "name": "William Durand", 10167 "name": "William DURAND",
10132 "email": "william.durand1@gmail.com" 10168 "email": "william.durand1@gmail.com"
10133 } 10169 }
10134 ], 10170 ],
@@ -10178,7 +10214,7 @@
10178 ], 10214 ],
10179 "authors": [ 10215 "authors": [
10180 { 10216 {
10181 "name": "William Durand", 10217 "name": "William DURAND",
10182 "email": "william.durand1@gmail.com" 10218 "email": "william.durand1@gmail.com"
10183 } 10219 }
10184 ], 10220 ],
@@ -10386,6 +10422,12 @@
10386 "Xdebug", 10422 "Xdebug",
10387 "performance" 10423 "performance"
10388 ], 10424 ],
10425 "funding": [
10426 {
10427 "url": "https://packagist.com",
10428 "type": "custom"
10429 }
10430 ],
10389 "time": "2020-03-01T12:26:26+00:00" 10431 "time": "2020-03-01T12:26:26+00:00"
10390 }, 10432 },
10391 { 10433 {
@@ -10575,6 +10617,20 @@
10575 "Fixture", 10617 "Fixture",
10576 "persistence" 10618 "persistence"
10577 ], 10619 ],
10620 "funding": [
10621 {
10622 "url": "https://www.doctrine-project.org/sponsorship.html",
10623 "type": "custom"
10624 },
10625 {
10626 "url": "https://www.patreon.com/phpdoctrine",
10627 "type": "patreon"
10628 },
10629 {
10630 "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle",
10631 "type": "tidelift"
10632 }
10633 ],
10578 "time": "2020-04-02T16:40:37+00:00" 10634 "time": "2020-04-02T16:40:37+00:00"
10579 }, 10635 },
10580 { 10636 {
@@ -10666,6 +10722,12 @@
10666 } 10722 }
10667 ], 10723 ],
10668 "description": "A tool to automatically fix PHP code style", 10724 "description": "A tool to automatically fix PHP code style",
10725 "funding": [
10726 {
10727 "url": "https://github.com/keradus",
10728 "type": "github"
10729 }
10730 ],
10669 "time": "2020-04-15T18:51:10+00:00" 10731 "time": "2020-04-15T18:51:10+00:00"
10670 }, 10732 },
10671 { 10733 {