Update to Kirby 2.5.11

getkirby-v2 · Jul 3, 2018 · dfec0c8 · dfec0c8
1 parent 3b031aa
commit dfec0c8
Show file tree

Hide file tree

Showing 16 changed files with 236 additions and 194 deletions.
diff --git a/kirby/.travis.yml b/kirby/.travis.yml
@@ -1,10 +1,9 @@
 language: php
 sudo: false
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 matrix:
   fast_finish: true
diff --git a/kirby/composer.json b/kirby/composer.json
@@ -21,13 +21,14 @@
     "files": ["composer.php"]
   },
   "require": {
-    "php": ">=5.4.0",
+    "php": ">=5.6.0",
     "ext-mbstring": "*",
     "ext-gd": "*",
-    "erusev/parsedown-extra": "0.7.*",
-    "michelf/php-smartypants": "1.8.*",
-    "getkirby/toolkit": "2.5.10",
-    "filp/whoops": "2.1.*"
+    "erusev/parsedown": "1.7.1",
+    "erusev/parsedown-extra": "0.7.1",
+    "michelf/php-smartypants": "1.8.1",
+    "getkirby/toolkit": "2.5.11",
+    "filp/whoops": "2.1.14"
   },
   "archive": {
     "exclude": [

diff --git a/kirby/composer.lock b/kirby/composer.lock
diff --git a/kirby/kirby.php b/kirby/kirby.php
@@ -10,7 +10,7 @@
 
 class Kirby {
 
-  static public $version = '2.5.10';
+  static public $version = '2.5.11';
   static public $instance;
   static public $hooks = array();
   static public $triggered = array();

diff --git a/kirby/test/FieldTest.php b/kirby/test/FieldTest.php
@@ -8,16 +8,16 @@ public function testField() {
 
     $field = new Field('mypage', 'mykey', 'myvalue');
 
-    $field->assertEquals('mypage', $field->page);
-    $field->assertEquals('mypage', $field->page());
+    $this->assertEquals('mypage', $field->page);
+    $this->assertEquals('mypage', $field->page());
 
-    $field->assertEquals('mykey', $field->key);
-    $field->assertEquals('mykey', $field->key());
+    $this->assertEquals('mykey', $field->key);
+    $this->assertEquals('mykey', $field->key());
 
-    $field->assertEquals('myvalue', $field->value);
-    $field->assertEquals('myvalue', $field->value());
-    $field->assertEquals('myvalue', $field->toString());
-    $field->assertEquals('myvalue', (string)$field);
+    $this->assertEquals('myvalue', $field->value);
+    $this->assertEquals('myvalue', $field->value());
+    $this->assertEquals('myvalue', $field->toString());
+    $this->assertEquals('myvalue', (string)$field);
 
   }
 
@@ -29,17 +29,17 @@ public function testModification() {
     $field->key   = 'key-b';
     $field->value = 'value-b';
 
-    $field->assertEquals('page-b', $field->page);
-    $field->assertEquals('page-b', $field->page());
+    $this->assertEquals('page-b', $field->page);
+    $this->assertEquals('page-b', $field->page());
 
-    $field->assertEquals('key-b', $field->key);
-    $field->assertEquals('key-b', $field->key());
+    $this->assertEquals('key-b', $field->key);
+    $this->assertEquals('key-b', $field->key());
 
-    $field->assertEquals('value-b', $field->value);
-    $field->assertEquals('value-b', $field->value());
-    $field->assertEquals('value-b', $field->toString());
-    $field->assertEquals('value-b', (string)$field);
+    $this->assertEquals('value-b', $field->value);
+    $this->assertEquals('value-b', $field->value());
+    $this->assertEquals('value-b', $field->toString());
+    $this->assertEquals('value-b', (string)$field);
 
   }
 
-}
+}
diff --git a/kirby/vendor/composer/installed.json b/kirby/vendor/composer/installed.json
@@ -132,7 +132,7 @@
                 "dev-master": "2.0-dev"
             }
         },
-        "installation-source": "dist",
+        "installation-source": "source",
         "autoload": {
             "psr-4": {
                 "Whoops\\": "src/Whoops/"
@@ -161,34 +161,33 @@
         ]
     },
     {
-        "name": "psr/log",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
+        "name": "erusev/parsedown",
+        "version": "1.7.1",
+        "version_normalized": "1.7.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            "url": "https://github.com/erusev/parsedown.git",
+            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
             "shasum": ""
         },
         "require": {
+            "ext-mbstring": "*",
             "php": ">=5.3.0"
         },
-        "time": "2016-10-10 12:19:37",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
+        "require-dev": {
+            "phpunit/phpunit": "^4.8.35"
         },
-        "installation-source": "source",
+        "time": "2018-03-08 01:11:30",
+        "type": "library",
+        "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "Psr\\Log\\": "Psr/Log/"
+            "psr-0": {
+                "Parsedown": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -197,37 +196,37 @@
         ],
         "authors": [
             {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "name": "Emanuil Rusev",
+                "email": "[email protected]",
+                "homepage": "http://erusev.com"
             }
         ],
-        "description": "Common interface for logging libraries",
-        "homepage": "https://github.com/php-fig/log",
+        "description": "Parser for Markdown.",
+        "homepage": "http://parsedown.org",
         "keywords": [
-            "log",
-            "psr",
-            "psr-3"
+            "markdown",
+            "parser"
         ]
     },
     {
         "name": "getkirby/toolkit",
-        "version": "2.5.10",
-        "version_normalized": "2.5.10.0",
+        "version": "2.5.11",
+        "version_normalized": "2.5.11.0",
         "source": {
             "type": "git",
             "url": "https://github.com/getkirby/toolkit.git",
-            "reference": "c9323735246028b22e945f2641e733dc0d774d1a"
+            "reference": "e8068633422da93b47c404b92241b15d42fc0e3f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/getkirby/toolkit/zipball/c9323735246028b22e945f2641e733dc0d774d1a",
-            "reference": "c9323735246028b22e945f2641e733dc0d774d1a",
+            "url": "https://api.github.com/repos/getkirby/toolkit/zipball/e8068633422da93b47c404b92241b15d42fc0e3f",
+            "reference": "e8068633422da93b47c404b92241b15d42fc0e3f",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.4.0"
+            "php": ">=5.6.0"
         },
-        "time": "2018-03-16 08:50:46",
+        "time": "2018-07-03 09:33:34",
         "type": "library",
         "installation-source": "source",
         "autoload": {
@@ -253,33 +252,34 @@
         ]
     },
     {
-        "name": "erusev/parsedown",
-        "version": "1.7.1",
-        "version_normalized": "1.7.1.0",
+        "name": "psr/log",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/erusev/parsedown.git",
-            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
-            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
             "shasum": ""
         },
         "require": {
-            "ext-mbstring": "*",
             "php": ">=5.3.0"
         },
-        "require-dev": {
-            "phpunit/phpunit": "^4.8.35"
-        },
-        "time": "2018-03-08 01:11:30",
+        "time": "2016-10-10 12:19:37",
         "type": "library",
-        "installation-source": "dist",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "source",
         "autoload": {
-            "psr-0": {
-                "Parsedown": ""
+            "psr-4": {
+                "Psr\\Log\\": "Psr/Log/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -288,16 +288,16 @@
         ],
         "authors": [
             {
-                "name": "Emanuil Rusev",
-                "email": "[email protected]",
-                "homepage": "http://erusev.com"
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
             }
         ],
-        "description": "Parser for Markdown.",
-        "homepage": "http://parsedown.org",
+        "description": "Common interface for logging libraries",
+        "homepage": "https://github.com/php-fig/log",
         "keywords": [
-            "markdown",
-            "parser"
+            "log",
+            "psr",
+            "psr-3"
         ]
     }
 ]
diff --git a/kirby/vendor/getkirby/toolkit/.travis.yml b/kirby/vendor/getkirby/toolkit/.travis.yml
@@ -2,10 +2,9 @@ language: php
 dist: trusty
 sudo: false
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 matrix:
   fast_finish: true
diff --git a/kirby/vendor/getkirby/toolkit/composer.json b/kirby/vendor/getkirby/toolkit/composer.json
@@ -21,9 +21,9 @@
     "files": ["bootstrap.php"]
   },
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=5.6.0"
   },
   "archive": {
     "exclude": ["/.gitignore", "/.travis.yml", "/phpunit.xml", "/test"]
   }
-}
+}