geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-31 04:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source 
* 3.x:
  Deprecate OptimizerNodeVisitor::OPTIMIZE_TEXT_NODES
This commit is contained in:
Fabien Potencier
2024-08-23 09:25:03 +02:00
parent 96e5d65d42 1fe2c00fa2
commit 34dce7cd9f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NodeVisitor/OptimizerNodeVisitor.php
+4 -2
View File
@@ -42,7 +42,6 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface
public const OPTIMIZE_ALL = -1;
public const OPTIMIZE_NONE = 0;
public const OPTIMIZE_FOR = 2;
public const OPTIMIZE_TEXT_NODES = 8;
/**
* @var ForNode[]
@@ -59,7 +58,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface
*/
public function __construct(int $optimizers = -1)
{
if ($optimizers > (self::OPTIMIZE_FOR | self::OPTIMIZE_TEXT_NODES)) {
if ($optimizers > (self::OPTIMIZE_FOR)) {
throw new \InvalidArgumentException(\sprintf('Optimizer mode "%s" is not valid.', $optimizers));
}
@@ -83,6 +82,7 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface
$node = $this->optimizePrintNode($node);
<<<<<<< HEAD
if (self::OPTIMIZE_TEXT_NODES === (self::OPTIMIZE_TEXT_NODES & $this->optimizers)) {
$node = $this->mergeTextNodeCalls($node);
}
@@ -119,6 +119,8 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface
}
}
=======
>>>>>>> 3.x
return $node;
}
tests/NodeVisitor/OptimizerTest.php
+2 -4
View File
@@ -27,10 +27,8 @@ class OptimizerTest extends TestCase
public function testConstructor()
{
$this->expectNotToPerformAssertions();
new OptimizerNodeVisitor(
OptimizerNodeVisitor::OPTIMIZE_FOR
| OptimizerNodeVisitor::OPTIMIZE_TEXT_NODES
);
new OptimizerNodeVisitor(OptimizerNodeVisitor::OPTIMIZE_FOR);
}
public function testRenderBlockOptimizer()