瀏覽代碼

Fixing removed renderWidget call - ref: http://goo.gl/NssCh

Stefano Sala 13 年之前
父節點
當前提交
5abe0dbb0e
共有 2 個文件被更改,包括 22 次插入22 次删除
  1. 2 2
      Controller/HelperController.php
  2. 20 20
      Tests/Controller/AdminHelperTest.php

+ 2 - 2
Controller/HelperController.php

@@ -91,7 +91,7 @@ class HelperController
         $extension->initRuntime($this->twig);
         $extension->renderer->setTheme($view, $admin->getFormTheme());
 
-        return new Response($extension->renderer->renderWidget($view));
+        return new Response($extension->renderer->searchAndRenderBlock($view, 'widget'));
     }
 
     /**
@@ -138,7 +138,7 @@ class HelperController
         $extension->initRuntime($this->twig);
         $extension->renderer->setTheme($view, $admin->getFormTheme());
 
-        return new Response($extension->renderer->renderWidget($view));
+        return new Response($extension->renderer->searchAndRenderBlock($view, 'widget'));
     }
 
     /**

+ 20 - 20
Tests/Controller/AdminHelperTest.php

@@ -187,8 +187,8 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
         $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');
         $modelManager->expects($this->once())->method('find')->will($this->returnValue($object));
 
-        $mockTheme = $this->getMockBuilder('Symfony\Component\Form\FormView')
-            ->disableOriginalConstructor()
+        $mockTheme = $this->getMockBuilder('Symfony\Component\Form\FormView')
+            ->disableOriginalConstructor()
             ->getMock();
 
         $admin = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
@@ -203,15 +203,15 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
         $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
             ->disableOriginalConstructor()
             ->getMock();
-
-        $mockRenderer->expects($this->once())
-            ->method('renderWidget')
+
+        $mockRenderer->expects($this->once())
+            ->method('searchAndRenderBlock')
             ->will($this->returnValue(new Response));
 
         $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName'));
 
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
-        $formExtension->expects($this->never())->method('renderWidget');
+        $formExtension->expects($this->never())->method('searchAndRenderBlock');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->renderer = $mockRenderer;
 
@@ -257,16 +257,16 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
 
         $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');
         $modelManager->expects($this->once())->method('find')->will($this->returnValue($object));
-
-        $mockView = $this->getMockBuilder('Symfony\Component\Form\FormView')
-            ->disableOriginalConstructor()
+
+        $mockView = $this->getMockBuilder('Symfony\Component\Form\FormView')
+            ->disableOriginalConstructor()
             ->getMock();
-
-        $mockForm = $this->getMockBuilder('Symfony\Component\Form\Form')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $mockForm->expects($this->once())
-            ->method('createView')
+
+        $mockForm = $this->getMockBuilder('Symfony\Component\Form\Form')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockForm->expects($this->once())
+            ->method('createView')
             ->will($this->returnValue($mockView));
 
         $formBuilder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
@@ -281,17 +281,17 @@ class AdminHelperTest extends \PHPUnit_Framework_TestCase
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container->expects($this->any())->method('get')->will($this->returnValue($admin));
 
-        $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
-            ->disableOriginalConstructor()
+        $mockRenderer = $this->getMockBuilder('Symfony\Bridge\Twig\Form\TwigRendererInterface')
+            ->disableOriginalConstructor()
             ->getMock();
 
         $mockRenderer->expects($this->once())
-            ->method('renderWidget')
-            ->will($this->returnValue(new Response));
+            ->method('searchAndRenderBlock')
+            ->will($this->returnValue(new Response));
 
         $formExtension = $this->getMock('Twig_ExtensionInterface', array('renderListElement', 'initRuntime', 'getTokenParsers', 'getNodeVisitors', 'getFilters', 'getTests', 'getFunctions', 'getOperators', 'getGlobals', 'getName'));
         $formExtension->expects($this->once())->method('getName')->will($this->returnValue('form'));
-        $formExtension->expects($this->never())->method('renderWidget');
+        $formExtension->expects($this->never())->method('searchAndRenderBlock');
         $formExtension->expects($this->never())->method('setTheme');
         $formExtension->renderer = $mockRenderer;