Merge branch 'MDL-70319-311' of git://github.com/ilyatregubov/moodle into MOODLE_311_STABLE

lib/php-enum/src/Enum.php

@@ -37,6 +37,14 @@ abstract class Enum implements \JsonSerializable
      */
     protected static $cache = [];
 
+    /**
+     * Cache of instances of the Enum class
+     *
+     * @var array
+     * @psalm-var array<class-string, array<string, static>>
+     */
+    protected static $instances = [];
+
     /**
      * Creates a new value of some type
      *
@@ -211,17 +219,20 @@ abstract class Enum implements \JsonSerializable
      * @param array  $arguments
      *
      * @return static
-     * @psalm-pure
      * @throws \BadMethodCallException
      */
     public static function __callStatic($name, $arguments)
     {
-        $array = static::toArray();
+        $class = static::class;
-        if (isset($array[$name]) || \array_key_exists($name, $array)) {
+        if (!isset(self::$instances[$class][$name])) {
-            return new static($array[$name]);
+            $array = static::toArray();
+            if (!isset($array[$name]) && !\array_key_exists($name, $array)) {
+                $message = "No static method or enum constant '$name' in class " . static::class;
+                throw new \BadMethodCallException($message);
+            }
+            return self::$instances[$class][$name] = new static($array[$name]);
         }
-
+        return clone self::$instances[$class][$name];
-        throw new \BadMethodCallException("No static method or enum constant '$name' in class " . static::class);
     }
 
     /**

lib/thirdpartylibs.xml

@@ -349,7 +349,7 @@
     <location>php-enum</location>
     <name>php-enum</name>
     <license>MIT</license>
-    <version>1.7.6</version>
+    <version>1.7.7</version>
   </library>
   <library>
     <location>http-message</location>