Merge pull request #4 from bestit/feature/CTPBH-2507-add-74-support

CTPBh-2507 update the twig version for php 7.4 support

Author: tim-kellner

composer.json

@@ -30,7 +30,7 @@
     "require": {
         "php": "^7.0",
         "symfony/symfony": "^3.1",
-        "twig/twig": "1.24.*"
+        "twig/twig": "v1.42.*"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^2.7",

composer.lock

@@ -27,6 +27,8 @@ public function __construct(Twig_Node_Module $originalNode)
             $originalNode->lineno,
             $originalNode->tag
         );
+
+        $this->setSourceContext($originalNode->getSourceContext());
     }
 
     /**

src/Twig/NodeModule/CollectAssetsCompiler.php

@@ -56,6 +56,12 @@ protected function doEnterNode(Twig_Node $node, Twig_Environment $env): Twig_Nod
         }
 
         if ($node instanceof Twig_Node_Include) {
+            // Workaround to avoid empty template names for embed templates
+            $name = $node->hasAttribute('name') ? $node->getAttribute('name') : null;
+            if (empty($name)){
+                $node->setAttribute('name', $node->getSourceContext()->getPath());
+            }
+
             $this->includes[] = $node->getNode('expr')->getAttribute('value');
         }