From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Fri, 18 Jan 2019 15:50:24 +0000 (+0100)
Subject: Merge pull request #3858 from wallabag/bump-ocramius
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c73025ad8b684de1ac21ba7583f1af6f1d185159;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3858 from wallabag/bump-ocramius

Bump ocramius/proxy-manager
---

c73025ad8b684de1ac21ba7583f1af6f1d185159
diff --combined composer.json
index 89286c7f,5394442d..21d71b74
--- a/composer.json
+++ b/composer.json
@@@ -2,7 -2,10 +2,10 @@@
      "name": "wallabag/wallabag",
      "type": "project",
      "description": "open source self hostable read-it-later web application",
-     "keywords": ["read-it-later","read it later"],
+     "keywords": [
+         "read-it-later",
+         "read it later"
+     ],
      "homepage": "https://github.com/wallabag/wallabag",
      "license": "MIT",
      "authors": [
@@@ -75,28 -78,24 +78,28 @@@
          "doctrine/doctrine-migrations-bundle": "^1.3",
          "craue/config-bundle": "dev-utf8mb4",
          "mnapoli/piwik-twig-extension": "^1.0",
-         "ocramius/proxy-manager": "^1.0.2",
+         "ocramius/proxy-manager": "^2.1.1",
          "white-october/pagerfanta-bundle": "^1.1",
          "php-amqplib/rabbitmq-bundle": "^1.14",
          "predis/predis": "v1.1.x-dev",
          "javibravo/simpleue": "^2.0",
          "symfony/dom-crawler": "^3.4",
          "friendsofsymfony/jsrouting-bundle": "^2.2",
 -        "bdunogier/guzzle-site-authenticator": "^1.0.0@dev",
 +        "bdunogier/guzzle-site-authenticator": "^1.0.0",
          "defuse/php-encryption": "^2.1",
          "html2text/html2text": "^4.1"
      },
      "require-dev": {
          "doctrine/doctrine-fixtures-bundle": "~3.0",
          "sensio/generator-bundle": "^3.0",
 -        "symfony/phpunit-bridge": "^3.4",
 +        "symfony/phpunit-bridge": "^4.2",
          "friendsofphp/php-cs-fixer": "~2.13",
          "m6web/redis-mock": "^4.1",
 -        "dama/doctrine-test-bundle": "^5.0"
 +        "dama/doctrine-test-bundle": "^5.0",
 +        "phpstan/phpstan": "^0.11.0",
 +        "phpstan/phpstan-phpunit": "^0.11.0",
 +        "phpstan/phpstan-symfony": "^0.11.0",
 +        "phpstan/phpstan-doctrine": "^0.11.0"
      },
      "scripts": {
          "post-cmd": [
@@@ -137,7 -136,9 +140,9 @@@
          "psr-4": {
              "Tests\\": "tests/"
          },
-         "files": [ "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
+         "files": [
+             "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
+         ]
      },
      "config": {
          "bin-dir": "bin",