Merge branch 'MDL-84852-main' of https://github.com/andrewnicols/moodle

lib/mustache/readme_moodle.txt

@@ -25,4 +25,7 @@ This can be achieved by:
     https://github.com/bobthecow/mustache.php/pull/402/commits/db771014c7e346438f68077813ebdda3fdae12df.patch
     b) In terminal, navigate to lib/mustache/src/Mustache
     c) Run the following: patch --directory . < ~/path/to/patch.patch
-    d) We do not need the unit test, so run rm DisableLambdaRenderingTest.php
+    d) We do not need the unit test, so run rm DisableLambdaRenderingTest.php
+2) Apply local changes to ensure that all nullable method parameters are correctly type-hinted.
+   These can be detected using:
+   phpcs --sniffs=PHPCompatibility.FunctionDeclarations.RemovedImplicitlyNullableParam lib/mustache

lib/mustache/src/Mustache/Engine.php

@@ -731,11 +731,11 @@ class Mustache_Engine
      * @see Mustache_Engine::loadLambda
      *
      * @param string|Mustache_Source $source
-     * @param Mustache_Cache         $cache  (default: null)
+     * @param ?Mustache_Cache         $cache  (default: null)
      *
      * @return Mustache_Template
      */
-    private function loadSource($source, Mustache_Cache $cache = null)
+    private function loadSource($source, ?Mustache_Cache $cache = null)
     {
         $className = $this->getTemplateClassName($source);
 

lib/mustache/src/Mustache/Exception/SyntaxException.php

@@ -19,9 +19,9 @@ class Mustache_Exception_SyntaxException extends LogicException implements Musta
     /**
      * @param string    $msg
      * @param array     $token
-     * @param Exception $previous
+     * @param ?Exception $previous
      */
-    public function __construct($msg, array $token, Exception $previous = null)
+    public function __construct($msg, array $token, ?Exception $previous = null)
     {
         $this->token = $token;
         if (version_compare(PHP_VERSION, '5.3.0', '>=')) {

lib/mustache/src/Mustache/Exception/UnknownFilterException.php

@@ -18,9 +18,9 @@ class Mustache_Exception_UnknownFilterException extends UnexpectedValueException
 
     /**
      * @param string    $filterName
-     * @param Exception $previous
+     * @param ?Exception $previous
      */
-    public function __construct($filterName, Exception $previous = null)
+    public function __construct($filterName, ?Exception $previous = null)
     {
         $this->filterName = $filterName;
         $message = sprintf('Unknown filter: %s', $filterName);

lib/mustache/src/Mustache/Exception/UnknownHelperException.php

@@ -18,9 +18,9 @@ class Mustache_Exception_UnknownHelperException extends InvalidArgumentException
 
     /**
      * @param string    $helperName
-     * @param Exception $previous
+     * @param ?Exception $previous
      */
-    public function __construct($helperName, Exception $previous = null)
+    public function __construct($helperName, ?Exception $previous = null)
     {
         $this->helperName = $helperName;
         $message = sprintf('Unknown helper: %s', $helperName);

lib/mustache/src/Mustache/Exception/UnknownTemplateException.php

@@ -18,9 +18,9 @@ class Mustache_Exception_UnknownTemplateException extends InvalidArgumentExcepti
 
     /**
      * @param string    $templateName
-     * @param Exception $previous
+     * @param ?Exception $previous
      */
-    public function __construct($templateName, Exception $previous = null)
+    public function __construct($templateName, ?Exception $previous = null)
     {
         $this->templateName = $templateName;
         $message = sprintf('Unknown template: %s', $templateName);

lib/mustache/src/Mustache/Parser.php

@@ -66,11 +66,11 @@ class Mustache_Parser
      * @throws Mustache_Exception_SyntaxException when nesting errors or mismatched section tags are encountered
      *
      * @param array &$tokens Set of Mustache tokens
-     * @param array $parent  Parent token (default: null)
+     * @param ?array $parent  Parent token (default: null)
      *
      * @return array Mustache Token parse tree
      */
-    private function buildTree(array &$tokens, array $parent = null)
+    private function buildTree(array &$tokens, ?array $parent = null)
     {
         $nodes = array();