symfony · jakzal · Oct 18, 2015 · jakzal · Oct 19, 2015 · jakzal
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -64,6 +64,10 @@ public function __construct(SurrogateInterface $surrogate = null, FragmentRender
    public function render($uri, Request $request, array $options = array())
    {
        if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
+            if ($uri instanceof ControllerReference) {
+                $this->checkNonScalar($uri->attributes);
+            }
+
            return $this->inlineStrategy->render($uri, $request, $options);
        }


diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -77,7 +77,10 @@ protected function generateFragmentUri(ControllerReference $reference, Request $
        return $request->getBaseUrl().$path;
    }

-    private function checkNonScalar($values)
+    /**
+     * @internal
+     */
+    protected function checkNonScalar(array $values)
    {
        foreach ($values as $key => $value) {
            if (is_array($value)) {

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -90,6 +90,20 @@ public function testRenderAltControllerReferenceWithoutSignerThrowsException()
        $strategy->render('/', $request, array('alt' => new ControllerReference('alt_controller')));
    }

+    /**
+     * @expectedException \LogicException
+     */
+    public function testRenderFallbackWithObjectAttributesThrowsException()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(), new UriSigner('foo'));
+
+        $request = Request::create('/');
+
+        $reference = new ControllerReference('main_controller', array('foo' => new \stdClass()), array());
+
+        $strategy->render($reference, $request);
+    }
+
    private function getInlineStrategy($called = false)
    {
        $inline = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer')->disableOriginalConstructor()->getMock();
-Original file line number
+Diff line change
@@ -64,6 +64,10 @@ public function __construct(SurrogateInterface $surrogate = null, FragmentRender
         public function render($uri, Request $request, array $options = array())
         {
             if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
+                if ($uri instanceof ControllerReference) {
+                    $this->checkNonScalar($uri->attributes);
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            jakzal
  

      

      

      


        Oct 19, 2015


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Instead of making checkNonScalar() protected in order to call it here, we could generate the uri instead:
if ($uri instanceof ControllerReference) {
    $uri = $this->generateFragmentUri($uri, $request, false, true);
}

return $this->inlineStrategy->render($uri, $request, $options);
This way, however, _locale and _format might not be passed properly as the following code in the InlineFragmentRenderer wouldn't be called:
foreach (array('_format', '_locale') as $key) {
    if (isset($attributes[$key])) {
        $reference->attributes[$key] = $attributes[$key];
    }
}
I'm not sure if this is an issue. Perhaps it'd actually be good, if we're trying to make the dev/non-dev behaviour consistent for surrogate renderers.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            jakzal
  

      

      

      


        Dec 30, 2015


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Any thoughts on this?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            xabbuh
  

      

      

      


        Jan 2, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I prefer your current solution. This looks good to me.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+                }
                 return $this->inlineStrategy->render($uri, $request, $options);
             }
-          Expand Down