From 22124aced71d9ebe6f4fee48767825d6f2ac1396 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Tue, 22 Dec 2020 09:30:35 +0100
Subject: [PATCH] Updated more dependencies for PHP 8 compatibility
---
composer.json | 18 +++++++++---------
module/Core/src/Model/ShortUrlsOrdering.php | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/composer.json b/composer.json
index 652ff9b0..b4ed33a2 100644
--- a/composer.json
+++ b/composer.json
@@ -34,9 +34,9 @@
"laminas/laminas-stdlib": "^3.2",
"lcobucci/jwt": "^4.0",
"league/uri": "^6.2",
- "lstrojny/functional-php": "dev-master#5b78132 as 1.15",
+ "lstrojny/functional-php": "^1.15",
"mezzio/mezzio": "^3.2",
- "mezzio/mezzio-fastroute": "^3.0",
+ "mezzio/mezzio-fastroute": "^3.1",
"mezzio/mezzio-helpers": "^5.3",
"mezzio/mezzio-problem-details": "^1.1",
"mezzio/mezzio-swoole": "^2.6.4",
@@ -61,18 +61,18 @@
"symfony/string": "^5.1"
},
"require-dev": {
- "devster/ubench": "^2.0",
- "dms/phpunit-arraysubset-asserts": "^0.2.0",
+ "devster/ubench": "^2.1",
+ "dms/phpunit-arraysubset-asserts": "^0.2.1",
"eaglewu/swoole-ide-helper": "dev-master",
- "infection/infection": "^0.20.0",
+ "infection/infection": "^0.20.2",
"phpspec/prophecy-phpunit": "^2.0",
- "phpstan/phpstan": "^0.12.52",
+ "phpstan/phpstan": "^0.12.64",
"phpunit/php-code-coverage": "^9.2",
- "phpunit/phpunit": "^9.4",
+ "phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",
"shlinkio/php-coding-standard": "~2.1.1",
- "shlinkio/shlink-test-utils": "^1.5",
- "symfony/var-dumper": "^5.1"
+ "shlinkio/shlink-test-utils": "^1.6",
+ "symfony/var-dumper": "^5.2"
},
"autoload": {
"psr-4": {
diff --git a/module/Core/src/Model/ShortUrlsOrdering.php b/module/Core/src/Model/ShortUrlsOrdering.php
index 25c7c940..e1708a86 100644
--- a/module/Core/src/Model/ShortUrlsOrdering.php
+++ b/module/Core/src/Model/ShortUrlsOrdering.php
@@ -35,7 +35,6 @@ final class ShortUrlsOrdering
*/
private function validateAndInit(array $data): void
{
- /** @var string|array|null $orderBy */
$orderBy = $data[self::ORDER_BY] ?? null;
if ($orderBy === null) {
return;
@@ -49,6 +48,7 @@ final class ShortUrlsOrdering
]);
}
+ /** @var string|array $orderBy */
if (! $isArray) {
$parts = explode('-', $orderBy);
$this->orderField = $parts[0];