1793 kill liuggio

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": ">=5.3.3",
         "friendsofsymfony/user-bundle": "2.0.*|2.1.*",
-        "liuggio/excelbundle": "~2.0",
+        "phpoffice/phpspreadsheet": "^1.4",
         "symfony/config": "^2.7|^3.0|^4.0",
         "symfony/ldap": "^3.0|^4.0"
     },

src/FileFormat/ExcelConverter.php

@@ -2,40 +2,18 @@
 
 namespace CubeTools\CubeCommonBundle\FileFormat;
 
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * Helper for exporting html to excel file.
  */
 class ExcelConverter
 {
-    private $excelSrvc;
-
-    /**
-     * Create service.
-     *
-     * @param \Luiggio\ExcelBundle\Factory $excelService
-     */
-    public function setExcelService($excelService)
-    {
-        $this->excelSrvc = $excelService;
-    }
-
-    /**
-     *
-     * @return \Luiggio\ExcelBundle\Factory
-     */
-    public function getExcelService()
-    {
-        if (!isset($this->excelSrvc)) {
-            $this->excelSrvc = new \Liuggio\ExcelBundle\Factory();
-        }
-
-        return $this->excelSrvc;
-    }
-
     /**
      * Convert html to excel file.
      *
@@ -94,40 +72,47 @@ public function fromHtml($html, $selector = null)
 
         $tmpFile = $this->getTempHtmlFile($htmlStr); // as temporary file because it must have a filename
 
-        return $this->getExcelService()->createPHPExcelObject($tmpFile['path']);
+        return IOFactory::load($tmpFile['path']);
         // tmpfile is deleted automatically
     }
 
     /**
      * Create response with excel download.
      *
-     * @param \PHPExcel $xlObj       Excel object to create the download from
-     * @param string    $filename    filename to give to the download
-     * @param string    $format      format of write (like Excel2007)
-     * @param string    $contentType mime content type
+     * @param PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet Excel object to create the download from
+     * @param string                               $filename    filename to give to the download
+     * @param string                               $format      format of write (like Excel2007)
+     * @param string                               $contentType mime content type
      *
      * @return \Symfony\Component\HtmlFoundation\Response
      */
-    public function createResponse(\PHPExcel $xlObj, $filename, $format, $contentType)
+    public function createResponse(Spreadsheet $spreadsheet, $filename, $format, $contentType)
     {
-        return self::createExcelResponse($this->getExcelService(), $xlObj, $filename, $format, $contentType);
+        return self::createExcelResponse($spreadsheet, $filename, $format, $contentType);
     }
 
     /**
      * Create response with excel download.
      *
-     * @param Luiggio\ExcelBundle\Factory $excelSrvc
-     * @param \PHPExcel                   $xlObj       Excel object to create the download from
-     * @param string                      $filename    filename to give to the download
-     * @param string                      $format      format of write (like Excel2007)
-     * @param string                      $contentType mime content type
+     * @param PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet Excel object to create the download from
+     * @param string                               $filename    filename to give to the download
+     * @param string                               $writerType  format of write (like Excel2007)
+     * @param string                               $contentType mime content type
      *
      * @return \Symfony\Component\HtmlFoundation\Response
      */
-    public static function createExcelResponse($excelSrvc, \PHPExcel $xlObj, $filename, $format, $contentType)
+    public static function createExcelResponse(Spreadsheet $spreadsheet, $filename, $writerType, $contentType)
     {
-        $xlWr = $excelSrvc->createWriter($xlObj, $format);
-        $response = $excelSrvc->createStreamedResponse($xlWr);
+        $writer = IOFactory::createWriter($spreadsheet, $writerType);
+
+        $response = new StreamedResponse(
+            function () use ($writer) {
+                $writer->save('php://output');
+            },
+            200,
+            []
+        );
+
         $headers = $response->headers;
         $headers->set('Content-Type', $contentType.'; charset=utf-8');
         $headers->set('Content-Disposition', $headers->makeDisposition(

src/Resources/config/services.yml

@@ -48,9 +48,6 @@ services:
     cube_common.excel.converter:
         class: CubeTools\CubeCommonBundle\FileFormat\ExcelConverter
     CubeTools\CubeCommonBundle\FileFormat\ExcelConverter: '@cube_common.excel.converter'
-    cube_common.excel.reader:
-        class: CubeTools\CubeCommonBundle\FileFormat\ExcelReader
-    CubeTools\CubeCommonBundle\FileFormat\ExcelReader: '@cube_common.excel.reader'
     CubeTools\CubeCommonBundle\DataHandling\Logs\DataDogAudit:
         class: CubeTools\CubeCommonBundle\DataHandling\Logs\DataDogAudit
         arguments:

tests/FileFormat/ExcelConverterTest.php

@@ -16,14 +16,16 @@ public function testExportAll($data)
     {
         $h2e = $this->getService();
         $xlo = $h2e->fromHtml($data);
-        $this->assertInstanceOf('\PHPExcel', $xlo);
+        $this->assertInstanceOf('\PhpOffice\PhpSpreadsheet\Spreadsheet', $xlo);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testInvalidArg()
     {
         $h2e = $this->getService();
         $data = new self();
-        $this->expectException(\InvalidArgumentException::class);
         $h2e->fromHtml($data);
     }
 
@@ -43,7 +45,7 @@ public function testExportPart($data)
             // CssSelector not installed, but enough code checked
             return;
         }
-        $this->assertInstanceOf('\PHPExcel', $xlo);
+        $this->assertInstanceOf('\PhpOffice\PhpSpreadsheet\Spreadsheet', $xlo);
     }
 
     /**
@@ -52,7 +54,7 @@ public function testExportPart($data)
     public function testCreateResponse()
     {
         $fileName = 'anyName.xlsx';
-        $format = 'Excel2007';
+        $format = 'Xlsx';
         $contentType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
         $h2e = $this->getService();