From de25c97290077e40955942d9a609bf01459df49d Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Tue, 1 Dec 2020 13:36:45 +0100 Subject: [PATCH] Upgrade to 2.5.14 --- kirby/composer.json | 2 +- kirby/composer.lock | 50 +- kirby/kirby.php | 2 +- kirby/readme.md | 12 +- kirby/vendor/composer/ClassLoader.php | 6 +- kirby/vendor/composer/InstalledVersions.php | 263 ++++++++ kirby/vendor/composer/autoload_classmap.php | 34 + kirby/vendor/composer/autoload_real.php | 7 +- kirby/vendor/composer/autoload_static.php | 38 ++ kirby/vendor/composer/installed.json | 613 +++++++++--------- kirby/vendor/composer/installed.php | 78 +++ kirby/vendor/composer/platform_check.php | 26 + kirby/vendor/getkirby/toolkit/lib/toolkit.php | 2 +- kirby/vendor/getkirby/toolkit/readme.md | 20 +- kirby/vendor/psr/log/.gitignore | 1 - .../psr/log/Psr/Log/LoggerInterface.php | 38 +- .../vendor/psr/log/Psr/Log/Test/DummyTest.php | 18 + .../log/Psr/Log/Test/LoggerInterfaceTest.php | 8 - panel/app/src/panel.php | 54 +- panel/app/src/panel/models/page/uploader.php | 18 +- panel/package.json | 2 +- panel/readme.md | 14 +- 22 files changed, 917 insertions(+), 389 deletions(-) create mode 100755 kirby/vendor/composer/InstalledVersions.php create mode 100755 kirby/vendor/composer/installed.php create mode 100755 kirby/vendor/composer/platform_check.php delete mode 100755 kirby/vendor/psr/log/.gitignore create mode 100755 kirby/vendor/psr/log/Psr/Log/Test/DummyTest.php diff --git a/kirby/composer.json b/kirby/composer.json index 1638c36..3afc958 100755 --- a/kirby/composer.json +++ b/kirby/composer.json @@ -27,7 +27,7 @@ "erusev/parsedown": "1.7.1", "erusev/parsedown-extra": "0.7.1", "michelf/php-smartypants": "1.8.1", - "getkirby/toolkit": "2.5.13", + "getkirby/toolkit": "2.5.14", "filp/whoops": "2.1.14" }, "archive": { diff --git a/kirby/composer.lock b/kirby/composer.lock index 8838ff6..5fcf6a7 100755 --- a/kirby/composer.lock +++ b/kirby/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1498a59aca1cf213ed1ac0039f3e349f", + "content-hash": "795028a2ea9620699916ef693d7f08ce", "packages": [ { "name": "erusev/parsedown", @@ -50,6 +50,10 @@ "markdown", "parser" ], + "support": { + "issues": "https://github.com/erusev/parsedown/issues", + "source": "https://github.com/erusev/parsedown/tree/master" + }, "time": "2018-03-08T01:11:30+00:00" }, { @@ -94,6 +98,10 @@ "parsedown", "parser" ], + "support": { + "issues": "https://github.com/erusev/parsedown-extra/issues", + "source": "https://github.com/erusev/parsedown-extra/tree/master" + }, "time": "2015-11-01T10:19:22+00:00" }, { @@ -155,20 +163,24 @@ "throwable", "whoops" ], + "support": { + "issues": "https://github.com/filp/whoops/issues", + "source": "https://github.com/filp/whoops/tree/2.1.14" + }, "time": "2017-11-23T18:22:44+00:00" }, { "name": "getkirby/toolkit", - "version": "2.5.13", + "version": "2.5.14", "source": { "type": "git", "url": "https://github.com/getkirby-v2/toolkit.git", - "reference": "c6e066d3865c1e6551458c4f2f225ab28a8dd5d1" + "reference": "cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getkirby-v2/toolkit/zipball/c6e066d3865c1e6551458c4f2f225ab28a8dd5d1", - "reference": "c6e066d3865c1e6551458c4f2f225ab28a8dd5d1", + "url": "https://api.github.com/repos/getkirby-v2/toolkit/zipball/cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3", + "reference": "cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3", "shasum": "" }, "require": { @@ -196,7 +208,13 @@ "keywords": [ "toolkit" ], - "time": "2020-01-12T15:24:03+00:00" + "support": { + "email": "support@getkirby.com", + "forum": "https://forum.getkirby.com", + "issues": "https://github.com/getkirby/toolkit/issues", + "source": "https://github.com/getkirby/toolkit" + }, + "time": "2020-12-01T10:29:30+00:00" }, { "name": "michelf/php-smartypants", @@ -246,20 +264,24 @@ "typographer", "typography" ], + "support": { + "issues": "https://github.com/michelf/php-smartypants/issues", + "source": "https://github.com/michelf/php-smartypants/tree/1.8.1" + }, "time": "2016-12-13T01:01:17+00:00" }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -293,7 +315,10 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, + "time": "2020-03-23T09:12:05+00:00" } ], "packages-dev": [], @@ -307,5 +332,6 @@ "ext-mbstring": "*", "ext-gd": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/kirby/kirby.php b/kirby/kirby.php index cf71ca2..46c78f7 100755 --- a/kirby/kirby.php +++ b/kirby/kirby.php @@ -10,7 +10,7 @@ class Kirby { - static public $version = '2.5.13'; + static public $version = '2.5.14'; static public $instance; static public $hooks = array(); static public $triggered = array(); diff --git a/kirby/readme.md b/kirby/readme.md index 78ec751..0ff6e55 100755 --- a/kirby/readme.md +++ b/kirby/readme.md @@ -1,11 +1,13 @@ -# Kirby Core +# Kirby v2 Core -This is the Kirby Core submodule. +Please refer to the [Kirby Starterkit](http://github.com/getkirby-v2/starterkit) +for a complete installation of Kirby 2. -Please refer to the [Kirby Starterkit](http://github.com/getkirby/starterkit) -for a complete installation of Kirby +## Kirby 2 - EOL -![Build Status](https://travis-ci.org/getkirby/kirby.svg?branch=master) +Kirby 2 is an old version of Kirby CMS. We are supporting it with security updates until December 31st, 2020. + +For the latest version of Kirby, check out https://getkirby.com ## Author Bastian Allgeier diff --git a/kirby/vendor/composer/ClassLoader.php b/kirby/vendor/composer/ClassLoader.php index fce8549..1a58957 100755 --- a/kirby/vendor/composer/ClassLoader.php +++ b/kirby/vendor/composer/ClassLoader.php @@ -37,8 +37,8 @@ * * @author Fabien Potencier * @author Jordi Boggiano - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ */ class ClassLoader { @@ -60,7 +60,7 @@ class ClassLoader public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); diff --git a/kirby/vendor/composer/InstalledVersions.php b/kirby/vendor/composer/InstalledVersions.php new file mode 100755 index 0000000..deb5123 --- /dev/null +++ b/kirby/vendor/composer/InstalledVersions.php @@ -0,0 +1,263 @@ + + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '34c3ab4331479616b0c9d67fe0b06d780160deca', + 'name' => 'getkirby/kirby', + ), + 'versions' => + array ( + 'erusev/parsedown' => + array ( + 'pretty_version' => '1.7.1', + 'version' => '1.7.1.0', + 'aliases' => + array ( + ), + 'reference' => '92e9c27ba0e74b8b028b111d1b6f956a15c01fc1', + ), + 'erusev/parsedown-extra' => + array ( + 'pretty_version' => '0.7.1', + 'version' => '0.7.1.0', + 'aliases' => + array ( + ), + 'reference' => '0db5cce7354e4b76f155d092ab5eb3981c21258c', + ), + 'filp/whoops' => + array ( + 'pretty_version' => '2.1.14', + 'version' => '2.1.14.0', + 'aliases' => + array ( + ), + 'reference' => 'c6081b8838686aa04f1e83ba7e91f78b7b2a23e6', + ), + 'getkirby/kirby' => + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '34c3ab4331479616b0c9d67fe0b06d780160deca', + ), + 'getkirby/toolkit' => + array ( + 'pretty_version' => '2.5.14', + 'version' => '2.5.14.0', + 'aliases' => + array ( + ), + 'reference' => 'cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3', + ), + 'michelf/php-smartypants' => + array ( + 'pretty_version' => '1.8.1', + 'version' => '1.8.1.0', + 'aliases' => + array ( + ), + 'reference' => '47d17c90a4dfd0ccf1f87e25c65e6c8012415aad', + ), + 'psr/log' => + array ( + 'pretty_version' => '1.1.3', + 'version' => '1.1.3.0', + 'aliases' => + array ( + ), + 'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc', + ), + ), +); + + + + + + + +public static function getInstalledPackages() +{ +return array_keys(self::$installed['versions']); +} + + + + + + + + + +public static function isInstalled($packageName) +{ +return isset(self::$installed['versions'][$packageName]); +} + + + + + + + + + + + + + + +public static function satisfies(VersionParser $parser, $packageName, $constraint) +{ +$constraint = $parser->parseConstraints($constraint); +$provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + +return $provided->matches($constraint); +} + + + + + + + + + + +public static function getVersionRanges($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +$ranges = array(); +if (isset(self::$installed['versions'][$packageName]['pretty_version'])) { +$ranges[] = self::$installed['versions'][$packageName]['pretty_version']; +} +if (array_key_exists('aliases', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']); +} +if (array_key_exists('replaced', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']); +} +if (array_key_exists('provided', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']); +} + +return implode(' || ', $ranges); +} + + + + + +public static function getVersion($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['version'])) { +return null; +} + +return self::$installed['versions'][$packageName]['version']; +} + + + + + +public static function getPrettyVersion($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) { +return null; +} + +return self::$installed['versions'][$packageName]['pretty_version']; +} + + + + + +public static function getReference($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['reference'])) { +return null; +} + +return self::$installed['versions'][$packageName]['reference']; +} + + + + + +public static function getRootPackage() +{ +return self::$installed['root']; +} + + + + + + + +public static function getRawData() +{ +return self::$installed; +} + + + + + + + + + + + + + + + + + + + +public static function reload($data) +{ +self::$installed = $data; +} +} diff --git a/kirby/vendor/composer/autoload_classmap.php b/kirby/vendor/composer/autoload_classmap.php index 7a91153..ecd21e3 100755 --- a/kirby/vendor/composer/autoload_classmap.php +++ b/kirby/vendor/composer/autoload_classmap.php @@ -6,4 +6,38 @@ $baseDir = dirname($vendorDir); return array( + 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', + 'Michelf\\SmartyPants' => $vendorDir . '/michelf/php-smartypants/Michelf/SmartyPants.php', + 'Michelf\\SmartyPantsTypographer' => $vendorDir . '/michelf/php-smartypants/Michelf/SmartyPantsTypographer.php', + 'Parsedown' => $vendorDir . '/erusev/parsedown/Parsedown.php', + 'ParsedownExtra' => $vendorDir . '/erusev/parsedown-extra/ParsedownExtra.php', + 'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php', + 'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php', + 'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php', + 'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php', + 'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php', + 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', + 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', + 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php', + 'Whoops\\Exception\\ErrorException' => $vendorDir . '/filp/whoops/src/Whoops/Exception/ErrorException.php', + 'Whoops\\Exception\\Formatter' => $vendorDir . '/filp/whoops/src/Whoops/Exception/Formatter.php', + 'Whoops\\Exception\\Frame' => $vendorDir . '/filp/whoops/src/Whoops/Exception/Frame.php', + 'Whoops\\Exception\\FrameCollection' => $vendorDir . '/filp/whoops/src/Whoops/Exception/FrameCollection.php', + 'Whoops\\Exception\\Inspector' => $vendorDir . '/filp/whoops/src/Whoops/Exception/Inspector.php', + 'Whoops\\Handler\\CallbackHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/CallbackHandler.php', + 'Whoops\\Handler\\Handler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/Handler.php', + 'Whoops\\Handler\\HandlerInterface' => $vendorDir . '/filp/whoops/src/Whoops/Handler/HandlerInterface.php', + 'Whoops\\Handler\\JsonResponseHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/JsonResponseHandler.php', + '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\\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', + 'Whoops\\Util\\Misc' => $vendorDir . '/filp/whoops/src/Whoops/Util/Misc.php', + 'Whoops\\Util\\SystemFacade' => $vendorDir . '/filp/whoops/src/Whoops/Util/SystemFacade.php', + 'Whoops\\Util\\TemplateHelper' => $vendorDir . '/filp/whoops/src/Whoops/Util/TemplateHelper.php', ); diff --git a/kirby/vendor/composer/autoload_real.php b/kirby/vendor/composer/autoload_real.php index 283c627..5c13873 100755 --- a/kirby/vendor/composer/autoload_real.php +++ b/kirby/vendor/composer/autoload_real.php @@ -13,19 +13,24 @@ public static function loadClassLoader($class) } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { return self::$loader; } + require __DIR__ . '/platform_check.php'; + spl_autoload_register(array('ComposerAutoloaderInitf5a857c9e4c52bed0abd021c7daaa7b8', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitf5a857c9e4c52bed0abd021c7daaa7b8', 'loadClassLoader')); $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'; + require __DIR__ . '/autoload_static.php'; call_user_func(\Composer\Autoload\ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8::getInitializer($loader)); } else { diff --git a/kirby/vendor/composer/autoload_static.php b/kirby/vendor/composer/autoload_static.php index f6b1ed0..7561447 100755 --- a/kirby/vendor/composer/autoload_static.php +++ b/kirby/vendor/composer/autoload_static.php @@ -54,12 +54,50 @@ class ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8 ), ); + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + 'Michelf\\SmartyPants' => __DIR__ . '/..' . '/michelf/php-smartypants/Michelf/SmartyPants.php', + 'Michelf\\SmartyPantsTypographer' => __DIR__ . '/..' . '/michelf/php-smartypants/Michelf/SmartyPantsTypographer.php', + 'Parsedown' => __DIR__ . '/..' . '/erusev/parsedown/Parsedown.php', + 'ParsedownExtra' => __DIR__ . '/..' . '/erusev/parsedown-extra/ParsedownExtra.php', + 'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php', + 'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php', + 'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php', + 'Psr\\Log\\LoggerAwareInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareInterface.php', + 'Psr\\Log\\LoggerAwareTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareTrait.php', + 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', + 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', + 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php', + 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', + 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php', + 'Whoops\\Exception\\ErrorException' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/ErrorException.php', + 'Whoops\\Exception\\Formatter' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/Formatter.php', + 'Whoops\\Exception\\Frame' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/Frame.php', + 'Whoops\\Exception\\FrameCollection' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/FrameCollection.php', + 'Whoops\\Exception\\Inspector' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/Inspector.php', + 'Whoops\\Handler\\CallbackHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/CallbackHandler.php', + 'Whoops\\Handler\\Handler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/Handler.php', + 'Whoops\\Handler\\HandlerInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/HandlerInterface.php', + 'Whoops\\Handler\\JsonResponseHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/JsonResponseHandler.php', + '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\\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', + 'Whoops\\Util\\Misc' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Util/Misc.php', + 'Whoops\\Util\\SystemFacade' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Util/SystemFacade.php', + 'Whoops\\Util\\TemplateHelper' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Util/TemplateHelper.php', + ); + public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { $loader->prefixLengthsPsr4 = ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8::$prefixDirsPsr4; $loader->prefixesPsr0 = ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8::$prefixesPsr0; + $loader->classMap = ComposerStaticInitf5a857c9e4c52bed0abd021c7daaa7b8::$classMap; }, null, ClassLoader::class); } diff --git a/kirby/vendor/composer/installed.json b/kirby/vendor/composer/installed.json index dc61803..d9cecbe 100755 --- a/kirby/vendor/composer/installed.json +++ b/kirby/vendor/composer/installed.json @@ -1,303 +1,322 @@ -[ - { - "name": "erusev/parsedown", - "version": "1.7.1", - "version_normalized": "1.7.1.0", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", - "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "time": "2018-03-08T01:11:30+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ] - }, - { - "name": "erusev/parsedown-extra", - "version": "0.7.1", - "version_normalized": "0.7.1.0", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown-extra.git", - "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c", - "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c", - "shasum": "" - }, - "require": { - "erusev/parsedown": "~1.4" - }, - "time": "2015-11-01T10:19:22+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "ParsedownExtra": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "An extension of Parsedown that adds support for Markdown Extra.", - "homepage": "https://github.com/erusev/parsedown-extra", - "keywords": [ - "markdown", - "markdown extra", - "parsedown", - "parser" - ] - }, - { - "name": "filp/whoops", - "version": "2.1.14", - "version_normalized": "2.1.14.0", - "source": { - "type": "git", - "url": "https://github.com/filp/whoops.git", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", - "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", - "shasum": "" - }, - "require": { - "php": "^5.5.9 || ^7.0", - "psr/log": "^1.0.1" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "symfony/var-dumper": "^2.6 || ^3.0" - }, - "suggest": { - "symfony/var-dumper": "Pretty print complex values better with var-dumper available", - "whoops/soap": "Formats errors as SOAP responses" - }, - "time": "2017-11-23T18:22:44+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "installation-source": "source", - "autoload": { - "psr-4": { - "Whoops\\": "src/Whoops/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Filipe Dobreira", - "homepage": "https://github.com/filp", - "role": "Developer" - } - ], - "description": "php error handling for cool kids", - "homepage": "https://filp.github.io/whoops/", - "keywords": [ - "error", - "exception", - "handling", - "library", - "throwable", - "whoops" - ] - }, - { - "name": "getkirby/toolkit", - "version": "2.5.13", - "version_normalized": "2.5.13.0", - "source": { - "type": "git", - "url": "https://github.com/getkirby-v2/toolkit.git", - "reference": "c6e066d3865c1e6551458c4f2f225ab28a8dd5d1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/getkirby-v2/toolkit/zipball/c6e066d3865c1e6551458c4f2f225ab28a8dd5d1", - "reference": "c6e066d3865c1e6551458c4f2f225ab28a8dd5d1", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "time": "2020-01-12T15:24:03+00:00", - "type": "library", - "installation-source": "source", - "autoload": { - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bastian Allgeier", - "email": "bastian@getkirby.com", - "homepage": "http://bastianallgeier.com" - } - ], - "description": "The Kirby 2 toolkit is a set of handy classes and helpers which make your life with PHP easier.", - "homepage": "http://toolkit.getkirby.com", - "keywords": [ - "toolkit" - ] - }, - { - "name": "michelf/php-smartypants", - "version": "1.8.1", - "version_normalized": "1.8.1.0", - "source": { - "type": "git", - "url": "https://github.com/michelf/php-smartypants.git", - "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", - "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "time": "2016-12-13T01:01:17+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Michelf": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "https://michelf.ca/", - "role": "Developer" +{ + "packages": [ + { + "name": "erusev/parsedown", + "version": "1.7.1", + "version_normalized": "1.7.1.0", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown.git", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" }, - { - "name": "John Gruber", - "homepage": "https://daringfireball.net/" - } - ], - "description": "PHP SmartyPants", - "homepage": "https://michelf.ca/projects/php-smartypants/", - "keywords": [ - "dashes", - "quotes", - "spaces", - "typographer", - "typography" - ] - }, - { - "name": "psr/log", - "version": "1.1.2", - "version_normalized": "1.1.2.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "time": "2018-03-08T01:11:30+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Parsedown": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", + "keywords": [ + "markdown", + "parser" + ], + "install-path": "../erusev/parsedown" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", - "shasum": "" + { + "name": "erusev/parsedown-extra", + "version": "0.7.1", + "version_normalized": "0.7.1.0", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown-extra.git", + "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c", + "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c", + "shasum": "" + }, + "require": { + "erusev/parsedown": "~1.4" + }, + "time": "2015-11-01T10:19:22+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "ParsedownExtra": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "An extension of Parsedown that adds support for Markdown Extra.", + "homepage": "https://github.com/erusev/parsedown-extra", + "keywords": [ + "markdown", + "markdown extra", + "parsedown", + "parser" + ], + "install-path": "../erusev/parsedown-extra" }, - "require": { - "php": ">=5.3.0" + { + "name": "filp/whoops", + "version": "2.1.14", + "version_normalized": "2.1.14.0", + "source": { + "type": "git", + "url": "https://github.com/filp/whoops.git", + "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", + "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0", + "psr/log": "^1.0.1" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "symfony/var-dumper": "^2.6 || ^3.0" + }, + "suggest": { + "symfony/var-dumper": "Pretty print complex values better with var-dumper available", + "whoops/soap": "Formats errors as SOAP responses" + }, + "time": "2017-11-23T18:22:44+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-4": { + "Whoops\\": "src/Whoops/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://filp.github.io/whoops/", + "keywords": [ + "error", + "exception", + "handling", + "library", + "throwable", + "whoops" + ], + "install-path": "../filp/whoops" }, - "time": "2019-11-01T11:05:21+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } + { + "name": "getkirby/toolkit", + "version": "2.5.14", + "version_normalized": "2.5.14.0", + "source": { + "type": "git", + "url": "https://github.com/getkirby-v2/toolkit.git", + "reference": "cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/getkirby-v2/toolkit/zipball/cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3", + "reference": "cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "time": "2020-12-01T10:29:30+00:00", + "type": "library", + "installation-source": "source", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bastian Allgeier", + "email": "bastian@getkirby.com", + "homepage": "http://bastianallgeier.com" + } + ], + "description": "The Kirby 2 toolkit is a set of handy classes and helpers which make your life with PHP easier.", + "homepage": "http://toolkit.getkirby.com", + "keywords": [ + "toolkit" + ], + "support": { + "email": "support@getkirby.com", + "forum": "https://forum.getkirby.com", + "issues": "https://github.com/getkirby/toolkit/issues", + "source": "https://github.com/getkirby/toolkit" + }, + "install-path": "../getkirby/toolkit" }, - "installation-source": "source", - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } + { + "name": "michelf/php-smartypants", + "version": "1.8.1", + "version_normalized": "1.8.1.0", + "source": { + "type": "git", + "url": "https://github.com/michelf/php-smartypants.git", + "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", + "reference": "47d17c90a4dfd0ccf1f87e25c65e6c8012415aad", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2016-12-13T01:01:17+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Michelf": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "https://daringfireball.net/" + } + ], + "description": "PHP SmartyPants", + "homepage": "https://michelf.ca/projects/php-smartypants/", + "keywords": [ + "dashes", + "quotes", + "spaces", + "typographer", + "typography" + ], + "install-path": "../michelf/php-smartypants" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ] - } -] + { + "name": "psr/log", + "version": "1.1.3", + "version_normalized": "1.1.3.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2020-03-23T09:12:05+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, + "install-path": "../psr/log" + } + ], + "dev": true, + "dev-package-names": [] +} diff --git a/kirby/vendor/composer/installed.php b/kirby/vendor/composer/installed.php new file mode 100755 index 0000000..aedf295 --- /dev/null +++ b/kirby/vendor/composer/installed.php @@ -0,0 +1,78 @@ + + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '34c3ab4331479616b0c9d67fe0b06d780160deca', + 'name' => 'getkirby/kirby', + ), + 'versions' => + array ( + 'erusev/parsedown' => + array ( + 'pretty_version' => '1.7.1', + 'version' => '1.7.1.0', + 'aliases' => + array ( + ), + 'reference' => '92e9c27ba0e74b8b028b111d1b6f956a15c01fc1', + ), + 'erusev/parsedown-extra' => + array ( + 'pretty_version' => '0.7.1', + 'version' => '0.7.1.0', + 'aliases' => + array ( + ), + 'reference' => '0db5cce7354e4b76f155d092ab5eb3981c21258c', + ), + 'filp/whoops' => + array ( + 'pretty_version' => '2.1.14', + 'version' => '2.1.14.0', + 'aliases' => + array ( + ), + 'reference' => 'c6081b8838686aa04f1e83ba7e91f78b7b2a23e6', + ), + 'getkirby/kirby' => + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '34c3ab4331479616b0c9d67fe0b06d780160deca', + ), + 'getkirby/toolkit' => + array ( + 'pretty_version' => '2.5.14', + 'version' => '2.5.14.0', + 'aliases' => + array ( + ), + 'reference' => 'cf2720b737b6ae5bcdbd1c84e820c3e86001b3a3', + ), + 'michelf/php-smartypants' => + array ( + 'pretty_version' => '1.8.1', + 'version' => '1.8.1.0', + 'aliases' => + array ( + ), + 'reference' => '47d17c90a4dfd0ccf1f87e25c65e6c8012415aad', + ), + 'psr/log' => + array ( + 'pretty_version' => '1.1.3', + 'version' => '1.1.3.0', + 'aliases' => + array ( + ), + 'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc', + ), + ), +); diff --git a/kirby/vendor/composer/platform_check.php b/kirby/vendor/composer/platform_check.php new file mode 100755 index 0000000..589e9e7 --- /dev/null +++ b/kirby/vendor/composer/platform_check.php @@ -0,0 +1,26 @@ += 70200)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.'; +} + +if ($issues) { + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); + } elseif (!headers_sent()) { + echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; + } + } + trigger_error( + 'Composer detected issues in your platform: ' . implode(' ', $issues), + E_USER_ERROR + ); +} diff --git a/kirby/vendor/getkirby/toolkit/lib/toolkit.php b/kirby/vendor/getkirby/toolkit/lib/toolkit.php index 3a05857..5883e4b 100755 --- a/kirby/vendor/getkirby/toolkit/lib/toolkit.php +++ b/kirby/vendor/getkirby/toolkit/lib/toolkit.php @@ -11,7 +11,7 @@ */ class Toolkit { - public static $version = '2.5.13'; + public static $version = '2.5.14'; public static function version() { return static::$version; diff --git a/kirby/vendor/getkirby/toolkit/readme.md b/kirby/vendor/getkirby/toolkit/readme.md index 7a094e7..96e738b 100755 --- a/kirby/vendor/getkirby/toolkit/readme.md +++ b/kirby/vendor/getkirby/toolkit/readme.md @@ -1,24 +1,12 @@ -# Kirby Toolkit +# Kirby v2 Toolkit The Kirby 2 toolkit is a set of handy classes and helpers which make your life with PHP easier. -[![Build Status](https://travis-ci.org/getkirby/toolkit.svg?branch=master)](https://travis-ci.org/getkirby/toolkit) +## Kirby 2 - EOL -## Installation +Kirby 2 is an old version of Kirby CMS. We are supporting it with security updates until December 31st, 2020. -```` -git pull https://github.com/getkirby/toolkit.git -```` - -Adding the toolkit to your app… - -```php - -``` - -## Requirements - -PHP 5.4+ +For the latest version of Kirby, check out https://getkirby.com ## License diff --git a/kirby/vendor/psr/log/.gitignore b/kirby/vendor/psr/log/.gitignore deleted file mode 100755 index 22d0d82..0000000 --- a/kirby/vendor/psr/log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vendor diff --git a/kirby/vendor/psr/log/Psr/Log/LoggerInterface.php b/kirby/vendor/psr/log/Psr/Log/LoggerInterface.php index e695046..2206cfd 100755 --- a/kirby/vendor/psr/log/Psr/Log/LoggerInterface.php +++ b/kirby/vendor/psr/log/Psr/Log/LoggerInterface.php @@ -22,8 +22,8 @@ interface LoggerInterface /** * System is unusable. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -35,8 +35,8 @@ public function emergency($message, array $context = array()); * Example: Entire website down, database unavailable, etc. This should * trigger the SMS alerts and wake you up. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -47,8 +47,8 @@ public function alert($message, array $context = array()); * * Example: Application component unavailable, unexpected exception. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -58,8 +58,8 @@ public function critical($message, array $context = array()); * Runtime errors that do not require immediate action but should typically * be logged and monitored. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -71,8 +71,8 @@ public function error($message, array $context = array()); * Example: Use of deprecated APIs, poor use of an API, undesirable things * that are not necessarily wrong. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -81,8 +81,8 @@ public function warning($message, array $context = array()); /** * Normal but significant events. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -93,8 +93,8 @@ public function notice($message, array $context = array()); * * Example: User logs in, SQL logs. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -103,8 +103,8 @@ public function info($message, array $context = array()); /** * Detailed debug information. * - * @param string $message - * @param array $context + * @param string $message + * @param mixed[] $context * * @return void */ @@ -113,9 +113,9 @@ public function debug($message, array $context = array()); /** * Logs with an arbitrary level. * - * @param mixed $level - * @param string $message - * @param array $context + * @param mixed $level + * @param string $message + * @param mixed[] $context * * @return void * diff --git a/kirby/vendor/psr/log/Psr/Log/Test/DummyTest.php b/kirby/vendor/psr/log/Psr/Log/Test/DummyTest.php new file mode 100755 index 0000000..9638c11 --- /dev/null +++ b/kirby/vendor/psr/log/Psr/Log/Test/DummyTest.php @@ -0,0 +1,18 @@ +assertEquals($expected, $this->getLogs()); } } - -class DummyTest -{ - public function __toString() - { - return 'DummyTest'; - } -} diff --git a/panel/app/src/panel.php b/panel/app/src/panel.php index abcaec4..4625226 100755 --- a/panel/app/src/panel.php +++ b/panel/app/src/panel.php @@ -35,13 +35,13 @@ class Panel { - static public $version = '2.5.13'; + static public $version = '2.5.14'; // minimal requirements static public $requires = array( 'php' => '7.2.0', - 'toolkit' => '2.5.13', - 'kirby' => '2.5.13' + 'toolkit' => '2.5.14', + 'kirby' => '2.5.14' ); static public $instance; @@ -493,13 +493,47 @@ public function license() { } public function isLocal() { - $localhosts = array('::1', '127.0.0.1', '0.0.0.0'); - return ( - in_array(server::get('SERVER_ADDR'), $localhosts) || - server::get('SERVER_NAME') == 'localhost' || - str::endsWith(server::get('SERVER_NAME'), '.localhost') || - str::endsWith(server::get('SERVER_NAME'), '.test') - ); + + $host = server::get('SERVER_NAME'); + $ip = server::get('SERVER_ADDR'); + + if ($host === 'localhost') { + return true; + } + + if (str::endsWith($host, '.localhost') === true) { + return true; + } + + if (str::endsWith($host, '.local') === true) { + return true; + } + + if (str::endsWith($host, '.test') === true) { + return true; + } + + if (in_array($ip, ['::1', '127.0.0.1']) === true) { + + if ( + isset($_SERVER['HTTP_X_FORWARDED_FOR']) === true && + in_array($_SERVER['HTTP_X_FORWARDED_FOR'], ['::1', '127.0.0.1']) === false + ) { + return false; + } + + if ( + isset($_SERVER['HTTP_CLIENT_IP']) === true && + in_array($_SERVER['HTTP_CLIENT_IP'], ['::1', '127.0.0.1']) === false + ) { + return false; + } + + // no reverse proxy or the real client also comes from localhost + return true; + } + + return false; } public function notify($text) { diff --git a/panel/app/src/panel/models/page/uploader.php b/panel/app/src/panel/models/page/uploader.php index ca284ec..fba999a 100755 --- a/panel/app/src/panel/models/page/uploader.php +++ b/panel/app/src/panel/models/page/uploader.php @@ -1,4 +1,4 @@ -file) { $this->replace(); } else { - $this->upload(); + $this->upload(); } } @@ -55,7 +55,7 @@ public function upload() { // create the initial meta file // without triggering the update hook try { - $file->createMeta(false); + $file->createMeta(false); } catch(Exception $e) { // don't react on meta errors // the meta file can still be generated later @@ -64,13 +64,13 @@ public function upload() { // make sure that the file is being marked as updated touch($file->root()); - kirby()->trigger($event, $file); + kirby()->trigger($event, $file); } public function replace() { - $file = $this->file; + $file = $this->file; $upload = new Upload($file->root(), array( 'overwrite' => true, 'accept' => function($upload) use($file) { @@ -135,7 +135,7 @@ public function move($upload, $event) { public function checkUpload($file) { $filesettings = $this->blueprint->files(); - $forbiddenExtensions = array('php', 'html', 'htm', 'exe', kirby()->option('content.file.extension', 'txt')); + $forbiddenExtensions = array('php', 'phar', 'html', 'htm', 'exe', kirby()->option('content.file.extension', 'txt')); $forbiddenMimes = array_merge(f::$mimes['php'], array('text/html', 'application/x-msdownload')); $extension = strtolower($file->extension()); @@ -150,7 +150,7 @@ public function checkUpload($file) { } // especially block any connection that contains php - if(str::contains($extension, 'php')) { + if(str::contains($extension, 'php') || str::contains($extension, 'phar')) { throw new Exception(l('files.add.error.extension.forbidden')); } @@ -187,8 +187,8 @@ public function checkUpload($file) { // Files blueprint option 'height' if($file->type() == 'image' and $filesettings->height() and $file->height() > $filesettings->height()) { throw new Exception('Page only allows image height of ' . $filesettings->height().'px'); - } + } } -} \ No newline at end of file +} diff --git a/panel/package.json b/panel/package.json index 91f0d27..e2787a8 100755 --- a/panel/package.json +++ b/panel/package.json @@ -1,6 +1,6 @@ { "name": "kirby-panel", - "version": "2.2.0", + "version": "2.5.14", "author": "Bastian Allgeier ", "homepage": "https://getkirby.com", "repository": { diff --git a/panel/readme.md b/panel/readme.md index db13b32..a58e299 100755 --- a/panel/readme.md +++ b/panel/readme.md @@ -1,9 +1,15 @@ -# Kirby Panel +# Kirby v2 Panel This is the Kirby Panel submodule. -Please refer to the [Kirby Starterkit](http://github.com/getkirby/starterkit) -for a complete installation of Kirby +Please refer to the [Kirby v2 Starterkit](http://github.com/getkirby-v2/starterkit) +for a complete installation of Kirby 2 + +## Kirby 2 - EOL + +Kirby 2 is an old version of Kirby CMS. We are supporting it with security updates until December 31st, 2020. + +For the latest version of Kirby, check out https://getkirby.com ## Author Bastian Allgeier @@ -13,4 +19,4 @@ Bastian Allgeier ## License - \ No newline at end of file +