Fix up PHPStan

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 7
+	level: 8
 	paths:
 		- src/
 	bootstrapFiles:

src/View/Helper/MetaHelper.php

@@ -175,7 +175,7 @@ public function icon($value = null) {
 			$value = null;
 		}
 
-		return $this->Html->meta('icon', $value);
+		return (string)$this->Html->meta('icon', $value);
 	}
 
 	/**
@@ -199,7 +199,7 @@ public function sizesIcon($url, $size, array $options = []) {
 			return '';
 		}
 		if ($value === true) {
-			$value = null;
+			$value = $options;
 		}
 
 		$options = [
@@ -237,7 +237,7 @@ public function language($value = null) {
 			'content' => $language,
 		];
 
-		return $this->Html->meta($array);
+		return (string)$this->Html->meta($array);
 	}
 
 	/**
@@ -267,7 +267,7 @@ public function robots($value = null) {
 			$robots = implode(',', $robots);
 		}
 
-		return $this->Html->meta('robots', $robots);
+		return (string)$this->Html->meta('robots', $robots);
 	}
 
 	/**
@@ -324,7 +324,7 @@ public function description($description = null, $lang = null) {
 			'lang' => $lang !== '*' ? $lang : null,
 		];
 
-		return $this->Html->meta($array);
+		return (string)$this->Html->meta($array);
 	}
 
 	/**
@@ -385,7 +385,7 @@ public function keywords($keywords = null, $lang = null) {
 			'lang' => $lang !== '*' ? $lang : null,
 		];
 
-		return $this->Html->meta($array);
+		return (string)$this->Html->meta($array);
 	}
 
 	/**
@@ -422,7 +422,7 @@ public function custom($name = null, $value = null) {
 			'content' => $value,
 		];
 
-		return $this->Html->meta($array);
+		return (string)$this->Html->meta($array);
 	}
 
 	/**
@@ -494,7 +494,7 @@ public function httpEquiv($type = null, $value = null) {
 			'content' => $value,
 		];
 
-		return $this->Html->meta($array);
+		return (string)$this->Html->meta($array);
 	}
 
 	/**
@@ -576,7 +576,7 @@ public function out($header = null, $options = []) {
 				$meta['property'] = $header;
 			}
 
-			return $this->Html->meta($meta);
+			return (string)$this->Html->meta($meta);
 		}
 
 		$results = [];

tests/TestCase/View/Helper/MetaHelperTest.php

@@ -338,8 +338,8 @@ public function testOut() {
 <link rel="canonical" href="/"/>
 <meta http-equiv="language" content="de"/>
 <meta name="robots" content="index,nofollow,noarchive"/>
-<meta name="keywords" content="foo bar" lang="de"/><meta name="keywords" content="foo bar EN" lang="en"/>
 <meta name="description" content="A sentence" lang="de"/>
+<meta name="keywords" content="foo bar" lang="de"/><meta name="keywords" content="foo bar EN" lang="en"/>
 <meta name="http-equiv" content="0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/><meta name="x" content="y"/>';
 		$this->assertTextEquals($expected, $result);
@@ -364,8 +364,8 @@ public function testOutMultiLanguageFalse() {
 <link href="/favicon.ico" type="image/x-icon" rel="icon"/><link href="/favicon.ico" type="image/x-icon" rel="shortcut icon"/>
 <meta http-equiv="language" content="de"/>
 <meta name="robots" content="noindex,nofollow,noarchive"/>
-<meta name="keywords" content="foo bar" lang="de"/>
-<meta name="description" content="A sentence" lang="de"/>';
+<meta name="description" content="A sentence" lang="de"/>
+<meta name="keywords" content="foo bar" lang="de"/>';
 		$this->assertTextEquals($expected, $result);
 
 		$this->Meta->language('en');
@@ -380,8 +380,8 @@ public function testOutMultiLanguageFalse() {
 <link href="/favicon.ico" type="image/x-icon" rel="icon"/><link href="/favicon.ico" type="image/x-icon" rel="shortcut icon"/>
 <meta http-equiv="language" content="en"/>
 <meta name="robots" content="noindex,nofollow,noarchive"/>
-<meta name="keywords" content="foo bar EN" lang="en"/>
-<meta name="description" content="A sentence EN" lang="en"/>';
+<meta name="description" content="A sentence EN" lang="en"/>
+<meta name="keywords" content="foo bar EN" lang="en"/>';
 		$this->assertTextEquals($expected, $result);
 	}