Update dependencies and version number

getkirby-v2 · Dec 1, 2020 · 1505b65 · 1505b65
1 parent 34c3ab4
commit 1505b65
Show file tree

Hide file tree

Showing 17 changed files with 848 additions and 359 deletions.
diff --git a/composer.json b/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/composer.lock b/composer.lock
diff --git a/kirby.php b/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/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -37,8 +37,8 @@
  *
  * @author Fabien Potencier <[email protected]>
  * @author Jordi Boggiano <[email protected]>
- * @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();