Upgrade to 3.8.1

2022-10-18 14:11:15 +02:00
parent 94b2a32baf
commit 9c93e01c3a
71 changed files with 633 additions and 5705 deletions
--- a/kirby/vendor/composer/autoload_classmap.php
+++ b/kirby/vendor/composer/autoload_classmap.php
@@ -144,6 +144,10 @@ return array(
    'Kirby\\Cms\\UserRules' => $baseDir . '/src/Cms/UserRules.php',
    'Kirby\\Cms\\Users' => $baseDir . '/src/Cms/Users.php',
    'Kirby\\Cms\\Visitor' => $baseDir . '/src/Cms/Visitor.php',
+    'Kirby\\ComposerInstaller\\CmsInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
+    'Kirby\\ComposerInstaller\\Installer' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
+    'Kirby\\ComposerInstaller\\Plugin' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',
+    'Kirby\\ComposerInstaller\\PluginInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/PluginInstaller.php',
    'Kirby\\Data\\Data' => $baseDir . '/src/Data/Data.php',
    'Kirby\\Data\\Handler' => $baseDir . '/src/Data/Handler.php',
    'Kirby\\Data\\Json' => $baseDir . '/src/Data/Json.php',
--- a/kirby/vendor/composer/autoload_static.php
+++ b/kirby/vendor/composer/autoload_static.php
@@ -244,6 +244,10 @@ class ComposerStaticInita8011b477bb239488e5d139cdeb7b31e
        'Kirby\\Cms\\UserRules' => __DIR__ . '/../..' . '/src/Cms/UserRules.php',
        'Kirby\\Cms\\Users' => __DIR__ . '/../..' . '/src/Cms/Users.php',
        'Kirby\\Cms\\Visitor' => __DIR__ . '/../..' . '/src/Cms/Visitor.php',
+        'Kirby\\ComposerInstaller\\CmsInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
+        'Kirby\\ComposerInstaller\\Installer' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
+        'Kirby\\ComposerInstaller\\Plugin' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',
+        'Kirby\\ComposerInstaller\\PluginInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/PluginInstaller.php',
        'Kirby\\Data\\Data' => __DIR__ . '/../..' . '/src/Data/Data.php',
        'Kirby\\Data\\Handler' => __DIR__ . '/../..' . '/src/Data/Handler.php',
        'Kirby\\Data\\Json' => __DIR__ . '/../..' . '/src/Data/Json.php',
--- a/kirby/vendor/composer/installed.json
+++ b/kirby/vendor/composer/installed.json
@@ -262,36 +262,36 @@
        },
        {
            "name": "laminas/laminas-escaper",
-            "version": "2.10.0",
-            "version_normalized": "2.10.0.0",
+            "version": "2.12.0",
+            "version_normalized": "2.12.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "58af67282db37d24e584a837a94ee55b9c7552be"
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/58af67282db37d24e584a837a94ee55b9c7552be",
-                "reference": "58af67282db37d24e584a837a94ee55b9c7552be",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
                "shasum": ""
            },
            "require": {
                "ext-ctype": "*",
                "ext-mbstring": "*",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
            },
            "conflict": {
                "zendframework/zend-escaper": "*"
            },
            "require-dev": {
                "infection/infection": "^0.26.6",
-                "laminas/laminas-coding-standard": "~2.3.0",
+                "laminas/laminas-coding-standard": "~2.4.0",
                "maglnet/composer-require-checker": "^3.8.0",
                "phpunit/phpunit": "^9.5.18",
-                "psalm/plugin-phpunit": "^0.16.1",
+                "psalm/plugin-phpunit": "^0.17.0",
                "vimeo/psalm": "^4.22.0"
            },
-            "time": "2022-03-08T20:15:36+00:00",
+            "time": "2022-10-10T10:11:09+00:00",
            "type": "library",
            "installation-source": "dist",
            "autoload": {
@@ -445,17 +445,17 @@
        },
        {
            "name": "phpmailer/phpmailer",
-            "version": "v6.6.4",
-            "version_normalized": "6.6.4.0",
+            "version": "v6.6.5",
+            "version_normalized": "6.6.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b"
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b",
-                "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8b6386d7417526d1ea4da9edb70b8352f7543627",
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627",
                "shasum": ""
            },
            "require": {
@@ -479,10 +479,10 @@
                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                "psr/log": "For optional PSR-3 debug logging",
-                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
            },
-            "time": "2022-08-22T09:22:00+00:00",
+            "time": "2022-10-07T12:23:10+00:00",
            "type": "library",
            "installation-source": "dist",
            "autoload": {
@@ -514,7 +514,7 @@
            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
            "support": {
                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.4"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.5"
            },
            "funding": [
                {
--- a/kirby/vendor/composer/installed.php
+++ b/kirby/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
    'root' => array(
        'name' => 'getkirby/cms',
-        'pretty_version' => '3.8.0',
-        'version' => '3.8.0.0',
+        'pretty_version' => '3.8.1',
+        'version' => '3.8.1.0',
        'reference' => NULL,
        'type' => 'kirby-cms',
        'install_path' => __DIR__ . '/../../',
@@ -38,8 +38,8 @@
            'dev_requirement' => false,
        ),
        'getkirby/cms' => array(
-            'pretty_version' => '3.8.0',
-            'version' => '3.8.0.0',
+            'pretty_version' => '3.8.1',
+            'version' => '3.8.1.0',
            'reference' => NULL,
            'type' => 'kirby-cms',
            'install_path' => __DIR__ . '/../../',
@@ -56,9 +56,9 @@
            'dev_requirement' => false,
        ),
        'laminas/laminas-escaper' => array(
-            'pretty_version' => '2.10.0',
-            'version' => '2.10.0.0',
-            'reference' => '58af67282db37d24e584a837a94ee55b9c7552be',
+            'pretty_version' => '2.12.0',
+            'version' => '2.12.0.0',
+            'reference' => 'ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490',
            'type' => 'library',
            'install_path' => __DIR__ . '/../laminas/laminas-escaper',
            'aliases' => array(),
@@ -89,9 +89,9 @@
            'dev_requirement' => false,
        ),
        'phpmailer/phpmailer' => array(
-            'pretty_version' => 'v6.6.4',
-            'version' => '6.6.4.0',
-            'reference' => 'a94fdebaea6bd17f51be0c2373ab80d3d681269b',
+            'pretty_version' => 'v6.6.5',
+            'version' => '6.6.5.0',
+            'reference' => '8b6386d7417526d1ea4da9edb70b8352f7543627',
            'type' => 'library',
            'install_path' => __DIR__ . '/../phpmailer/phpmailer',
            'aliases' => array(),
--- a/kirby/vendor/laminas/laminas-escaper/composer.json
+++ b/kirby/vendor/laminas/laminas-escaper/composer.json
@@ -29,16 +29,16 @@
    "extra": {
    },
    "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
        "ext-ctype": "*",
        "ext-mbstring": "*"
    },
    "require-dev": {
        "infection/infection": "^0.26.6",
-        "laminas/laminas-coding-standard": "~2.3.0",
+        "laminas/laminas-coding-standard": "~2.4.0",
        "maglnet/composer-require-checker": "^3.8.0",
        "phpunit/phpunit": "^9.5.18",
-        "psalm/plugin-phpunit": "^0.16.1",
+        "psalm/plugin-phpunit": "^0.17.0",
        "vimeo/psalm": "^4.22.0"
    },
    "autoload": {
--- a/kirby/vendor/laminas/laminas-escaper/composer.lock
+++ b/kirby/vendor/laminas/laminas-escaper/composer.lock
--- a/kirby/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
+++ b/kirby/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
@@ -4,6 +4,8 @@ declare(strict_types=1);

 namespace Laminas\Escaper\Exception;

-interface ExceptionInterface
+use Throwable;
+
+interface ExceptionInterface extends Throwable
 {
 }
--- a/kirby/vendor/phpmailer/phpmailer/composer.json
+++ b/kirby/vendor/phpmailer/phpmailer/composer.json
@@ -51,7 +51,7 @@
        "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
        "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
        "psr/log": "For optional PSR-3 debug logging",
-        "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
        "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
    },
    "autoload": {
--- a/kirby/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/kirby/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -14,16 +14,22 @@ $PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data blev ikke accepteret.
 $PHPMAILER_LANG['empty_message']        = 'Meddelelsen er uden indhold';
 $PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
 $PHPMAILER_LANG['execute']              = 'Kunne ikke afvikle: ';
+$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
 $PHPMAILER_LANG['file_access']          = 'Kunne ikke tilgå filen: ';
 $PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
 $PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
 $PHPMAILER_LANG['instantiate']          = 'Email funktionen kunne ikke initialiseres.';
 $PHPMAILER_LANG['invalid_address']      = 'Udgyldig adresse: ';
+$PHPMAILER_LANG['invalid_header']       = 'Ugyldig header navn eller værdi';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig hostentry: ';
+$PHPMAILER_LANG['invalid_host']         = 'Ugyldig vært: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
 $PHPMAILER_LANG['provide_address']      = 'Indtast mindst en modtagers email adresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere fejlede: ';
 $PHPMAILER_LANG['signing']              = 'Signeringsfejl: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kode: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Yderligere SMTP info: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fejlede.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalje: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP server fejl: ';
 $PHPMAILER_LANG['variable_set']         = 'Kunne ikke definere eller nulstille variablen: ';
-$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
--- a/kirby/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/kirby/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -9,19 +9,18 @@ $PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzi
 $PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
 $PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
-$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['encoding']             = 'Błędny sposób kodowania znaków: ';
 $PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
 $PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
 $PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
-$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres nadawcy jest nieprawidłowy lub nie istnieje: ';
 $PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' .
-    'następujący adres Odbiorcy jest nieprawidłowy: ';
-$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' . 'następujący adres odbiorcy jest nieprawidłowy lub nie istnieje: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email odbiorcy.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
-$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi lub nie istnieją: ';
 $PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Wywołanie funkcji SMTP Connect() zostało zakończone niepowodzeniem.';
 $PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
 $PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
--- a/kirby/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/kirby/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -750,7 +750,7 @@ class PHPMailer
     *
     * @var string
     */
-    const VERSION = '6.6.4';
+    const VERSION = '6.6.5';

    /**
     * Error severity: message only, continue processing.
@@ -1671,7 +1671,7 @@ class PHPMailer
                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
            }
        } catch (Exception $exc) {
-            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
+            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
                $this->smtp->reset();
            }
            $this->setError($exc->getMessage());
@@ -1863,7 +1863,7 @@ class PHPMailer
        if (!static::isPermittedPath($path)) {
            return false;
        }
-        $readable = file_exists($path);
+        $readable = is_file($path);
        //If not a UNC path (expected to start with \\), check read permission, see #2069
        if (strpos($path, '\\\\') !== 0) {
            $readable = $readable && is_readable($path);
@@ -2101,6 +2101,9 @@ class PHPMailer
        $this->smtp->setDebugLevel($this->SMTPDebug);
        $this->smtp->setDebugOutput($this->Debugoutput);
        $this->smtp->setVerp($this->do_verp);
+        if ($this->Host === null) {
+            $this->Host = 'localhost';
+        }
        $hosts = explode(';', $this->Host);
        $lastexception = null;

--- a/kirby/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/kirby/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
     *
     * @var string
     */
-    const VERSION = '6.6.4';
+    const VERSION = '6.6.5';

    /**
     * Default POP3 port number.
--- a/kirby/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/kirby/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
     *
     * @var string
     */
-    const VERSION = '6.6.4';
+    const VERSION = '6.6.5';

    /**
     * SMTP line break constant.
@@ -682,7 +682,6 @@ class SMTP
     */
    public function close()
    {
-        $this->setError('');
        $this->server_caps = null;
        $this->helo_rply = null;
        if (is_resource($this->smtp_conn)) {