Improve Twig's environment version check

MauricioFauth · MauricioFauth · commit d74a7e3164e0 · 2024-09-11T16:28:30.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "twig/twig": "^1.42.3|^2.0|^3.0"
+        "twig/twig": "^1.42.3 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "phpmyadmin/coding-standard": "^3.0.0",
diff --git a/src/Node/TransNode.php b/src/Node/TransNode.php
@@ -102,13 +102,12 @@ public function __construct(
         }
 
         /** @phpstan-ignore-next-line */
-        if (Environment::VERSION_ID >= 31300 || Environment::VERSION_ID >= 301200) {
+        if (Environment::MAJOR_VERSION >= 3 && Environment::MINOR_VERSION >= 12) {
             parent::__construct($nodes, [], $lineno);
 
             return;
         }
 
-        /** @phpstan-ignore-next-line */
         parent::__construct($nodes, [], $lineno, $tag);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,12 @@ public function __construct(`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/** @phpstan-ignore-next-line */`
`105`		`- if (Environment::VERSION_ID >= 31300 \|\| Environment::VERSION_ID >= 301200) {`
	`105`	`+ if (Environment::MAJOR_VERSION >= 3 && Environment::MINOR_VERSION >= 12) {`
`106`	`106`	`parent::__construct($nodes, [], $lineno);`
`107`	`107`
`108`	`108`	`return;`
`109`	`109`	`}`
`110`	`110`
`111`		`- /** @phpstan-ignore-next-line */`
`112`	`111`	`parent::__construct($nodes, [], $lineno, $tag);`
`113`	`112`	`}`
`114`	`113`