Upgrade to 3.3.0

kirby/vendor/composer/autoload_classmap.php

@@ -13,6 +13,8 @@ return array(
     'Kirby\\Cache\\Cache' => $baseDir . '/src/Cache/Cache.php',
     'Kirby\\Cache\\FileCache' => $baseDir . '/src/Cache/FileCache.php',
     'Kirby\\Cache\\MemCached' => $baseDir . '/src/Cache/MemCached.php',
+    'Kirby\\Cache\\MemoryCache' => $baseDir . '/src/Cache/MemoryCache.php',
+    'Kirby\\Cache\\NullCache' => $baseDir . '/src/Cache/NullCache.php',
     'Kirby\\Cache\\Value' => $baseDir . '/src/Cache/Value.php',
     'Kirby\\Cms\\Api' => $baseDir . '/src/Cms/Api.php',
     'Kirby\\Cms\\App' => $baseDir . '/src/Cms/App.php',
@@ -27,6 +29,8 @@ return array(
     'Kirby\\Cms\\Collection' => $baseDir . '/src/Cms/Collection.php',
     'Kirby\\Cms\\Collections' => $baseDir . '/src/Cms/Collections.php',
     'Kirby\\Cms\\Content' => $baseDir . '/src/Cms/Content.php',
+    'Kirby\\Cms\\ContentLock' => $baseDir . '/src/Cms/ContentLock.php',
+    'Kirby\\Cms\\ContentLocks' => $baseDir . '/src/Cms/ContentLocks.php',
     'Kirby\\Cms\\ContentTranslation' => $baseDir . '/src/Cms/ContentTranslation.php',
     'Kirby\\Cms\\Dir' => $baseDir . '/src/Cms/Dir.php',
     'Kirby\\Cms\\Email' => $baseDir . '/src/Cms/Email.php',
@@ -37,6 +41,7 @@ return array(
     'Kirby\\Cms\\FileFoundation' => $baseDir . '/src/Cms/FileFoundation.php',
     'Kirby\\Cms\\FileModifications' => $baseDir . '/src/Cms/FileModifications.php',
     'Kirby\\Cms\\FilePermissions' => $baseDir . '/src/Cms/FilePermissions.php',
+    'Kirby\\Cms\\FilePicker' => $baseDir . '/src/Cms/FilePicker.php',
     'Kirby\\Cms\\FileRules' => $baseDir . '/src/Cms/FileRules.php',
     'Kirby\\Cms\\FileVersion' => $baseDir . '/src/Cms/FileVersion.php',
     'Kirby\\Cms\\Filename' => $baseDir . '/src/Cms/Filename.php',
@@ -51,6 +56,9 @@ return array(
     'Kirby\\Cms\\KirbyTag' => $baseDir . '/src/Cms/KirbyTag.php',
     'Kirby\\Cms\\KirbyTags' => $baseDir . '/src/Cms/KirbyTags.php',
     'Kirby\\Cms\\Language' => $baseDir . '/src/Cms/Language.php',
+    'Kirby\\Cms\\LanguageRouter' => $baseDir . '/src/Cms/LanguageRouter.php',
+    'Kirby\\Cms\\LanguageRoutes' => $baseDir . '/src/Cms/LanguageRoutes.php',
+    'Kirby\\Cms\\LanguageRules' => $baseDir . '/src/Cms/LanguageRules.php',
     'Kirby\\Cms\\Languages' => $baseDir . '/src/Cms/Languages.php',
     'Kirby\\Cms\\Media' => $baseDir . '/src/Cms/Media.php',
     'Kirby\\Cms\\Model' => $baseDir . '/src/Cms/Model.php',
@@ -63,6 +71,7 @@ return array(
     'Kirby\\Cms\\PageActions' => $baseDir . '/src/Cms/PageActions.php',
     'Kirby\\Cms\\PageBlueprint' => $baseDir . '/src/Cms/PageBlueprint.php',
     'Kirby\\Cms\\PagePermissions' => $baseDir . '/src/Cms/PagePermissions.php',
+    'Kirby\\Cms\\PagePicker' => $baseDir . '/src/Cms/PagePicker.php',
     'Kirby\\Cms\\PageRules' => $baseDir . '/src/Cms/PageRules.php',
     'Kirby\\Cms\\PageSiblings' => $baseDir . '/src/Cms/PageSiblings.php',
     'Kirby\\Cms\\Pages' => $baseDir . '/src/Cms/Pages.php',
@@ -70,6 +79,7 @@ return array(
     'Kirby\\Cms\\Panel' => $baseDir . '/src/Cms/Panel.php',
     'Kirby\\Cms\\PanelPlugins' => $baseDir . '/src/Cms/PanelPlugins.php',
     'Kirby\\Cms\\Permissions' => $baseDir . '/src/Cms/Permissions.php',
+    'Kirby\\Cms\\Picker' => $baseDir . '/src/Cms/Picker.php',
     'Kirby\\Cms\\Plugin' => $baseDir . '/src/Cms/Plugin.php',
     'Kirby\\Cms\\PluginAssets' => $baseDir . '/src/Cms/PluginAssets.php',
     'Kirby\\Cms\\R' => $baseDir . '/src/Cms/R.php',
@@ -96,6 +106,7 @@ return array(
     'Kirby\\Cms\\UserActions' => $baseDir . '/src/Cms/UserActions.php',
     'Kirby\\Cms\\UserBlueprint' => $baseDir . '/src/Cms/UserBlueprint.php',
     'Kirby\\Cms\\UserPermissions' => $baseDir . '/src/Cms/UserPermissions.php',
+    'Kirby\\Cms\\UserPicker' => $baseDir . '/src/Cms/UserPicker.php',
     'Kirby\\Cms\\UserRules' => $baseDir . '/src/Cms/UserRules.php',
     'Kirby\\Cms\\Users' => $baseDir . '/src/Cms/Users.php',
     'Kirby\\Cms\\Visitor' => $baseDir . '/src/Cms/Visitor.php',
@@ -120,6 +131,7 @@ return array(
     'Kirby\\Email\\PHPMailer' => $baseDir . '/src/Email/PHPMailer.php',
     'Kirby\\Exception\\BadMethodCallException' => $baseDir . '/src/Exception/BadMethodCallException.php',
     'Kirby\\Exception\\DuplicateException' => $baseDir . '/src/Exception/DuplicateException.php',
+    'Kirby\\Exception\\ErrorPageException' => $baseDir . '/src/Exception/ErrorPageException.php',
     'Kirby\\Exception\\Exception' => $baseDir . '/src/Exception/Exception.php',
     'Kirby\\Exception\\InvalidArgumentException' => $baseDir . '/src/Exception/InvalidArgumentException.php',
     'Kirby\\Exception\\LogicException' => $baseDir . '/src/Exception/LogicException.php',

kirby/vendor/composer/autoload_static.php

@@ -101,6 +101,8 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cache\\Cache' => __DIR__ . '/../..' . '/src/Cache/Cache.php',
         'Kirby\\Cache\\FileCache' => __DIR__ . '/../..' . '/src/Cache/FileCache.php',
         'Kirby\\Cache\\MemCached' => __DIR__ . '/../..' . '/src/Cache/MemCached.php',
+        'Kirby\\Cache\\MemoryCache' => __DIR__ . '/../..' . '/src/Cache/MemoryCache.php',
+        'Kirby\\Cache\\NullCache' => __DIR__ . '/../..' . '/src/Cache/NullCache.php',
         'Kirby\\Cache\\Value' => __DIR__ . '/../..' . '/src/Cache/Value.php',
         'Kirby\\Cms\\Api' => __DIR__ . '/../..' . '/src/Cms/Api.php',
         'Kirby\\Cms\\App' => __DIR__ . '/../..' . '/src/Cms/App.php',
@@ -115,6 +117,8 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\Collection' => __DIR__ . '/../..' . '/src/Cms/Collection.php',
         'Kirby\\Cms\\Collections' => __DIR__ . '/../..' . '/src/Cms/Collections.php',
         'Kirby\\Cms\\Content' => __DIR__ . '/../..' . '/src/Cms/Content.php',
+        'Kirby\\Cms\\ContentLock' => __DIR__ . '/../..' . '/src/Cms/ContentLock.php',
+        'Kirby\\Cms\\ContentLocks' => __DIR__ . '/../..' . '/src/Cms/ContentLocks.php',
         'Kirby\\Cms\\ContentTranslation' => __DIR__ . '/../..' . '/src/Cms/ContentTranslation.php',
         'Kirby\\Cms\\Dir' => __DIR__ . '/../..' . '/src/Cms/Dir.php',
         'Kirby\\Cms\\Email' => __DIR__ . '/../..' . '/src/Cms/Email.php',
@@ -125,6 +129,7 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\FileFoundation' => __DIR__ . '/../..' . '/src/Cms/FileFoundation.php',
         'Kirby\\Cms\\FileModifications' => __DIR__ . '/../..' . '/src/Cms/FileModifications.php',
         'Kirby\\Cms\\FilePermissions' => __DIR__ . '/../..' . '/src/Cms/FilePermissions.php',
+        'Kirby\\Cms\\FilePicker' => __DIR__ . '/../..' . '/src/Cms/FilePicker.php',
         'Kirby\\Cms\\FileRules' => __DIR__ . '/../..' . '/src/Cms/FileRules.php',
         'Kirby\\Cms\\FileVersion' => __DIR__ . '/../..' . '/src/Cms/FileVersion.php',
         'Kirby\\Cms\\Filename' => __DIR__ . '/../..' . '/src/Cms/Filename.php',
@@ -139,6 +144,9 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\KirbyTag' => __DIR__ . '/../..' . '/src/Cms/KirbyTag.php',
         'Kirby\\Cms\\KirbyTags' => __DIR__ . '/../..' . '/src/Cms/KirbyTags.php',
         'Kirby\\Cms\\Language' => __DIR__ . '/../..' . '/src/Cms/Language.php',
+        'Kirby\\Cms\\LanguageRouter' => __DIR__ . '/../..' . '/src/Cms/LanguageRouter.php',
+        'Kirby\\Cms\\LanguageRoutes' => __DIR__ . '/../..' . '/src/Cms/LanguageRoutes.php',
+        'Kirby\\Cms\\LanguageRules' => __DIR__ . '/../..' . '/src/Cms/LanguageRules.php',
         'Kirby\\Cms\\Languages' => __DIR__ . '/../..' . '/src/Cms/Languages.php',
         'Kirby\\Cms\\Media' => __DIR__ . '/../..' . '/src/Cms/Media.php',
         'Kirby\\Cms\\Model' => __DIR__ . '/../..' . '/src/Cms/Model.php',
@@ -151,6 +159,7 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\PageActions' => __DIR__ . '/../..' . '/src/Cms/PageActions.php',
         'Kirby\\Cms\\PageBlueprint' => __DIR__ . '/../..' . '/src/Cms/PageBlueprint.php',
         'Kirby\\Cms\\PagePermissions' => __DIR__ . '/../..' . '/src/Cms/PagePermissions.php',
+        'Kirby\\Cms\\PagePicker' => __DIR__ . '/../..' . '/src/Cms/PagePicker.php',
         'Kirby\\Cms\\PageRules' => __DIR__ . '/../..' . '/src/Cms/PageRules.php',
         'Kirby\\Cms\\PageSiblings' => __DIR__ . '/../..' . '/src/Cms/PageSiblings.php',
         'Kirby\\Cms\\Pages' => __DIR__ . '/../..' . '/src/Cms/Pages.php',
@@ -158,6 +167,7 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\Panel' => __DIR__ . '/../..' . '/src/Cms/Panel.php',
         'Kirby\\Cms\\PanelPlugins' => __DIR__ . '/../..' . '/src/Cms/PanelPlugins.php',
         'Kirby\\Cms\\Permissions' => __DIR__ . '/../..' . '/src/Cms/Permissions.php',
+        'Kirby\\Cms\\Picker' => __DIR__ . '/../..' . '/src/Cms/Picker.php',
         'Kirby\\Cms\\Plugin' => __DIR__ . '/../..' . '/src/Cms/Plugin.php',
         'Kirby\\Cms\\PluginAssets' => __DIR__ . '/../..' . '/src/Cms/PluginAssets.php',
         'Kirby\\Cms\\R' => __DIR__ . '/../..' . '/src/Cms/R.php',
@@ -184,6 +194,7 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Cms\\UserActions' => __DIR__ . '/../..' . '/src/Cms/UserActions.php',
         'Kirby\\Cms\\UserBlueprint' => __DIR__ . '/../..' . '/src/Cms/UserBlueprint.php',
         'Kirby\\Cms\\UserPermissions' => __DIR__ . '/../..' . '/src/Cms/UserPermissions.php',
+        'Kirby\\Cms\\UserPicker' => __DIR__ . '/../..' . '/src/Cms/UserPicker.php',
         'Kirby\\Cms\\UserRules' => __DIR__ . '/../..' . '/src/Cms/UserRules.php',
         'Kirby\\Cms\\Users' => __DIR__ . '/../..' . '/src/Cms/Users.php',
         'Kirby\\Cms\\Visitor' => __DIR__ . '/../..' . '/src/Cms/Visitor.php',
@@ -208,6 +219,7 @@ class ComposerStaticInit12091bebabd81c9aba88b2aeec22c8d7
         'Kirby\\Email\\PHPMailer' => __DIR__ . '/../..' . '/src/Email/PHPMailer.php',
         'Kirby\\Exception\\BadMethodCallException' => __DIR__ . '/../..' . '/src/Exception/BadMethodCallException.php',
         'Kirby\\Exception\\DuplicateException' => __DIR__ . '/../..' . '/src/Exception/DuplicateException.php',
+        'Kirby\\Exception\\ErrorPageException' => __DIR__ . '/../..' . '/src/Exception/ErrorPageException.php',
         'Kirby\\Exception\\Exception' => __DIR__ . '/../..' . '/src/Exception/Exception.php',
         'Kirby\\Exception\\InvalidArgumentException' => __DIR__ . '/../..' . '/src/Exception/InvalidArgumentException.php',
         'Kirby\\Exception\\LogicException' => __DIR__ . '/../..' . '/src/Exception/LogicException.php',

kirby/vendor/psr/log/Psr/Log/LoggerInterface.php

@@ -118,6 +118,8 @@ interface LoggerInterface
      * @param array  $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array());
 }

kirby/vendor/psr/log/Psr/Log/LoggerTrait.php

@@ -135,6 +135,8 @@ trait LoggerTrait
      * @param array  $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     abstract public function log($level, $message, array $context = array());
 }

kirby/vendor/psr/log/Psr/Log/NullLogger.php

@@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger
      * @param array  $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array())
     {

kirby/vendor/symfony/polyfill-mbstring/Mbstring.php

@@ -35,6 +35,7 @@ namespace Symfony\Polyfill\Mbstring;
  * - mb_strlen               - Get string length
  * - mb_strpos               - Find position of first occurrence of string in a string
  * - mb_strrpos              - Find position of last occurrence of a string in a string
+ * - mb_str_split            - Convert a string to an array
  * - mb_strtolower           - Make a string lowercase
  * - mb_strtoupper           - Make a string uppercase
  * - mb_substitute_character - Set/Get substitution character
@@ -523,6 +524,34 @@ final class Mbstring
         return false !== $pos ? $offset + $pos : false;
     }
 
+    public static function mb_str_split($string, $split_length = 1, $encoding = null)
+    {
+        if (null !== $string && !\is_scalar($string) && !(\is_object($string) && \method_exists($string, '__toString'))) {
+            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', E_USER_WARNING);
+
+            return null;
+        }
+
+        if ($split_length < 1) {
+            trigger_error('The length of each segment must be greater than zero', E_USER_WARNING);
+
+            return false;
+        }
+
+        if (null === $encoding) {
+            $encoding = mb_internal_encoding();
+        }
+
+        $result = array();
+        $length = mb_strlen($string, $encoding);
+
+        for ($i = 0; $i < $length; $i += $split_length) {
+            $result[] = mb_substr($string, $i, $split_length, $encoding);
+        }
+
+        return $result;
+    }
+
     public static function mb_strtolower($s, $encoding = null)
     {
         return self::mb_convert_case($s, MB_CASE_LOWER, $encoding);
@@ -546,7 +575,7 @@ final class Mbstring
     {
         $encoding = self::getEncoding($encoding);
         if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return substr($s, $start, null === $length ? 2147483647 : $length);
+            return (string) substr($s, $start, null === $length ? 2147483647 : $length);
         }
 
         if ($start < 0) {

kirby/vendor/symfony/polyfill-mbstring/bootstrap.php

@@ -56,3 +56,7 @@ if (!function_exists('mb_chr')) {
     function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
     function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
 }
+
+if (!function_exists('mb_str_split')) {
+    function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
+}