Avoid implicit nullable

swissspidy · bobthecow · commit c0453be5c09e · 2025-06-08T22:28:55.000-04:00
diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
@@ -741,12 +741,12 @@ public function loadLambda($source, $delims = null)
      *
      * @return Mustache_Template
      */
-    private function loadSource($source, Mustache_Cache $cache = null)
+    private function loadSource($source, $cache = null)
     {
         $className = $this->getTemplateClassName($source);
 
         if (!isset($this->templates[$className])) {
-            if ($cache === null) {
+            if ($cache === null || ! $cache instanceof Mustache_Cache) {
                 $cache = $this->getCache();
             }
 
diff --git a/src/Mustache/Exception/SyntaxException.php b/src/Mustache/Exception/SyntaxException.php
@@ -21,7 +21,7 @@ class Mustache_Exception_SyntaxException extends LogicException implements Musta
      * @param array     $token
      * @param Exception $previous
      */
-    public function __construct($msg, array $token, Exception $previous = null)
+    public function __construct($msg, array $token, $previous = null)
     {
         $this->token = $token;
         if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
diff --git a/src/Mustache/Exception/UnknownFilterException.php b/src/Mustache/Exception/UnknownFilterException.php
@@ -20,7 +20,7 @@ class Mustache_Exception_UnknownFilterException extends UnexpectedValueException
      * @param string    $filterName
      * @param Exception $previous
      */
-    public function __construct($filterName, Exception $previous = null)
+    public function __construct($filterName, $previous = null)
     {
         $this->filterName = $filterName;
         $message = sprintf('Unknown filter: %s', $filterName);
diff --git a/src/Mustache/Exception/UnknownHelperException.php b/src/Mustache/Exception/UnknownHelperException.php
@@ -20,7 +20,7 @@ class Mustache_Exception_UnknownHelperException extends InvalidArgumentException
      * @param string    $helperName
      * @param Exception $previous
      */
-    public function __construct($helperName, Exception $previous = null)
+    public function __construct($helperName, $previous = null)
     {
         $this->helperName = $helperName;
         $message = sprintf('Unknown helper: %s', $helperName);
diff --git a/src/Mustache/Exception/UnknownTemplateException.php b/src/Mustache/Exception/UnknownTemplateException.php
@@ -20,7 +20,7 @@ class Mustache_Exception_UnknownTemplateException extends InvalidArgumentExcepti
      * @param string    $templateName
      * @param Exception $previous
      */
-    public function __construct($templateName, Exception $previous = null)
+    public function __construct($templateName, $previous = null)
     {
         $this->templateName = $templateName;
         $message = sprintf('Unknown template: %s', $templateName);
diff --git a/src/Mustache/Parser.php b/src/Mustache/Parser.php
@@ -72,7 +72,7 @@ public function setPragmas(array $pragmas)
      *
      * @return array Mustache Token parse tree
      */
-    private function buildTree(array &$tokens, array $parent = null)
+    private function buildTree(array &$tokens, $parent = null)
     {
         $nodes = array();
 

Original file line number	Diff line number	Diff line change
`@@ -741,12 +741,12 @@ public function loadLambda($source, $delims = null)`
`741`	`741`	`*`
`742`	`742`	`* @return Mustache_Template`
`743`	`743`	`*/`
`744`		`- private function loadSource($source, Mustache_Cache $cache = null)`
	`744`	`+ private function loadSource($source, $cache = null)`
`745`	`745`	`{`
`746`	`746`	`$className = $this->getTemplateClassName($source);`
`747`	`747`
`748`	`748`	`if (!isset($this->templates[$className])) {`
`749`		`- if ($cache === null) {`
	`749`	`+ if ($cache === null \|\| ! $cache instanceof Mustache_Cache) {`
`750`	`750`	`$cache = $this->getCache();`
`751`	`751`	`}`
`752`	`752`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Mustache_Exception_SyntaxException extends LogicException implements Musta`
`21`	`21`	`* @param array $token`
`22`	`22`	`* @param Exception $previous`
`23`	`23`	`*/`
`24`		`- public function __construct($msg, array $token, Exception $previous = null)`
	`24`	`+ public function __construct($msg, array $token, $previous = null)`
`25`	`25`	`{`
`26`	`26`	`$this->token = $token;`
`27`	`27`	`if (version_compare(PHP_VERSION, '5.3.0', '>=')) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Mustache_Exception_UnknownFilterException extends UnexpectedValueException`
`20`	`20`	`* @param string $filterName`
`21`	`21`	`* @param Exception $previous`
`22`	`22`	`*/`
`23`		`- public function __construct($filterName, Exception $previous = null)`
	`23`	`+ public function __construct($filterName, $previous = null)`
`24`	`24`	`{`
`25`	`25`	`$this->filterName = $filterName;`
`26`	`26`	`$message = sprintf('Unknown filter: %s', $filterName);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function setPragmas(array $pragmas)`
`72`	`72`	`*`
`73`	`73`	`* @return array Mustache Token parse tree`
`74`	`74`	`*/`
`75`		`- private function buildTree(array &$tokens, array $parent = null)`
	`75`	`+ private function buildTree(array &$tokens, $parent = null)`
`76`	`76`	`{`
`77`	`77`	`$nodes = array();`
`78`	`78`