Isolate deduplicatePhpTags process

Author: kylekatarnls

src/Phug/Formatter/AbstractTwigFormat.php

@@ -98,6 +98,28 @@ protected function formatAttributes(MarkupElement $element)
         return $code;
     }
 
+    protected function deduplicatePhpTags($commentPattern, &$content, &$childContent)
+    {
+        // @codeCoverageIgnoreStart
+        $content = preg_replace('/\\s\\?>$/', '', $content);
+        $childContent = preg_replace('/^<\\?(?:php)?\\s/', '', $childContent);
+        if ($commentPattern &&
+            ($pos = mb_strpos($childContent, $commentPattern)) !== false && (
+                ($end = mb_strpos($childContent, '?>')) === false ||
+                $pos < $end
+            ) &&
+            preg_match('/\\}\\s*$/', $content)
+        ) {
+            $content = preg_replace(
+                '/\\}\\s*$/',
+                preg_replace('/\\?><\\?php(?:php)?(\s+\\?><\\?php(?:php)?)*/', '\\\\0', $childContent, 1),
+                $content
+            );
+            $childContent = '';
+        }
+        // @codeCoverageIgnoreEnd
+    }
+
     protected function formatTwigChildElement($child, $previous, &$content, $commentPattern)
     {
         $childContent = $this->formatter->format($child);
@@ -106,22 +128,7 @@ protected function formatTwigChildElement($child, $previous, &$content, $comment
             $previous instanceof CodeElement &&
             $previous->isCodeBlock()
         ) {
-            $content = preg_replace('/\\s\\?>$/', '', $content);
-            $childContent = preg_replace('/^<\\?(?:php)?\\s/', '', $childContent);
-            if ($commentPattern &&
-                ($pos = mb_strpos($childContent, $commentPattern)) !== false && (
-                    ($end = mb_strpos($childContent, '?>')) === false ||
-                    $pos < $end
-                ) &&
-                preg_match('/\\}\\s*$/', $content)
-            ) {
-                $content = preg_replace(
-                    '/\\}\\s*$/',
-                    preg_replace('/\\?><\\?php(?:php)?(\s+\\?><\\?php(?:php)?)*/', '\\\\0', $childContent, 1),
-                    $content
-                );
-                $childContent = '';
-            }
+            $this->deduplicatePhpTags($commentPattern, $content, $childContent);
         }
 
         if (preg_match('/^\{% else/', $childContent)) {

tests/PugToTwigTest.php

@@ -89,7 +89,7 @@ public static function testConvert()
             '    block',
             'section',
             '  div: +foo()',
-            '    span bar'
+            '    span bar',
         ]));
 
         self::assertSame('<section><div><p>{{ myVar | e }}<span>bar</span></p></div></section>', $html);
@@ -102,7 +102,7 @@ public static function testConvert()
             '    div',
             '      block',
             '+foo()',
-            '  span bar'
+            '  span bar',
         ]));
 
         self::assertSame('{% if (true) %}<span>bar</span>{% else %}<div><span>bar</span></div>{% endif %}', $html);