diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon index 6fc4f7bf39..faea2526d3 100644 --- a/.tools/phpstan/baseline.neon +++ b/.tools/phpstan/baseline.neon @@ -615,11 +615,6 @@ parameters: count: 1 path: ../../redaxo/src/addons/mediapool/lib/service_media_category.php - - - message: "#^Variable \\$warning in empty\\(\\) always exists and is always falsy\\.$#" - count: 1 - path: ../../redaxo/src/addons/mediapool/lib/service_media_category.php - - message: "#^Method rex_var_media\\:\\:getWidget\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#" count: 1 diff --git a/composer.json b/composer.json index a2d58d8f2a..34516c7c01 100644 --- a/composer.json +++ b/composer.json @@ -11,32 +11,32 @@ "ext-mbstring": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "v3.15.1", + "friendsofphp/php-cs-fixer": "v3.16.0", "friendsofredaxo/linter": "1.4.0", "j13k/yaml-lint": "@dev", "jetbrains/phpstorm-attributes": "^1.0", "phpstan/extension-installer": "1.2.0", - "phpstan/phpstan": "1.10.9", + "phpstan/phpstan": "1.10.12", "phpstan/phpstan-deprecation-rules": "1.1.3", "phpstan/phpstan-phpunit": "1.3.11", - "phpstan/phpstan-symfony": "1.2.24", + "phpstan/phpstan-symfony": "1.2.25", "phpunit/phpunit": "^10.0.7", "psalm/plugin-phpunit": "0.18.4", "psalm/plugin-symfony": "v5.0.2", - "rector/rector": "0.15.23", - "redaxo/php-cs-fixer-config": "2.1.1", + "rector/rector": "0.15.24", + "redaxo/php-cs-fixer-config": "2.1.2", "redaxo/psalm-plugin": "2.0.0", "vimeo/psalm": "5.9.0" }, "replace": { "erusev/parsedown": "1.7.4", "erusev/parsedown-extra": "0.8.1", - "filp/whoops": "2.14.5", + "filp/whoops": "2.15.2", "itsgoingd/clockwork": "v5.1.12", "lbuchs/webauthn": "v1.1.3", "phpmailer/phpmailer": "v6.8.0", "psr/container": "2.0.2", - "psr/http-message": "1.0.1", + "psr/http-message": "1.1", "psr/log": "1.1.4", "ramsey/collection": "1.3.0", "ramsey/http-range": "1.1.0", diff --git a/redaxo/src/core/boot.php b/redaxo/src/core/boot.php index 3f4977fd32..3041e25e73 100644 --- a/redaxo/src/core/boot.php +++ b/redaxo/src/core/boot.php @@ -90,7 +90,7 @@ require_once rex_path::core('functions/function_rex_other.php'); // ----------------- VERSION -rex::setProperty('version', '5.15.1'); +rex::setProperty('version', '5.15.2-dev'); $cacheFile = rex_path::coreCache('config.yml.cache'); $configFile = rex_path::coreData('config.yml'); diff --git a/redaxo/src/core/composer.json b/redaxo/src/core/composer.json index 2914ed496d..8779c22f5b 100644 --- a/redaxo/src/core/composer.json +++ b/redaxo/src/core/composer.json @@ -2,7 +2,7 @@ "require": { "erusev/parsedown": "^1.7.4", "erusev/parsedown-extra": "^0.8.1", - "filp/whoops": "2.14.5", + "filp/whoops": "^2.15.2", "lbuchs/webauthn": "^1.1.3", "psr/log": "^1.1.4", "ramsey/http-range": "^1.1", diff --git a/redaxo/src/core/composer.lock b/redaxo/src/core/composer.lock index 553eb5f179..3d390d4d29 100644 --- a/redaxo/src/core/composer.lock +++ b/redaxo/src/core/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "141c369c404f01318422b770ee20f80c", + "content-hash": "1bf477e3b550973a7fe0df6f8b34451a", "packages": [ { "name": "erusev/parsedown", @@ -109,16 +109,16 @@ }, { "name": "filp/whoops", - "version": "2.14.5", + "version": "2.15.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", "shasum": "" }, "require": { @@ -168,7 +168,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.5" + "source": "https://github.com/filp/whoops/tree/2.15.2" }, "funding": [ { @@ -176,7 +176,7 @@ "type": "github" } ], - "time": "2022-01-07T12:00:00+00:00" + "time": "2023-04-12T12:00:00+00:00" }, { "name": "lbuchs/webauthn", @@ -278,25 +278,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -325,9 +325,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", diff --git a/redaxo/src/core/fragments/core/footer.php b/redaxo/src/core/fragments/core/footer.php index 3d170593df..7dbe761e7a 100644 --- a/redaxo/src/core/fragments/core/footer.php +++ b/redaxo/src/core/fragments/core/footer.php @@ -11,7 +11,7 @@
  • yakamara.de
  • redaxo.org
  • isAdmin()): ?> -
  • +
  • time) ?>
  • diff --git a/redaxo/src/core/lib/error_handler.php b/redaxo/src/core/lib/error_handler.php index 2f71bd8d5a..30c76db3dd 100644 --- a/redaxo/src/core/lib/error_handler.php +++ b/redaxo/src/core/lib/error_handler.php @@ -270,9 +270,14 @@ private static function renderWhoops($exception) $errPage, ); - $errPage = preg_replace('@', $errPage); + $errPageMarkdownBtn = preg_replace( + '@', + $errPage, + ); + if (null !== $errPageMarkdownBtn) { + $errPage = $errPageMarkdownBtn; + } $errPage = str_replace('