Merge pull request #27 from josealbea/5.0

Working on PSR-7 compatibility for csv export

Author: moufmouf

composer.json

@@ -29,7 +29,7 @@
 		"mouf/utils.common.paginable-interface" : "~1.0",
 		"mouf/utils.common.conditioninterface" : "2.*",
 		"twig/twig" : "1.*@stable",
-		"php" : ">=5.4.0",
+		"php" : ">=7.0",
 		"mouf/javascript.historyjs" : "~1.8",
 		"mouf/html.htmlelement" : ">=2.0-dev,<3.0",
 		"mouf/utils.common.formatters" : "~3.0",

src/Mouf/Html/Widgets/EvoluGrid/EvoluGridResultSet.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Mouf\Html\Widgets\EvoluGrid;
 
 use Mouf\Utils\Value\ValueUtils;
@@ -21,6 +23,8 @@
 
 use Mouf\Utils\Action\ActionInterface;
 use Mouf\Utils\Common\SortableInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
 
 /**
  * This class represents the JSON result that can be sent to an evolugrid to display results.
@@ -196,8 +200,11 @@ public function run() {
 		if ($this->sortOrder == null && isset($_GET['sort_order']) && !empty($_GET['sort_order'])) {
 			$this->sortOrder = $_GET['sort_order'];
 		}
+		if ($this->format == null && isset($_GET['output']) && !empty($_GET['output'])) {
+			$this->format = $_GET['output'];
+		}
 
-		$this->output($this->format, $this->csvFilename);
+		return $this->getResponse($this->format, $this->csvFilename);
 	}
 
 	/**
@@ -208,7 +215,8 @@ public function run() {
 	 * @param string $filename
 	 * @throws \Exception
 	 */
-	public function output($format = null, $filename = "data.csv") {
+	public function getResponse($format = null, $filename = "data.csv") : Response
+	{
 		if ($format == null) {
 			$format = $this->format;
 			if ($format == null) {
@@ -304,17 +312,24 @@ public function output($format = null, $filename = "data.csv") {
 
 			$jsonMessage['descriptor'] = $descriptor;
             $jsonMessage['additionnalData'] = $this->additionnalData;
-			echo json_encode($jsonMessage);
+			return new Response\JsonResponse($jsonMessage);
 		} elseif ($format == self::FORMAT_CSV) {
 
-			header("Cache-Control: public");
-			header("Content-Description: File Transfer");
-			header("Content-Disposition: attachment; filename=$filename");
-			header("Content-Type: mime/type");
-			header("Content-Transfer-Encoding: binary");
-			$fp = fopen("php://output", "w");
+			$fp = fopen("php://temp", "w");
 
 			$this->outputCsv($fp);
+			rewind($fp);
+			$content = stream_get_contents($fp);
+
+			fclose($fp);
+
+			return new Response\HtmlResponse($content, 200, [
+				"Cache-Control" => "public",
+				"Content-Description" => "File Transfer",
+				"Content-Disposition" => "attachment; filename=$filename",
+				"Content-Type" => "mime/type",
+				"Content-Transfer-Encoding" => "binary"
+			]);
 		} else {
 			throw new \Exception(
 					"The output format '" . $format . "' is not supported");
@@ -324,6 +339,7 @@ public function output($format = null, $filename = "data.csv") {
 	public function saveCsv($filePath) {
 		$fp = fopen($filePath, "w");
 		$this->outputCsv($fp);
+		fclose($fp);
 	}
 
 	private function outputCsv($fp) {
@@ -380,7 +396,6 @@ function (EvoluColumnKeyInterface $elem) use ($row) {
 			fputcsv($fp, $columns, ";");
 		}
 
-		fclose($fp);
 	}
 
 	/**
@@ -397,7 +412,7 @@ public function getUrl() {
 	 *
 	 * @return array<SplashRoute>
 	 */
-	public function getUrlsList() {	
+	public function getUrlsList($instanceName) {
 		if ($this->url != null) {
 			$instanceName = MoufManager::getMoufManager()->findInstanceName($this);
 			$route = new SplashRoute($this->url, $instanceName, "run", null, "Ajax call by Evolugrid.");