Merge branch '1.x' into 2.x

* 1.x:
  Minor fixes
This commit is contained in:
Nicolas Grekas
2020-05-21 11:15:20 +02:00
11 changed files with 27 additions and 25 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ use Twig\Source;
*/
class ModuleNode extends Node
{
public function __construct(Node $body, AbstractExpression $parent = null, Node $blocks, Node $macros, Node $traits, $embeddedTemplates, Source $source)
public function __construct(Node $body, ?AbstractExpression $parent, Node $blocks, Node $macros, Node $traits, $embeddedTemplates, Source $source)
{
if (__CLASS__ !== \get_class($this)) {
@trigger_error('Overriding '.__CLASS__.' is deprecated since Twig 2.4.0 and the class will be final in 3.0.', E_USER_DEPRECATED);