From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 3 Feb 2020 06:23:56 +0000 (+0100)
Subject: Merge pull request #4277 from wallabag/dependabot/composer/symfony/phpunit-bridge... 
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3bf941c4a422237f678fd47a67b26e1b27f159ba;hp=2a59cfa331812d75da2303e96fcd2d869fc7c2f6;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #4277 from wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.11

Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11
---

diff --git a/composer.lock b/composer.lock
index 341bb54e..4cae381f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1972,16 +1972,16 @@
         },
         {
             "name": "friendsofsymfony/rest-bundle",
-            "version": "2.6.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "54758949bff9fc520997415341323eebf3f54892"
+                "reference": "42bdfed7db4e253fbd1b295ad06777f01a6d0450"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/54758949bff9fc520997415341323eebf3f54892",
-                "reference": "54758949bff9fc520997415341323eebf3f54892",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/42bdfed7db4e253fbd1b295ad06777f01a6d0450",
+                "reference": "42bdfed7db4e253fbd1b295ad06777f01a6d0450",
                 "shasum": ""
             },
             "require": {
@@ -2007,7 +2007,8 @@
                 "sensio/framework-extra-bundle": "<3.0.13"
             },
             "require-dev": {
-                "jms/serializer": "^1.13|^2.0",
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "jms/serializer": "^1.13|^2.0|^3.0",
                 "jms/serializer-bundle": "^2.3.1|^3.0",
                 "phpoption/phpoption": "^1.1",
                 "psr/http-message": "^1.0",
@@ -2036,7 +2037,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
@@ -2070,7 +2071,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2019-10-21T08:22:30+00:00"
+            "time": "2020-01-31T15:56:38+00:00"
         },
         {
             "name": "friendsofsymfony/user-bundle",
@@ -7322,16 +7323,16 @@
         },
         {
             "name": "scheb/two-factor-bundle",
-            "version": "v4.12.0",
+            "version": "v4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scheb/two-factor-bundle.git",
-                "reference": "d45bac6a6e4932ac43c2a478a85bf9ab5cb9efb4"
+                "reference": "ebbd21a767b21e62272a67d50e4265a0dccd87c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/d45bac6a6e4932ac43c2a478a85bf9ab5cb9efb4",
-                "reference": "d45bac6a6e4932ac43c2a478a85bf9ab5cb9efb4",
+                "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ebbd21a767b21e62272a67d50e4265a0dccd87c4",
+                "reference": "ebbd21a767b21e62272a67d50e4265a0dccd87c4",
                 "shasum": ""
             },
             "require": {
@@ -7386,7 +7387,7 @@
                 "two-factor",
                 "two-step"
             ],
-            "time": "2020-01-12T14:01:09+00:00"
+            "time": "2020-02-02T19:54:11+00:00"
         },
         {
             "name": "sensio/distribution-bundle",