Issue #3094493 by longwave, Gábor Hojtsy, alexpott, naveen433, Chi, catch,... (837b829a) · Commits · project / drupal

composer.lock

+10 −14

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@
		"dist": {
		"type": "path",
		"url": "core",
		"reference": "25a2835ba98c19a6fa4d60089d813a81de36e5e5"
		"reference": "7963aa1162a3808d6d854bbba38a125121839b66"
		},
		"require": {
		"asm89/stack-cors": "^1.1",
		@@ -494,7 +494,7 @@
		"symfony/translation": "^4.4",
		"symfony/validator": "^4.4",
		"symfony/yaml": "^4.4.19",
		"twig/twig": "^2.12.0",
		"twig/twig": "^3.0",
		"typo3/phar-stream-wrapper": "^3.1.3"
		},
		"conflict": {
		@@ -651,8 +651,7 @@
		"autoload": {
		"psr-4": {
		"Drupal\\Core\\": "lib/Drupal/Core",
		"Drupal\\Component\\": "lib/Drupal/Component",
		"Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
		"Drupal\\Component\\": "lib/Drupal/Component"
		},
		"classmap": [
		"lib/Drupal.php",
		@@ -4284,16 +4283,16 @@
		},
		{
		"name": "twig/twig",
		"version": "v2.14.7",
		"version": "v3.3.7",
		"source": {
		"type": "git",
		"url": "https://github.com/twigphp/Twig.git",
		"reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f"
		"reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/twigphp/Twig/zipball/8e202327ee1ed863629de9b18a5ec70ac614d88f",
		"reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f",
		"url": "https://api.github.com/repos/twigphp/Twig/zipball/8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
		"reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
		"shasum": ""
		},
		"require": {
		@@ -4308,13 +4307,10 @@
		"type": "library",
		"extra": {
		"branch-alias": {
		"dev-master": "2.14-dev"
		"dev-master": "3.3-dev"
		}
		},
		"autoload": {
		"psr-0": {
		"Twig_": "lib/"
		},
		"psr-4": {
		"Twig\\": "src/"
		}
		@@ -4347,7 +4343,7 @@
		],
		"support": {
		"issues": "https://github.com/twigphp/Twig/issues",
		"source": "https://github.com/twigphp/Twig/tree/v2.14.7"
		"source": "https://github.com/twigphp/Twig/tree/v3.3.7"
		},
		"funding": [
		{
		@@ -4359,7 +4355,7 @@
		"type": "tidelift"
		}
		],
		"time": "2021-09-17T08:39:54+00:00"
		"time": "2022-01-03T21:15:37+00:00"
		},
		{
		"name": "typo3/phar-stream-wrapper",

composer/Metapackage/CoreRecommended/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@
		"symfony/validator": "v4.4.35",
		"symfony/var-dumper": "v5.4.0",
		"symfony/yaml": "v4.4.34",
		"twig/twig": "v2.14.7",
		"twig/twig": "v3.3.7",
		"typo3/phar-stream-wrapper": "v3.1.7"
		}
		}

core/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		"symfony/polyfill-php80": "^1.16",
		"symfony/yaml": "^4.4.19",
		"typo3/phar-stream-wrapper": "^3.1.3",
		"twig/twig": "^2.12.0",
		"twig/twig": "^3.0",
		"doctrine/annotations": "^1.12",
		"guzzlehttp/guzzle": "^7.3.0",
		"laminas/laminas-feed": "^2.12",

core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ public function __construct($paths, ModuleHandlerInterface $module_handler, Them
		* @param string $namespace
		* (optional) A path name.
		*/
		public function addPath($path, $namespace = self::MAIN_NAMESPACE) {
		public function addPath(string $path, string $namespace = self::MAIN_NAMESPACE): void {
		// Invalidate the cache.
		$this->cache = [];
		$this->paths[$namespace][] = rtrim($path, '/\\');

core/lib/Drupal/Core/Template/Loader/StringLoader.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,21 +40,21 @@ public function exists($name) {
		/**
		* {@inheritdoc}
		*/
		public function getCacheKey($name) {
		public function getCacheKey(string $name): string {
		return $name;
		}

		/**
		* {@inheritdoc}
		*/
		public function isFresh($name, $time) {
		public function isFresh(string $name, int $time): bool {
		return TRUE;
		}

		/**
		* {@inheritdoc}
		*/
		public function getSourceContext($name) {
		public function getSourceContext(string $name): Source {
		$name = (string) $name;
		return new Source($name, $name);
		}