Update vendor (#5301)

redaxo · Aug 11, 2022 · 00af889 · 00af889
1 parent 790c7a9
commit 00af889
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 41 deletions.
diff --git a/.tools/psalm/baseline-taint.xml b/.tools/psalm/baseline-taint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="v4.25.0@d7cd84c4ebca74ba3419b9601f81d177bcbe2aac">
+<files psalm-version="4.26.0@6998fabb2bf528b65777bf9941920888d23c03ac">
   <file src="redaxo/src/core/lib/response.php">
     <TaintedHeader occurrences="1">
       <code>$str</code>

diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="v4.25.0@d7cd84c4ebca74ba3419b9601f81d177bcbe2aac">
+<files psalm-version="4.26.0@6998fabb2bf528b65777bf9941920888d23c03ac">
   <file src="redaxo/src/addons/backup/lib/backup.php">
     <MixedArgument occurrences="5">
       <code>$column</code>

diff --git a/composer.json b/composer.json
@@ -18,14 +18,14 @@
         "phpstan/phpstan": "1.8.2",
         "phpstan/phpstan-deprecation-rules": "1.0.0",
         "phpstan/phpstan-phpunit": "1.1.1",
-        "phpstan/phpstan-symfony": "1.2.8",
+        "phpstan/phpstan-symfony": "1.2.9",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "0.17.0",
         "psalm/plugin-symfony": "3.1.8",
-        "rector/rector": "0.13.9",
+        "rector/rector": "0.13.10",
         "redaxo/php-cs-fixer-config": "1.0.0",
         "redaxo/psalm-plugin": "1.0.0",
-        "vimeo/psalm": "4.25.0"
+        "vimeo/psalm": "4.26.0"
     },
     "replace": {
         "erusev/parsedown": "1.7.4",
@@ -55,7 +55,7 @@
         "symfony/yaml": "v5.4.11",
         "voku/anti-xss": "4.1.39",
         "voku/portable-ascii": "2.0.1",
-        "voku/portable-utf8": "6.0.4"
+        "voku/portable-utf8": "6.0.5"
     },
     "autoload": {
         "classmap": [

diff --git a/redaxo/src/core/composer.lock b/redaxo/src/core/composer.lock
diff --git a/redaxo/src/core/vendor/composer/installed.json b/redaxo/src/core/vendor/composer/installed.json
@@ -490,12 +490,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "83594c26a26f66af6e5322b9011b2e243a5509e8"
+                "reference": "8b99cfd0a6224d0fc7b223603210d48e36a79966"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/83594c26a26f66af6e5322b9011b2e243a5509e8",
-                "reference": "83594c26a26f66af6e5322b9011b2e243a5509e8",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8b99cfd0a6224d0fc7b223603210d48e36a79966",
+                "reference": "8b99cfd0a6224d0fc7b223603210d48e36a79966",
                 "shasum": ""
             },
             "conflict": {
@@ -613,6 +613,7 @@
                 "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15",
                 "flarum/tags": "<=0.1-beta.13",
                 "fluidtypo3/vhs": "<5.1.1",
+                "fof/byobu": ">=0.3-beta.2,<1.1.7",
                 "fof/upload": "<1.2.3",
                 "fooman/tcpdf": "<6.2.22",
                 "forkcms/forkcms": "<5.11.1",
@@ -964,7 +965,7 @@
                 "zfr/zfr-oauth2-server-module": "<0.1.2",
                 "zoujingli/thinkadmin": "<6.0.22"
             },
-            "time": "2022-07-29T23:04:14+00:00",
+            "time": "2022-08-06T06:06:57+00:00",
             "type": "metapackage",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1925,17 +1926,17 @@
         },
         {
             "name": "voku/portable-utf8",
-            "version": "6.0.4",
-            "version_normalized": "6.0.4.0",
+            "version": "6.0.5",
+            "version_normalized": "6.0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-utf8.git",
-                "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8"
+                "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/f6c78e492520115bb2d947c3a0d90a2c6b7a60a8",
-                "reference": "f6c78e492520115bb2d947c3a0d90a2c6b7a60a8",
+                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/6c764c2c4fcad451a0f6622260a4934cfea08aa4",
+                "reference": "6c764c2c4fcad451a0f6622260a4934cfea08aa4",
                 "shasum": ""
             },
             "require": {
@@ -1958,7 +1959,7 @@
                 "ext-json": "Use JSON for string detection",
                 "ext-mbstring": "Use Mbstring for best performance"
             },
-            "time": "2022-03-08T17:04:59+00:00",
+            "time": "2022-08-10T12:32:31+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1999,7 +2000,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-utf8/issues",
-                "source": "https://github.com/voku/portable-utf8/tree/6.0.4"
+                "source": "https://github.com/voku/portable-utf8/tree/6.0.5"
             },
             "funding": [
                 {

diff --git a/redaxo/src/core/vendor/composer/installed.php b/redaxo/src/core/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '778616cc0e7b83e69643477015d0f948a0a94283',
+        'reference' => '790c7a9aa44c6ade2e844936d58472a88007f237',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '778616cc0e7b83e69643477015d0f948a0a94283',
+            'reference' => '790c7a9aa44c6ade2e844936d58472a88007f237',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -100,7 +100,7 @@
         'roave/security-advisories' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '83594c26a26f66af6e5322b9011b2e243a5509e8',
+            'reference' => '8b99cfd0a6224d0fc7b223603210d48e36a79966',
             'type' => 'metapackage',
             'install_path' => NULL,
             'aliases' => array(),
@@ -248,9 +248,9 @@
             'dev_requirement' => false,
         ),
         'voku/portable-utf8' => array(
-            'pretty_version' => '6.0.4',
-            'version' => '6.0.4.0',
-            'reference' => 'f6c78e492520115bb2d947c3a0d90a2c6b7a60a8',
+            'pretty_version' => '6.0.5',
+            'version' => '6.0.5.0',
+            'reference' => '6c764c2c4fcad451a0f6622260a4934cfea08aa4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../voku/portable-utf8',
             'aliases' => array(),

diff --git a/redaxo/src/core/vendor/voku/portable-utf8/src/voku/helper/UTF8.php b/redaxo/src/core/vendor/voku/portable-utf8/src/voku/helper/UTF8.php
@@ -4148,7 +4148,7 @@ public static function json_decode(
      * (PHP 5 &gt;= 5.2.0, PECL json &gt;= 1.2.0)<br/>
      * Returns the JSON representation of a value.
      *
-     * EXAMPLE: <code>UTF8::json_enocde(array(1, '¥', 'ä')); // '[1,"\u00a5","\u00e4"]'</code>
+     * EXAMPLE: <code>UTF8::json_encode(array(1, '¥', 'ä')); // '[1,"\u00a5","\u00e4"]'</code>
      *
      * @see http://php.net/manual/en/function.json-encode.php
      *
@@ -4386,7 +4386,7 @@ public static function ltrim(string $str = '', string $chars = null): string
             if ($chars !== null) {
                 /** @noinspection PregQuoteUsageInspection */
                 $chars = \preg_quote($chars);
-                $pattern = "^[${chars}]+";
+                $pattern = "^[{$chars}]+";
             } else {
                 $pattern = '^[\\s]+';
             }
@@ -4396,7 +4396,7 @@ public static function ltrim(string $str = '', string $chars = null): string
 
         if ($chars !== null) {
             $chars = \preg_quote($chars, '/');
-            $pattern = "^[${chars}]+";
+            $pattern = "^[{$chars}]+";
         } else {
             $pattern = '^[\\s]+';
         }
@@ -5418,7 +5418,7 @@ public static function rtrim(string $str = '', string $chars = null): string
             if ($chars !== null) {
                 /** @noinspection PregQuoteUsageInspection */
                 $chars = \preg_quote($chars);
-                $pattern = "[${chars}]+$";
+                $pattern = "[{$chars}]+$";
             } else {
                 $pattern = '[\\s]+$';
             }
@@ -5428,7 +5428,7 @@ public static function rtrim(string $str = '', string $chars = null): string
 
         if ($chars !== null) {
             $chars = \preg_quote($chars, '/');
-            $pattern = "[${chars}]+$";
+            $pattern = "[{$chars}]+$";
         } else {
             $pattern = '[\\s]+$';
         }
@@ -11395,7 +11395,11 @@ public static function substr(
 
         // otherwise we need the string-length
         $str_length = 0;
-        if ($offset || $length === null) {
+        if (
+            $offset
+            ||
+            $length === null /* @phpstan-ignore-line | can be NULL here?! */
+        ) {
             $str_length = self::strlen($str, $encoding);
         }
 
@@ -12629,7 +12633,7 @@ public static function trim(string $str = '', string $chars = null): string
             if ($chars !== null) {
                 /** @noinspection PregQuoteUsageInspection */
                 $chars = \preg_quote($chars);
-                $pattern = "^[${chars}]+|[${chars}]+\$";
+                $pattern = "^[{$chars}]+|[{$chars}]+\$";
             } else {
                 $pattern = '^[\\s]+|[\\s]+$';
             }
@@ -12639,7 +12643,7 @@ public static function trim(string $str = '', string $chars = null): string
 
         if ($chars !== null) {
             $chars = \preg_quote($chars, '/');
-            $pattern = "^[${chars}]+|[${chars}]+\$";
+            $pattern = "^[{$chars}]+|[{$chars}]+\$";
         } else {
             $pattern = '^[\\s]+|[\\s]+$';
         }