Merge branch '7.0' of git://github.com/thecodingmachine/mvc.splash-common into 7.0

Author: moufmouf

src/Mouf/Mvc/Splash/Controllers/Controller.php

@@ -94,13 +94,13 @@ public function getUrlsList($instanceName)
             if ($refMethod->hasAnnotation('Action')) {
                 $methodName = $refMethod->getName();
                 if ($methodName == 'index' || $methodName == 'defaultAction') {
-                    $url = $moufManager->findInstanceName($this).'/';
+                    $url = $instanceName.'/';
                 } else {
-                    $url = $moufManager->findInstanceName($this).'/'.$methodName;
+                    $url = $instanceName.'/'.$methodName;
                 }
                 $parameters = SplashUtils::mapParameters($refMethod);
                 $filters = FilterUtils::getFilters($refMethod, $this);
-                $urlsList[] = new SplashRoute($url, $moufManager->findInstanceName($this), $refMethod->getName(), $title, $refMethod->getDocCommentWithoutAnnotations(), $refMethod->getDocComment(), $this->getSupportedHttpMethods($refMethod), $parameters, $filters);
+                $urlsList[] = new SplashRoute($url, $instanceName, $refMethod->getName(), $title, $refMethod->getDocCommentWithoutAnnotations(), $refMethod->getDocComment(), $this->getSupportedHttpMethods($refMethod), $parameters, $filters);
             }
 
             // Now, let's check the "URL" annotation (note: we support multiple URL annotations for the same method)

src/Mouf/Mvc/Splash/HtmlResponse.php

@@ -18,6 +18,11 @@ class HtmlResponse extends Response
      */
     protected $htmlElement;
 
+    /**
+     * @var Stream
+     */
+    protected $stream;
+
     /**
      * Constructor.
      *
@@ -67,12 +72,15 @@ public function getHtmlElement()
      */
     public function getBody()
     {
-        ob_start();
-        $this->htmlElement->toHtml();
-        $content = ob_get_clean();
-        $stream = new Stream('php://memory', 'wb+');
-        $stream->write($content);
+        if ($this->stream === null) {
+            ob_start();
+            $this->htmlElement->toHtml();
+            $content = ob_get_clean();
+            $this->stream = new Stream('php://memory', 'wb+');
+            $this->stream->write($content);
+
+        }
 
-        return $stream;
+        return $this->stream;
     }
 }

src/Mouf/Mvc/Splash/Services/SplashUtils.php

@@ -146,7 +146,7 @@ public static function buildControllerResponse($callback, $mode = self::MODE_STR
         }
         $html = ob_get_clean();
 
-        if (!empty($html)) {
+        if (!empty($html) || $mode === self::MODE_WEAK) {
             if ($mode === self::MODE_WEAK) {
                 $code = http_response_code();
                 $headers = self::getResponseHeaders();