Skip to content

Commit

Permalink
Vendor-Updates (#5689)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gharlan
gharlan committed Apr 12, 2023
1 parent e2ac621 commit cd835e3
Show file tree
Hide file tree
Showing 35 changed files with 341 additions and 365 deletions.
5 changes: 0 additions & 5 deletions .tools/phpstan/baseline.neon
View file
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/core/composer.json
View file
Expand Up @@ -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",
Expand Down
30 changes: 15 additions & 15 deletions redaxo/src/core/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions redaxo/src/core/vendor/composer/autoload_classmap.php
View file
Expand Up @@ -385,6 +385,9 @@
'Whoops\\Handler\\PlainTextHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/PlainTextHandler.php',
'Whoops\\Handler\\PrettyPageHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php',
'Whoops\\Handler\\XmlResponseHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php',
'Whoops\\Inspector\\InspectorFactory' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorFactory.php',
'Whoops\\Inspector\\InspectorFactoryInterface' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorFactoryInterface.php',
'Whoops\\Inspector\\InspectorInterface' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorInterface.php',
'Whoops\\Run' => $vendorDir . '/filp/whoops/src/Whoops/Run.php',
'Whoops\\RunInterface' => $vendorDir . '/filp/whoops/src/Whoops/RunInterface.php',
'Whoops\\Util\\HtmlDumperOutput' => $vendorDir . '/filp/whoops/src/Whoops/Util/HtmlDumperOutput.php',
Expand Down
3 changes: 3 additions & 0 deletions redaxo/src/core/vendor/composer/autoload_static.php
View file
Expand Up @@ -507,6 +507,9 @@ class ComposerStaticInitRedaxoCore
'Whoops\\Handler\\PlainTextHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/PlainTextHandler.php',
'Whoops\\Handler\\PrettyPageHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php',
'Whoops\\Handler\\XmlResponseHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php',
'Whoops\\Inspector\\InspectorFactory' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorFactory.php',
'Whoops\\Inspector\\InspectorFactoryInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorFactoryInterface.php',
'Whoops\\Inspector\\InspectorInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorInterface.php',
'Whoops\\Run' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Run.php',
'Whoops\\RunInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/RunInterface.php',
'Whoops\\Util\\HtmlDumperOutput' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Util/HtmlDumperOutput.php',
Expand Down
32 changes: 16 additions & 16 deletions redaxo/src/core/vendor/composer/installed.json
View file
Expand Up @@ -109,17 +109,17 @@
},
{
"name": "filp/whoops",
"version": "2.14.5",
"version_normalized": "2.14.5.0",
"version": "2.15.2",
"version_normalized": "2.15.2.0",
"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": {
Expand All @@ -135,7 +135,7 @@
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
"whoops/soap": "Formats errors as SOAP responses"
},
"time": "2022-01-07T12:00:00+00:00",
"time": "2023-04-12T12:00:00+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -171,7 +171,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": [
{
Expand Down Expand Up @@ -287,27 +287,27 @@
},
{
"name": "psr/http-message",
"version": "1.0.1",
"version_normalized": "1.0.1.0",
"version": "1.1",
"version_normalized": "1.1.0.0",
"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"
},
"time": "2016-08-06T14:39:51+00:00",
"time": "2023-04-04T09:50:52+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"installation-source": "dist",
Expand Down Expand Up @@ -337,7 +337,7 @@
"response"
],
"support": {
"source": "https://github.com/php-fig/http-message/tree/master"
"source": "https://github.com/php-fig/http-message/tree/1.1"
},
"install-path": "../psr/http-message"
},
Expand Down
16 changes: 8 additions & 8 deletions redaxo/src/core/vendor/composer/installed.php
View file
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '1853e6c49a5d134456acd80f42aff857619bbe7d',
'reference' => 'e2ac6212c62cf4d4c2b55095712624cd14552831',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '1853e6c49a5d134456acd80f42aff857619bbe7d',
'reference' => 'e2ac6212c62cf4d4c2b55095712624cd14552831',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -38,9 +38,9 @@
'dev_requirement' => false,
),
'filp/whoops' => array(
'pretty_version' => '2.14.5',
'version' => '2.14.5.0',
'reference' => 'a63e5e8f26ebbebf8ed3c5c691637325512eb0dc',
'pretty_version' => '2.15.2',
'version' => '2.15.2.0',
'reference' => 'aac9304c5ed61bf7b1b7a6064bf9806ab842ce73',
'type' => 'library',
'install_path' => __DIR__ . '/../filp/whoops',
'aliases' => array(),
Expand All @@ -65,9 +65,9 @@
'dev_requirement' => false,
),
'psr/http-message' => array(
'pretty_version' => '1.0.1',
'version' => '1.0.1.0',
'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
'pretty_version' => '1.1',
'version' => '1.1.0.0',
'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba',
'type' => 'library',
'install_path' => __DIR__ . '/../psr/http-message',
'aliases' => array(),
Expand Down
13 changes: 8 additions & 5 deletions redaxo/src/core/vendor/filp/whoops/src/Whoops/Exception/Formatter.php
View file
Expand Up @@ -6,16 +6,19 @@

namespace Whoops\Exception;

use Whoops\Inspector\InspectorInterface;

class Formatter
{
/**
* Returns all basic information about the exception in a simple array
* for further convertion to other languages
* @param Inspector $inspector
* @param bool $shouldAddTrace
* @param InspectorInterface $inspector
* @param bool $shouldAddTrace
* @param array<callable> $frameFilters
* @return array
*/
public static function formatExceptionAsDataArray(Inspector $inspector, $shouldAddTrace)
public static function formatExceptionAsDataArray(InspectorInterface $inspector, $shouldAddTrace, array $frameFilters = [])
{
$exception = $inspector->getException();
$response = [
Expand All @@ -27,7 +30,7 @@ public static function formatExceptionAsDataArray(Inspector $inspector, $shouldA
];

if ($shouldAddTrace) {
$frames = $inspector->getFrames();
$frames = $inspector->getFrames($frameFilters);
$frameData = [];

foreach ($frames as $frame) {
Expand All @@ -47,7 +50,7 @@ public static function formatExceptionAsDataArray(Inspector $inspector, $shouldA
return $response;
}

public static function formatExceptionPlain(Inspector $inspector)
public static function formatExceptionPlain(InspectorInterface $inspector)
{
$message = $inspector->getException()->getMessage();
$frames = $inspector->getFrames();
Expand Down
3 changes: 0 additions & 3 deletions redaxo/src/core/vendor/filp/whoops/src/Whoops/Exception/Frame.php
View file
Expand Up @@ -31,9 +31,6 @@ class Frame implements Serializable
*/
protected $application;

/**
* @param array[]
*/
public function __construct(array $frame)
{
$this->frame = $frame;
Expand Down
3 changes: 0 additions & 3 deletions redaxo/src/core/vendor/filp/whoops/src/Whoops/Exception/FrameCollection.php
View file
Expand Up @@ -25,9 +25,6 @@ class FrameCollection implements ArrayAccess, IteratorAggregate, Serializable, C
*/
private $frames;

/**
* @param array $frames
*/
public function __construct(array $frames)
{
$this->frames = array_map(function ($frame) {
Expand Down

0 comments on commit cd835e3

Please sign in to comment.