Adds working prototype for SQL stacktrases @wip #51

madalinoprea · Mar 15, 2016 · d0e4485 · d0e4485
1 parent f62fb50
commit d0e4485
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/code/Debug/Model/Block.php b/code/Debug/Model/Block.php
@@ -53,7 +53,10 @@ public function init(Mage_Core_Block_Abstract $block)
     public function startRendering(Mage_Core_Block_Abstract $block)
     {
         if ($this->isRendering) {
-            throw new Exception("Block {$this->name} is already marked as rendered");
+            // Recursive block instances with same name is used - we don't update render start time
+            $this->renderedCount++;
+
+            return;
         }
 
         // Re-init data from block (some extension might update dynamically block's template)

diff --git a/code/Debug/Test/Model/Block.php b/code/Debug/Test/Model/Block.php
@@ -58,8 +58,6 @@ public function testInitWithoutTemplate()
 
 
     /**
-     * @expectedException Exception
-     * @expectedExceptionMessage is already marked as rendered
      */
     public function testStartRenderingTwice()
     {
@@ -75,8 +73,11 @@ public function testStartRenderingTwice()
         $this->assertNotNull($model->getRenderedAt());
         $this->assertNull($model->getRenderedCompletedAt());
         $this->assertEquals(0, $model->getRenderedDuration());
+        $initialRenderAt = $model->getRenderedAt();
 
         $model->startRendering($block);
+        $this->assertEquals(2, $model->getRenderedCount());
+        $this->assertEquals($initialRenderAt, $model->getRenderedAt());
     }