Merge branch '3.x' into 4.x

* 3.x:
  Fix CS
  Remove redundant "$thing instanceof \Countable" check
  Update PHPUnit schema
  fix TwigExtraBundle tests with Symfony 6.0/6.1
This commit is contained in:
Fabien Potencier
2024-02-10 10:03:27 +01:00
42 changed files with 79 additions and 73 deletions
+1 -1
View File
@@ -269,7 +269,7 @@ class Parser
$this->embeddedTemplates[] = $template;
}
public function addImportedSymbol(string $type, string $alias, string $name = null, AbstractExpression $node = null): void
public function addImportedSymbol(string $type, string $alias, ?string $name = null, ?AbstractExpression $node = null): void
{
$this->importedSymbols[0][$type][$alias] = ['name' => $name, 'node' => $node];
}