fixed return type of RendererInterface

Dominik Liebler · Dominik Liebler · commit acdef3f6e9fd · 2016-05-13T10:23:19.000+02:00
diff --git a/Structural/Decorator/RenderInJson.php b/Structural/Decorator/RenderInJson.php
@@ -10,12 +10,10 @@ class RenderInJson extends Decorator
     /**
      * render data as JSON.
      *
-     * @return mixed|string
+     * @return string
      */
     public function renderData()
     {
-        $output = $this->wrapped->renderData();
-
-        return json_encode($output);
+        return json_encode($this->wrapped->renderData());
     }
 }
diff --git a/Structural/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
@@ -10,17 +10,15 @@ class RenderInXml extends Decorator
     /**
      * render data as XML.
      *
-     * @return mixed|string
+     * @return string
      */
     public function renderData()
     {
-        $output = $this->wrapped->renderData();
-
         // do some fancy conversion to xml from array ...
 
         $doc = new \DOMDocument();
 
-        foreach ($output as $key => $val) {
+        foreach ($this->wrapped->renderData() as $key => $val) {
             $doc->appendChild($doc->createElement($key, $val));
         }
 
diff --git a/Structural/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
@@ -10,7 +10,7 @@ interface RendererInterface
     /**
      * render data.
      *
-     * @return mixed
+     * @return string
      */
     public function renderData();
 }

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,10 @@ class RenderInJson extends Decorator`
`10`	`10`	`/**`
`11`	`11`	`* render data as JSON.`
`12`	`12`	`*`
`13`		`- * @return mixed\|string`
	`13`	`+ * @return string`
`14`	`14`	`*/`
`15`	`15`	`public function renderData()`
`16`	`16`	`{`
`17`		`- $output = $this->wrapped->renderData();`
`18`		`-`
`19`		`- return json_encode($output);`
	`17`	`+ return json_encode($this->wrapped->renderData());`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,15 @@ class RenderInXml extends Decorator`
`10`	`10`	`/**`
`11`	`11`	`* render data as XML.`
`12`	`12`	`*`
`13`		`- * @return mixed\|string`
	`13`	`+ * @return string`
`14`	`14`	`*/`
`15`	`15`	`public function renderData()`
`16`	`16`	`{`
`17`		`- $output = $this->wrapped->renderData();`
`18`		`-`
`19`	`17`	`// do some fancy conversion to xml from array ...`
`20`	`18`
`21`	`19`	`$doc = new \DOMDocument();`
`22`	`20`
`23`		`- foreach ($output as $key => $val) {`
	`21`	`+ foreach ($this->wrapped->renderData() as $key => $val) {`
`24`	`22`	`$doc->appendChild($doc->createElement($key, $val));`
`25`	`23`	`}`
`26`	`24`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface RendererInterface`
`10`	`10`	`/**`
`11`	`11`	`* render data.`
`12`	`12`	`*`
`13`		`- * @return mixed`
	`13`	`+ * @return string`
`14`	`14`	`*/`
`15`	`15`	`public function renderData();`
`16`	`16`	`}`