aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/View.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2023-11-24 14:50:03 +0100
committerGravatar GitHub <noreply@github.com> 2023-11-24 14:50:03 +0100
commit76cbfadcdfdcbf675b83f6162a229938aca3bbe1 (patch)
tree01aa96c6774dcf2a692fd3062ae1ffccb0a8bfa0 /lib/Minz/View.php
parentbc9ef0d188fa43d4a4d06835f74e2d94799b65c6 (diff)
Fix types for extensions (#5901)
* Fix types for extensions To accompany https://github.com/FreshRSS/Extensions/pull/185 * Avoid bug redeclared function
Diffstat (limited to 'lib/Minz/View.php')
-rw-r--r--lib/Minz/View.php32
1 files changed, 22 insertions, 10 deletions
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index da6e55a23..f67cf6277 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -157,7 +157,7 @@ class Minz_View {
/**
* Choose the current view layout.
- * @param string|null $layout the layout name to use, false to use no layouts.
+ * @param string|null $layout the layout name to use, null to use no layouts.
*/
public function _layout(?string $layout): void {
if ($layout != null) {
@@ -205,7 +205,7 @@ class Minz_View {
*/
public static function headStyle(): string {
$styles = '';
- foreach(self::$styles as $style) {
+ foreach (self::$styles as $style) {
$styles .= '<link rel="stylesheet" ' .
($style['media'] === 'all' ? '' : 'media="' . $style['media'] . '" ') .
'href="' . $style['url'] . '" />';
@@ -220,10 +220,13 @@ class Minz_View {
* @param bool $cond Conditional comment for IE, now deprecated and ignored @deprecated
*/
public static function prependStyle(string $url, string $media = 'all', bool $cond = false): void {
- array_unshift (self::$styles, array (
+ if ($url === '') {
+ return;
+ }
+ array_unshift(self::$styles, [
'url' => $url,
'media' => $media,
- ));
+ ]);
}
/**
@@ -233,10 +236,13 @@ class Minz_View {
* @param bool $cond Conditional comment for IE, now deprecated and ignored @deprecated
*/
public static function appendStyle(string $url, string $media = 'all', bool $cond = false): void {
- self::$styles[] = array (
+ if ($url === '') {
+ return;
+ }
+ self::$styles[] = [
'url' => $url,
'media' => $media,
- );
+ ];
}
/**
@@ -298,12 +304,15 @@ class Minz_View {
* @param string $id Add a script `id` attribute
*/
public static function prependScript(string $url, bool $cond = false, bool $defer = true, bool $async = true, string $id = ''): void {
- array_unshift(self::$scripts, array (
+ if ($url === '') {
+ return;
+ }
+ array_unshift(self::$scripts, [
'url' => $url,
'defer' => $defer,
'async' => $async,
'id' => $id,
- ));
+ ]);
}
/**
@@ -315,12 +324,15 @@ class Minz_View {
* @param string $id Add a script `id` attribute
*/
public static function appendScript(string $url, bool $cond = false, bool $defer = true, bool $async = true, string $id = ''): void {
- self::$scripts[] = array (
+ if ($url === '') {
+ return;
+ }
+ self::$scripts[] = [
'url' => $url,
'defer' => $defer,
'async' => $async,
'id' => $id,
- );
+ ];
}
/**