Upgrade to 2.5.13

getkirby-v2 · Jan 14, 2020 · 5ff6080 · 5ff6080
1 parent 7f6b0df
commit 5ff6080
Show file tree

Hide file tree

Showing 688 changed files with 550 additions and 365 deletions.
diff --git a/kirby/.gitignore b/kirby/.gitignore
diff --git a/kirby/.travis.yml b/kirby/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 sudo: false
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 matrix:
   fast_finish: true
diff --git a/kirby/bootstrap.php b/kirby/bootstrap.php
diff --git a/kirby/branches/default.php b/kirby/branches/default.php
diff --git a/kirby/branches/multilang.php b/kirby/branches/multilang.php
diff --git a/kirby/branches/multilang/content.php b/kirby/branches/multilang/content.php
diff --git a/kirby/branches/multilang/field.php b/kirby/branches/multilang/field.php
diff --git a/kirby/branches/multilang/file.php b/kirby/branches/multilang/file.php
diff --git a/kirby/branches/multilang/language.php b/kirby/branches/multilang/language.php
diff --git a/kirby/branches/multilang/languages.php b/kirby/branches/multilang/languages.php
diff --git a/kirby/branches/multilang/page.php b/kirby/branches/multilang/page.php
diff --git a/kirby/branches/multilang/site.php b/kirby/branches/multilang/site.php
diff --git a/kirby/classmap.php b/kirby/classmap.php
diff --git a/kirby/composer.json b/kirby/composer.json
@@ -21,13 +21,13 @@
     "files": ["composer.php"]
   },
   "require": {
-    "php": ">=5.6.0",
+    "php": ">=7.2.0",
     "ext-mbstring": "*",
     "ext-gd": "*",
     "erusev/parsedown": "1.7.1",
     "erusev/parsedown-extra": "0.7.1",
     "michelf/php-smartypants": "1.8.1",
-    "getkirby/toolkit": "2.5.12",
+    "getkirby/toolkit": "2.5.13",
     "filp/whoops": "2.1.14"
   },
   "archive": {

diff --git a/kirby/composer.lock b/kirby/composer.lock
diff --git a/kirby/composer.php b/kirby/composer.php
diff --git a/kirby/core/asset.php b/kirby/core/asset.php
diff --git a/kirby/core/avatar.php b/kirby/core/avatar.php
diff --git a/kirby/core/children.php b/kirby/core/children.php
diff --git a/kirby/core/content.php b/kirby/core/content.php
diff --git a/kirby/core/field.php b/kirby/core/field.php
diff --git a/kirby/core/file.php b/kirby/core/file.php
diff --git a/kirby/core/files.php b/kirby/core/files.php
diff --git a/kirby/core/kirbytag.php b/kirby/core/kirbytag.php
diff --git a/kirby/core/kirbytext.php b/kirby/core/kirbytext.php
diff --git a/kirby/core/page.php b/kirby/core/page.php
diff --git a/kirby/core/pages.php b/kirby/core/pages.php
diff --git a/kirby/core/role.php b/kirby/core/role.php
diff --git a/kirby/core/roles.php b/kirby/core/roles.php
diff --git a/kirby/core/site.php b/kirby/core/site.php
diff --git a/kirby/core/user.php b/kirby/core/user.php
diff --git a/kirby/core/users.php b/kirby/core/users.php
diff --git a/kirby/extensions/methods.php b/kirby/extensions/methods.php
diff --git a/kirby/extensions/tags.php b/kirby/extensions/tags.php
diff --git a/kirby/helpers.php b/kirby/helpers.php
diff --git a/kirby/kirby.php b/kirby/kirby.php
@@ -10,7 +10,7 @@
 
 class Kirby {
 
-  static public $version = '2.5.12';
+  static public $version = '2.5.13';
   static public $instance;
   static public $hooks = array();
   static public $triggered = array();

diff --git a/kirby/kirby/component.php b/kirby/kirby/component.php
diff --git a/kirby/kirby/component/css.php b/kirby/kirby/component/css.php
diff --git a/kirby/kirby/component/js.php b/kirby/kirby/component/js.php
diff --git a/kirby/kirby/component/markdown.php b/kirby/kirby/component/markdown.php
diff --git a/kirby/kirby/component/response.php b/kirby/kirby/component/response.php
diff --git a/kirby/kirby/component/smartypants.php b/kirby/kirby/component/smartypants.php
diff --git a/kirby/kirby/component/snippet.php b/kirby/kirby/component/snippet.php
diff --git a/kirby/kirby/component/template.php b/kirby/kirby/component/template.php
diff --git a/kirby/kirby/component/thumb.php b/kirby/kirby/component/thumb.php
diff --git a/kirby/kirby/component/tinyurl.php b/kirby/kirby/component/tinyurl.php
diff --git a/kirby/kirby/errorhandling.php b/kirby/kirby/errorhandling.php
diff --git a/kirby/kirby/event.php b/kirby/kirby/event.php
diff --git a/kirby/kirby/registry.php b/kirby/kirby/registry.php
diff --git a/kirby/kirby/registry/blueprint.php b/kirby/kirby/registry/blueprint.php
diff --git a/kirby/kirby/registry/component.php b/kirby/kirby/registry/component.php
diff --git a/kirby/kirby/registry/controller.php b/kirby/kirby/registry/controller.php
diff --git a/kirby/kirby/registry/entry.php b/kirby/kirby/registry/entry.php
diff --git a/kirby/kirby/registry/field.php b/kirby/kirby/registry/field.php
diff --git a/kirby/kirby/registry/hook.php b/kirby/kirby/registry/hook.php
diff --git a/kirby/kirby/registry/method.php b/kirby/kirby/registry/method.php
diff --git a/kirby/kirby/registry/model.php b/kirby/kirby/registry/model.php
diff --git a/kirby/kirby/registry/option.php b/kirby/kirby/registry/option.php
diff --git a/kirby/kirby/registry/role.php b/kirby/kirby/registry/role.php
diff --git a/kirby/kirby/registry/route.php b/kirby/kirby/registry/route.php
diff --git a/kirby/kirby/registry/snippet.php b/kirby/kirby/registry/snippet.php
diff --git a/kirby/kirby/registry/tag.php b/kirby/kirby/registry/tag.php
diff --git a/kirby/kirby/registry/template.php b/kirby/kirby/registry/template.php
diff --git a/kirby/kirby/registry/widget.php b/kirby/kirby/registry/widget.php
diff --git a/kirby/kirby/request.php b/kirby/kirby/request.php
diff --git a/kirby/kirby/request/params.php b/kirby/kirby/request/params.php
diff --git a/kirby/kirby/request/path.php b/kirby/kirby/request/path.php
diff --git a/kirby/kirby/request/query.php b/kirby/kirby/request/query.php
diff --git a/kirby/kirby/roots.php b/kirby/kirby/roots.php
diff --git a/kirby/kirby/traits/image.php b/kirby/kirby/traits/image.php
diff --git a/kirby/kirby/urls.php b/kirby/kirby/urls.php
diff --git a/kirby/lib/pageextension.php b/kirby/lib/pageextension.php
diff --git a/kirby/lib/structure.php b/kirby/lib/structure.php
diff --git a/kirby/license.md b/kirby/license.md
diff --git a/kirby/phpunit.xml b/kirby/phpunit.xml
diff --git a/kirby/readme.md b/kirby/readme.md
diff --git a/kirby/system.php b/kirby/system.php
diff --git a/kirby/test/RoleTest.php b/kirby/test/RoleTest.php
@@ -6,7 +6,7 @@ class RoleTest extends KirbyTestCase {
 
   protected $role;
 
-  public function setUp() {
+  public function setUp(): void {
     $this->role = new Role(array(
       'id'          => 'testrole',
       'name'        => 'Test role',
@@ -72,35 +72,31 @@ public function testPermission() {
     $this->assertEquals('This user should fail.', $result->message());
   }
 
-  /**
-   * @expectedException        Error
-   * @expectedExceptionMessage Invalid event.
-   */
   public function testPermissionInvalidEvent() {
+    $this->expectException('Error');
+    $this->expectExceptionMessage('Invalid event');
+
     $this->role->permission(new Obj());
   }
 
-  /**
-   * @expectedException        Error
-   * @expectedExceptionMessage Permission panel.user.error of role testrole is invalid.
-   */
   public function testPermissionValueError() {
+    $this->expectException('Error');
+    $this->expectExceptionMessage('Permission panel.user.error of role testrole is invalid.');
+
     $this->role->permission('panel.user.error');
   }
 
-  /**
-   * @expectedException        Error
-   * @expectedExceptionMessage Invalid user.
-   */
   public function testPermissionCallbackError() {
+    $this->expectException('Error');
+    $this->expectExceptionMessage('Invalid user.');
+
     $this->role->permission('panel.user.update', 'someotheruser');
   }
 
-  /**
-   * @expectedException        Error
-   * @expectedExceptionMessage Permission panel.user.update of role testrole must return a boolean or error string.
-   */
   public function testPermissionCallbackReturnError() {
+    $this->expectException('Error');
+    $this->expectExceptionMessage('Permission panel.user.update of role testrole must return a boolean or error string.');
+
     $this->role->permission('panel.user.update', 'returnerror');
   }
 

diff --git a/kirby/test/UsersTest.php b/kirby/test/UsersTest.php
diff --git a/kirby/test/etc/content/1-a/a.txt b/kirby/test/etc/content/1-a/a.txt
diff --git a/kirby/test/etc/content/1-a/test.js b/kirby/test/etc/content/1-a/test.js
diff --git a/kirby/test/etc/content/2-b/b.txt b/kirby/test/etc/content/2-b/b.txt
diff --git a/kirby/test/etc/content/error/error.txt b/kirby/test/etc/content/error/error.txt
diff --git a/kirby/test/etc/content/home/home.txt b/kirby/test/etc/content/home/home.txt
diff --git a/kirby/test/etc/content/site.txt b/kirby/test/etc/content/site.txt
diff --git a/kirby/test/etc/content/tests/field-name-test/test.txt b/kirby/test/etc/content/tests/field-name-test/test.txt
diff --git a/kirby/test/etc/content/tests/file-extension-case-test/a.JSON b/kirby/test/etc/content/tests/file-extension-case-test/a.JSON
diff --git a/kirby/test/etc/content/tests/file-extension-case-test/b.json b/kirby/test/etc/content/tests/file-extension-case-test/b.json
diff --git a/kirby/test/etc/kirbytext/gist/expected.html b/kirby/test/etc/kirbytext/gist/expected.html
diff --git a/kirby/test/etc/kirbytext/gist/test.txt b/kirby/test/etc/kirbytext/gist/test.txt
diff --git a/kirby/test/etc/kirbytext/image-with-alt/expected.html b/kirby/test/etc/kirbytext/image-with-alt/expected.html
diff --git a/kirby/test/etc/kirbytext/image-with-alt/test.txt b/kirby/test/etc/kirbytext/image-with-alt/test.txt
diff --git a/kirby/test/etc/kirbytext/image-with-caption/expected.html b/kirby/test/etc/kirbytext/image-with-caption/expected.html
diff --git a/kirby/test/etc/kirbytext/image-with-caption/test.txt b/kirby/test/etc/kirbytext/image-with-caption/test.txt
diff --git a/kirby/test/etc/kirbytext/image-with-link-popup/expected.html b/kirby/test/etc/kirbytext/image-with-link-popup/expected.html
diff --git a/kirby/test/etc/kirbytext/image-with-link-popup/test.txt b/kirby/test/etc/kirbytext/image-with-link-popup/test.txt
diff --git a/kirby/test/etc/kirbytext/image-with-link/expected.html b/kirby/test/etc/kirbytext/image-with-link/expected.html
diff --git a/kirby/test/etc/kirbytext/image-with-link/test.txt b/kirby/test/etc/kirbytext/image-with-link/test.txt
diff --git a/kirby/test/etc/kirbytext/image/expected.html b/kirby/test/etc/kirbytext/image/expected.html
diff --git a/kirby/test/etc/kirbytext/image/test.txt b/kirby/test/etc/kirbytext/image/test.txt
diff --git a/kirby/test/etc/kirbytext/input-with-placeholder/expected.html b/kirby/test/etc/kirbytext/input-with-placeholder/expected.html
diff --git a/kirby/test/etc/kirbytext/input-with-placeholder/test.txt b/kirby/test/etc/kirbytext/input-with-placeholder/test.txt
diff --git a/kirby/test/etc/kirbytext/link-with-class/expected.html b/kirby/test/etc/kirbytext/link-with-class/expected.html
diff --git a/kirby/test/etc/kirbytext/link-with-class/test.txt b/kirby/test/etc/kirbytext/link-with-class/test.txt
diff --git a/kirby/test/etc/kirbytext/link-with-link-as-text/expected.html b/kirby/test/etc/kirbytext/link-with-link-as-text/expected.html
diff --git a/kirby/test/etc/kirbytext/link-with-link-as-text/test.txt b/kirby/test/etc/kirbytext/link-with-link-as-text/test.txt
diff --git a/kirby/test/etc/kirbytext/link-with-popup/expected.html b/kirby/test/etc/kirbytext/link-with-popup/expected.html
diff --git a/kirby/test/etc/kirbytext/link-with-popup/test.txt b/kirby/test/etc/kirbytext/link-with-popup/test.txt
diff --git a/kirby/test/etc/kirbytext/link-with-rel/expected.html b/kirby/test/etc/kirbytext/link-with-rel/expected.html
diff --git a/kirby/test/etc/kirbytext/link-with-rel/test.txt b/kirby/test/etc/kirbytext/link-with-rel/test.txt
diff --git a/kirby/test/etc/kirbytext/link-with-target/expected.html b/kirby/test/etc/kirbytext/link-with-target/expected.html
diff --git a/kirby/test/etc/kirbytext/link-with-target/test.txt b/kirby/test/etc/kirbytext/link-with-target/test.txt
diff --git a/kirby/test/etc/kirbytext/link-without-text/expected.html b/kirby/test/etc/kirbytext/link-without-text/expected.html
diff --git a/kirby/test/etc/kirbytext/link-without-text/test.txt b/kirby/test/etc/kirbytext/link-without-text/test.txt
diff --git a/kirby/test/etc/kirbytext/link/expected.html b/kirby/test/etc/kirbytext/link/expected.html
diff --git a/kirby/test/etc/kirbytext/link/test.txt b/kirby/test/etc/kirbytext/link/test.txt
diff --git a/kirby/test/etc/kirbytext/multiline-parenthesis/expected.html b/kirby/test/etc/kirbytext/multiline-parenthesis/expected.html
diff --git a/kirby/test/etc/kirbytext/multiline-parenthesis/test.txt b/kirby/test/etc/kirbytext/multiline-parenthesis/test.txt
diff --git a/kirby/test/etc/kirbytext/non-matching-parenthesises/expected.html b/kirby/test/etc/kirbytext/non-matching-parenthesises/expected.html
diff --git a/kirby/test/etc/kirbytext/non-matching-parenthesises/test.txt b/kirby/test/etc/kirbytext/non-matching-parenthesises/test.txt
diff --git a/kirby/test/etc/kirbytext/script-tag/expected.html b/kirby/test/etc/kirbytext/script-tag/expected.html
diff --git a/kirby/test/etc/kirbytext/script-tag/test.txt b/kirby/test/etc/kirbytext/script-tag/test.txt
diff --git a/kirby/test/etc/kirbytext/tag-in-parenthesis/expected.html b/kirby/test/etc/kirbytext/tag-in-parenthesis/expected.html
diff --git a/kirby/test/etc/kirbytext/tag-in-parenthesis/test.txt b/kirby/test/etc/kirbytext/tag-in-parenthesis/test.txt
diff --git a/kirby/test/etc/kirbytext/tel/expected.html b/kirby/test/etc/kirbytext/tel/expected.html
diff --git a/kirby/test/etc/kirbytext/tel/test.txt b/kirby/test/etc/kirbytext/tel/test.txt
diff --git a/kirby/test/etc/kirbytext/twitter/expected.html b/kirby/test/etc/kirbytext/twitter/expected.html
diff --git a/kirby/test/etc/kirbytext/twitter/test.txt b/kirby/test/etc/kirbytext/twitter/test.txt
diff --git a/kirby/test/etc/kirbytext/vimeo/expected.html b/kirby/test/etc/kirbytext/vimeo/expected.html
diff --git a/kirby/test/etc/kirbytext/vimeo/test.txt b/kirby/test/etc/kirbytext/vimeo/test.txt
diff --git a/kirby/test/etc/kirbytext/youtube/expected.html b/kirby/test/etc/kirbytext/youtube/expected.html
diff --git a/kirby/test/etc/kirbytext/youtube/test.txt b/kirby/test/etc/kirbytext/youtube/test.txt
diff --git a/kirby/test/etc/site/accounts/test.php b/kirby/test/etc/site/accounts/test.php
diff --git a/kirby/test/etc/site/cache/.gitkeep b/kirby/test/etc/site/cache/.gitkeep
diff --git a/kirby/vendor/autoload.php b/kirby/vendor/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitf5a857c9e4c52bed0abd021c7daaa7b8::getLoader();
diff --git a/kirby/vendor/composer/ClassLoader.php b/kirby/vendor/composer/ClassLoader.php
@@ -53,8 +53,9 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -271,6 +272,26 @@ public function isClassMapAuthoritative()
         return $this->classMapAuthoritative;
     }
 
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -313,29 +334,34 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -348,10 +374,14 @@ private function findFileWithExtension($class, $ext)
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                             return $file;
                         }
                     }
@@ -399,6 +429,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }
 

diff --git a/kirby/vendor/composer/LICENSE b/kirby/vendor/composer/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 2016 Nils Adermann, Jordi Boggiano
+Copyright (c) Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/kirby/vendor/composer/autoload_classmap.php b/kirby/vendor/composer/autoload_classmap.php
diff --git a/kirby/vendor/composer/autoload_files.php b/kirby/vendor/composer/autoload_files.php
diff --git a/kirby/vendor/composer/autoload_namespaces.php b/kirby/vendor/composer/autoload_namespaces.php
diff --git a/kirby/vendor/composer/autoload_psr4.php b/kirby/vendor/composer/autoload_psr4.php
diff --git a/kirby/vendor/composer/autoload_real.php b/kirby/vendor/composer/autoload_real.php
@@ -23,7 +23,7 @@ public static function getLoader()
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitf5a857c9e4c52bed0abd021c7daaa7b8', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 

diff --git a/kirby/vendor/composer/autoload_static.php b/kirby/vendor/composer/autoload_static.php