Skip to content
This repository has been archived by the owner on Jan 25, 2021. It is now read-only.

Commit

Permalink
Upgrade to 2.5.12
Browse files Browse the repository at this point in the history
  • Loading branch information
bastianallgeier committed Jul 17, 2018
1 parent 18c624e commit 7f6b0df
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion kirby/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.11",
"getkirby/toolkit": "2.5.12",
"filp/whoops": "2.1.14"
},
"archive": {
Expand Down
14 changes: 7 additions & 7 deletions kirby/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kirby/kirby.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class Kirby {

static public $version = '2.5.11';
static public $version = '2.5.12';
static public $instance;
static public $hooks = array();
static public $triggered = array();
Expand Down
84 changes: 42 additions & 42 deletions kirby/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,95 +209,95 @@
]
},
{
"name": "getkirby/toolkit",
"version": "2.5.11",
"version_normalized": "2.5.11.0",
"name": "psr/log",
"version": "1.0.2",
"version_normalized": "1.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/getkirby/toolkit.git",
"reference": "e8068633422da93b47c404b92241b15d42fc0e3f"
"url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getkirby/toolkit/zipball/e8068633422da93b47c404b92241b15d42fc0e3f",
"reference": "e8068633422da93b47c404b92241b15d42fc0e3f",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
"php": ">=5.6.0"
"php": ">=5.3.0"
},
"time": "2018-07-03 09:33:34",
"time": "2016-10-10 12:19:37",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"autoload": {
"files": [
"bootstrap.php"
]
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bastian Allgeier",
"email": "[email protected]",
"homepage": "http://bastianallgeier.com"
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"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",
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
"toolkit"
"log",
"psr",
"psr-3"
]
},
{
"name": "psr/log",
"version": "1.0.2",
"version_normalized": "1.0.2.0",
"name": "getkirby/toolkit",
"version": "2.5.12",
"version_normalized": "2.5.12.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
"url": "https://github.com/getkirby/toolkit.git",
"reference": "b6457bab41d347d5ae4ed6b92244935e6dfed919"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"url": "https://api.github.com/repos/getkirby/toolkit/zipball/b6457bab41d347d5ae4ed6b92244935e6dfed919",
"reference": "b6457bab41d347d5ae4ed6b92244935e6dfed919",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
"php": ">=5.6.0"
},
"time": "2016-10-10 12:19:37",
"time": "2018-07-17 08:25:11",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
}
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"name": "Bastian Allgeier",
"email": "[email protected]",
"homepage": "http://bastianallgeier.com"
}
],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"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": [
"log",
"psr",
"psr-3"
"toolkit"
]
}
]
2 changes: 1 addition & 1 deletion kirby/vendor/getkirby/toolkit/lib/toolkit.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
class Toolkit {

public static $version = '2.5.11';
public static $version = '2.5.12';

public static function version() {
return static::$version;
Expand Down
6 changes: 3 additions & 3 deletions panel/app/src/panel.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@

class Panel {

static public $version = '2.5.11';
static public $version = '2.5.12';

// minimal requirements
static public $requires = array(
'php' => '5.6.0',
'toolkit' => '2.5.11',
'kirby' => '2.5.11'
'toolkit' => '2.5.12',
'kirby' => '2.5.12'
);

static public $instance;
Expand Down

0 comments on commit 7f6b0df

Please sign in to comment.