Upgrade to 3.7.1

This commit is contained in:
Bastian Allgeier
2022-07-12 13:33:21 +02:00
parent 7931eb5e47
commit 1ad1eaf387
377 changed files with 63981 additions and 63824 deletions

View File

@@ -21,46 +21,46 @@ use Kirby\Http\Url as BaseUrl;
*/
class Url extends BaseUrl
{
public static $home = null;
public static $home = null;
/**
* Returns the Url to the homepage
*
* @return string
*/
public static function home(): string
{
return App::instance()->url();
}
/**
* Returns the Url to the homepage
*
* @return string
*/
public static function home(): string
{
return App::instance()->url();
}
/**
* Creates an absolute Url to a template asset if it exists. This is used in the `css()` and `js()` helpers
*
* @param string $assetPath
* @param string $extension
* @return string|null
*/
public static function toTemplateAsset(string $assetPath, string $extension)
{
$kirby = App::instance();
$page = $kirby->site()->page();
$path = $assetPath . '/' . $page->template() . '.' . $extension;
$file = $kirby->root('assets') . '/' . $path;
$url = $kirby->url('assets') . '/' . $path;
/**
* Creates an absolute Url to a template asset if it exists. This is used in the `css()` and `js()` helpers
*
* @param string $assetPath
* @param string $extension
* @return string|null
*/
public static function toTemplateAsset(string $assetPath, string $extension)
{
$kirby = App::instance();
$page = $kirby->site()->page();
$path = $assetPath . '/' . $page->template() . '.' . $extension;
$file = $kirby->root('assets') . '/' . $path;
$url = $kirby->url('assets') . '/' . $path;
return file_exists($file) === true ? $url : null;
}
return file_exists($file) === true ? $url : null;
}
/**
* Smart resolver for internal and external urls
*
* @param string|null $path
* @param array|string|null $options Either an array of options for the Uri class or a language string
* @return string
*/
public static function to(string $path = null, $options = null): string
{
$kirby = App::instance();
return ($kirby->component('url'))($kirby, $path, $options);
}
/**
* Smart resolver for internal and external urls
*
* @param string|null $path
* @param array|string|null $options Either an array of options for the Uri class or a language string
* @return string
*/
public static function to(string $path = null, $options = null): string
{
$kirby = App::instance();
return ($kirby->component('url'))($kirby, $path, $options);
}
}