Merge branch '4.14' of https://github.com/craftcms/cms into 5.6

CHANGELOG-WIP.md

@@ -35,3 +35,4 @@
 
 ### System
 - Craft now keeps track of which site users registered from. When sending an email from the control panel, the current site is now set to the user’s affiliated site, if known. ([#16174](https://github.com/craftcms/cms/pull/16174)) 
+- Updated Twig to 3.15.

composer.json

@@ -62,7 +62,7 @@
     "symfony/var-dumper": "^5.0|^6.0",
     "symfony/yaml": "^5.2.3",
     "theiconic/name-parser": "^1.2",
-    "twig/twig": "~3.14.0",
+    "twig/twig": "~3.15.0",
     "voku/stringy": "^6.4.0",
     "web-auth/webauthn-lib": "~4.9.0",
     "webonyx/graphql-php": "~14.11.5",

src/web/View.php

@@ -28,6 +28,7 @@
 use craft\web\twig\SinglePreloaderExtension;
 use craft\web\twig\TemplateLoader;
 use LogicException;
+use Stringable;
 use Throwable;
 use Twig\Error\LoaderError as TwigLoaderError;
 use Twig\Error\RuntimeError as TwigRuntimeError;
@@ -393,7 +394,9 @@ public function createTwig(): Environment
         $twig = new Environment(new TemplateLoader($this), $this->_getTwigOptions());
 
         // Mark SafeHtml as a safe interface
-        $twig->getRuntime(EscaperRuntime::class)->addSafeClass(SafeHtml::class, ['html']);
+        /** @var class-string<Stringable> $safeClass */
+        $safeClass = SafeHtml::class;
+        $twig->getRuntime(EscaperRuntime::class)->addSafeClass($safeClass, ['html']);
 
         $twig->addExtension(new StringLoaderExtension());
         $twig->addExtension(new Extension($this, $twig));

src/web/twig/Extension.php

@@ -358,6 +358,7 @@ public function getTests(): array
     /**
      * @inheritdoc
      */
+    /** @phpstan-ignore-next-line */
     public function getOperators(): array
     {
         return [