From c2c22d31eb728c64c87db88406f49310d68580e0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 10 Feb 2021 09:14:20 +0100
Subject: update to 5.1.0-rc2

---
 composer.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index d4e4c94..d1a63b0 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
         "ext-xml": "*",
         "google/recaptcha": "^1.1",
         "nikic/fast-route": "^1.3",
-        "phpmyadmin/motranslator": "~5.0.0",
+        "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^2.0",
         "phpmyadmin/sql-parser": "^5.0",
         "phpmyadmin/twig-i18n-extension": "^3.0",
@@ -84,7 +84,7 @@
         "php-webdriver/webdriver": "^1.8",
         "phpmyadmin/coding-standard": "^2.1.1",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.61",
+        "phpstan/phpstan": "^0.12.73",
         "phpstan/phpstan-phpunit": "^0.12.17",
         "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
         "pragmarx/google2fa-qrcode": "^1.0.1",
@@ -92,12 +92,12 @@
         "symfony/console": "^4.4",
         "symfony/finder": "^4.4",
         "symfony/twig-bridge": "^4.4",
-        "tecnickcom/tcpdf": "^6.3",
-        "vimeo/psalm": "^4.1.1"
+        "tecnickcom/tcpdf": "dev-main#456b794f1fae9aee5c151a1ee515aae2aaa619a3",
+        "vimeo/psalm": "^4.4.1"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1.x-dev"
+            "dev-master": "5.2.x-dev"
         }
     },
     "scripts": {
@@ -116,6 +116,7 @@
         "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations"
     },
     "config":{
-        "sort-packages": true
+        "sort-packages": true,
+        "discard-changes": true
     }
 }
-- 
cgit