Formatter: factoring out blockChildren()

Author: robocoder

src/Formatter.php

@@ -121,6 +121,18 @@ protected function blockSelectors($block)
             . $this->open . $this->break;
     }
 
+    /**
+     * Output block children
+     *
+     * @param \stdClass $block
+     */
+    protected function blockChildren($block)
+    {
+        foreach ($block->children as $child) {
+            $this->block($child);
+        }
+    }
+
     /**
      * Output non-empty block
      *
@@ -144,8 +156,8 @@ protected function block($block)
             $this->blockLines($block);
         }
 
-        foreach ($block->children as $child) {
-            $this->block($child);
+        if (! empty($block->children)) {
+            $this->blockChildren($block);
         }
 
         if (! empty($block->selectors)) {

src/Formatter/Debug.php

@@ -39,6 +39,12 @@ public function __construct()
      */
     protected function blockLines($block)
     {
+        if (empty($block->lines)) {
+            echo "block->lines: []\n";
+
+            return;
+        }
+
         foreach ($block->lines as $index => $line) {
             echo "block->lines[{$index}]: $line\n";
         }
@@ -49,6 +55,12 @@ protected function blockLines($block)
      */
     protected function blockSelectors($block)
     {
+        if (empty($block->selectors)) {
+            echo "block->selectors: []\n";
+
+            return;
+        }
+
         foreach ($block->selectors as $index => $selector) {
             echo "block->selectors[{$index}]: $selector\n";
         }
@@ -57,21 +69,29 @@ protected function blockSelectors($block)
     /**
      * {@inheritdoc}
      */
-    protected function block($block)
+    protected function blockChildren($block)
     {
-        echo "block->type: {$block->type}\n" .
-             "block->depth: {$block->depth}\n";
-
-        if (! empty($block->selectors)) {
-            $this->blockSelectors($block);
-        }
+        if (empty($block->children)) {
+            echo "block->children: []\n";
 
-        if (! empty($block->lines)) {
-            $this->blockLines($block);
+            return;
         }
 
         foreach ($block->children as $i => $child) {
             $this->block($child);
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function block($block)
+    {
+        echo "block->type: {$block->type}\n" .
+             "block->depth: {$block->depth}\n";
+
+        $this->blockSelectors($block);
+        $this->blockLines($block);
+        $this->blockChildren($block);
+    }
 }

src/Formatter/Nested.php

@@ -68,6 +68,28 @@ protected function blockSelectors($block)
             . $this->open . $this->break;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function blockChildren($block)
+    {
+        foreach ($block->children as $i => $child) {
+            $this->block($child);
+
+            if ($i < count($block->children) - 1) {
+                echo $this->break;
+
+                if (isset($block->children[$i + 1])) {
+                    $next = $block->children[$i + 1];
+
+                    if ($next->depth === max($block->depth, 1) && $child->depth >= $next->depth) {
+                        echo $this->break;
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -87,20 +109,8 @@ protected function block($block)
             $this->blockLines($block);
         }
 
-        foreach ($block->children as $i => $child) {
-            $this->block($child);
-
-            if ($i < count($block->children) - 1) {
-                echo $this->break;
-
-                if (isset($block->children[$i + 1])) {
-                    $next = $block->children[$i + 1];
-
-                    if ($next->depth === max($block->depth, 1) && $child->depth >= $next->depth) {
-                        echo $this->break;
-                    }
-                }
-            }
+        if (! empty($block->children)) {
+            $this->blockChildren($block);
         }
 
         if (! empty($block->selectors)) {