Upgrade to 3.1.2

This commit is contained in:
Bastian Allgeier
2019-04-09 14:34:12 +02:00
parent 852a14595e
commit eb29ef6d6c
58 changed files with 535 additions and 258 deletions

View File

@@ -160,6 +160,10 @@ class App
*/
public function api(): Api
{
if ($this->api !== null) {
return $this->api;
}
$root = static::$root . '/config/api';
$extensions = $this->extensions['api'] ?? [];
$routes = (include $root . '/routes.php')($this);
@@ -174,7 +178,7 @@ class App
'kirby' => $this,
];
return $this->api = $this->api ?? new Api($api);
return $this->api = new Api($api);
}
/**
@@ -254,7 +258,7 @@ class App
* automatically injected
*
* @param string $name
* @return void
* @return Kirby\Cms\Collection|null
*/
public function collection(string $name)
{
@@ -682,7 +686,7 @@ class App
*/
public function markdown(string $text = null, bool $inline = false): string
{
return $this->extensions['components']['markdown']($this, $text, $this->options['markdown'] ?? [], $inline);
return $this->component('markdown')($this, $text, $this->options['markdown'] ?? [], $inline);
}
/**
@@ -1091,7 +1095,7 @@ class App
*/
public function smartypants(string $text = null): string
{
return $this->extensions['components']['smartypants']($this, $text, $this->options['smartypants'] ?? []);
return $this->component('smartypants')($this, $text, $this->options['smartypants'] ?? []);
}
/**
@@ -1103,7 +1107,7 @@ class App
*/
public function snippet(string $name, array $data = []): ?string
{
return $this->extensions['components']['snippet']($this, $name, array_merge($this->data, $data));
return $this->component('snippet')($this, $name, array_merge($this->data, $data));
}
/**
@@ -1125,7 +1129,7 @@ class App
*/
public function template(string $name, string $type = 'html', string $defaultType = 'html'): Template
{
return $this->extensions['components']['template']($this, $name, $type, $defaultType);
return $this->component('template')($this, $name, $type, $defaultType);
}
/**
@@ -1134,11 +1138,11 @@ class App
* @param string $src
* @param string $dst
* @param array $options
* @return null
* @return string
*/
public function thumb(string $src, string $dst, array $options = [])
public function thumb(string $src, string $dst, array $options = []): string
{
return $this->extensions['components']['thumb']($this, $src, $dst, $options);
return $this->component('thumb')($this, $src, $dst, $options);
}
/**