Merge branch 'master' into powerkiki

Author: PowerKiKi

src/PhpSpreadsheet/Cell/Cell.php

@@ -450,12 +450,9 @@ public function getDataType(): string
      */
     public function setDataType($dataType): self
     {
-        if ($dataType == DataType::TYPE_STRING2) {
-            $dataType = DataType::TYPE_STRING;
-        }
-        $this->dataType = $dataType;
+        $this->setValueExplicit($this->value, $dataType);
 
-        return $this->updateInCollection();
+        return $this;
     }
 
     /**

src/PhpSpreadsheet/Reader/BaseReader.php

@@ -39,6 +39,7 @@ abstract class BaseReader implements IReader
     /**
      * Restrict which sheets should be loaded?
      * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+     * This property is ignored for Csv, Html, and Slk.
      *
      * @var null|string[]
      */
@@ -200,4 +201,39 @@ protected function openFile(string $filename): void
 
         $this->fileHandle = $fileHandle;
     }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     *
+     * @param string $filename
+     *
+     * @return array
+     */
+    public function listWorksheetInfo($filename)
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own listWorksheetInfo() method');
+    }
+
+    /**
+     * Returns names of the worksheets from a file,
+     * possibly without parsing the whole file to a Spreadsheet object.
+     * Readers will often have a more efficient method with which
+     * they can override this method.
+     *
+     * @param string $filename
+     *
+     * @return array
+     */
+    public function listWorksheetNames($filename)
+    {
+        $returnArray = [];
+        $info = $this->listWorksheetInfo($filename);
+        foreach ($info as $infoArray) {
+            if (isset($infoArray['worksheetName'])) {
+                $returnArray[] = $infoArray['worksheetName'];
+            }
+        }
+
+        return $returnArray;
+    }
 }

src/PhpSpreadsheet/Reader/Csv.php

@@ -10,6 +10,7 @@
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Csv extends BaseReader
 {
@@ -98,6 +99,9 @@ class Csv extends BaseReader
     /** @var bool */
     private $preserveNullString = false;
 
+    /** @var bool */
+    private $sheetNameIsFileName = false;
+
     /**
      * Create a new CSV Reader instance.
      */
@@ -212,8 +216,12 @@ protected function inferSeparator(): void
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     *
+     * @param string $filename
+     *
+     * @return array
      */
-    public function listWorksheetInfo(string $filename): array
+    public function listWorksheetInfo($filename)
     {
         // Open file
         $this->openFileOrMemory($filename);
@@ -373,6 +381,9 @@ private function loadStringOrFile(string $filename, Spreadsheet $spreadsheet, bo
             $spreadsheet->createSheet();
         }
         $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex);
+        if ($this->sheetNameIsFileName) {
+            $sheet->setTitle(substr(basename($filename, '.csv'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
+        }
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;
@@ -635,4 +646,11 @@ public function getPreserveNullString(): bool
     {
         return $this->preserveNullString;
     }
+
+    public function setSheetNameIsFileName(bool $sheetNameIsFileName): self
+    {
+        $this->sheetNameIsFileName = $sheetNameIsFileName;
+
+        return $this;
+    }
 }

src/PhpSpreadsheet/Reader/Html.php

@@ -1164,4 +1164,29 @@ private function setBorderStyle(Style $cellStyle, string $styleValue, string $ty
             ],
         ]);
     }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     *
+     * @param string $filename
+     *
+     * @return array
+     */
+    public function listWorksheetInfo($filename)
+    {
+        $info = [];
+        $spreadsheet = new Spreadsheet();
+        $this->loadIntoExisting($filename, $spreadsheet);
+        foreach ($spreadsheet->getAllSheets() as $sheet) {
+            $newEntry = ['worksheetName' => $sheet->getTitle()];
+            $newEntry['lastColumnLetter'] = $sheet->getHighestDataColumn();
+            $newEntry['lastColumnIndex'] = Coordinate::columnIndexFromString($sheet->getHighestDataColumn()) - 1;
+            $newEntry['totalRows'] = $sheet->getHighestDataRow();
+            $newEntry['totalColumns'] = $newEntry['lastColumnIndex'] + 1;
+            $info[] = $newEntry;
+        }
+        $spreadsheet->disconnectWorksheets();
+
+        return $info;
+    }
 }

src/PhpSpreadsheet/Reader/Ods.php

@@ -234,6 +234,7 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
 
         // Load into this instance
         return $this->loadIntoExisting($filename, $spreadsheet);
@@ -335,9 +336,7 @@ public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Sp
                 $worksheetStyleName = $worksheetDataSet->getAttributeNS($tableNs, 'style-name');
 
                 // Create sheet
-                if ($worksheetID > 0) {
-                    $spreadsheet->createSheet(); // First sheet is added by default
-                }
+                $spreadsheet->createSheet();
                 $spreadsheet->setActiveSheetIndex($worksheetID);
 
                 if ($worksheetName || is_numeric($worksheetName)) {

src/PhpSpreadsheet/Reader/Slk.php

@@ -165,7 +165,7 @@ public function listWorksheetInfo(string $filename): array
 
                             break;
                         case 'Y':
-                            $rowIndex = substr($rowDatum, 1);
+                            $rowIndex = (int) substr($rowDatum, 1);
 
                             break;
                     }

src/PhpSpreadsheet/Reader/Xls.php

@@ -416,6 +416,9 @@ class Xls extends BaseReader
      */
     private $baseCell;
 
+    /** @var bool */
+    private $activeSheetSet = false;
+
     /**
      * Create a new Xls Reader instance.
      */
@@ -820,6 +823,7 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
         }
 
         // Parse the individual sheets
+        $this->activeSheetSet = false;
         foreach ($this->sheets as $sheet) {
             if ($sheet['sheetType'] != 0x00) {
                 // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
@@ -1231,6 +1235,9 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                 }
             }
         }
+        if ($this->activeSheetSet === false) {
+            $this->spreadsheet->setActiveSheetIndex(0);
+        }
 
         // add the named ranges (defined names)
         foreach ($this->definedname as $definedName) {
@@ -4389,6 +4396,7 @@ private function readWindow2(): void
         $isActive = (bool) ((0x0400 & $options) >> 10);
         if ($isActive) {
             $this->spreadsheet->setActiveSheetIndex($this->spreadsheet->getIndex($this->phpSheet));
+            $this->activeSheetSet = true;
         }
 
         // bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view

src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php

@@ -19,9 +19,6 @@ public function __construct(Spreadsheet $spreadsheet)
      */
     public function viewSettings(SimpleXMLElement $xmlWorkbook, $mainNS, array $mapSheetId, bool $readDataOnly): void
     {
-        if ($this->spreadsheet->getSheetCount() == 0) {
-            $this->spreadsheet->createSheet();
-        }
         // Default active sheet index to the first loaded worksheet from the file
         $this->spreadsheet->setActiveSheetIndex(0);
 

tests/PhpSpreadsheetTests/Cell/DataType2Test.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class DataType2Test extends TestCase
+{
+    public function testSetDataType(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getCell('A1')->setValue(28.1);
+        self::assertSame(28.1, $sheet->getCell('A1')->getValue());
+        self::assertSame('28.1', (string) $sheet->getCell('A1'));
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_STRING);
+        self::assertSame('28.1', $sheet->getCell('A1')->getValue());
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_NUMERIC);
+        self::assertSame(28.1, $sheet->getCell('A1')->getValue());
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_STRING2);
+        self::assertSame('28.1', $sheet->getCell('A1')->getValue());
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_INLINE);
+        self::assertSame('28.1', $sheet->getCell('A1')->getValue());
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_BOOL);
+        self::assertTrue($sheet->getCell('A1')->getValue());
+        $sheet->getCell('A1')->setDataType(DataType::TYPE_NUMERIC);
+        self::assertSame(1, $sheet->getCell('A1')->getValue());
+
+        $sheet->getCell('A2')->setValue('X');
+
+        try {
+            $sheet->getCell('A2')->setDataType(DataType::TYPE_NUMERIC);
+        } catch (PhpSpreadsheetException $e) {
+            self::assertSame('Invalid numeric value for datatype Numeric', $e->getMessage());
+        }
+
+        $spreadsheet->disconnectWorksheets();
+    }
+}

tests/PhpSpreadsheetTests/Reader/BaseNoLoad.php

@@ -12,9 +12,4 @@ public function canRead(string $filename): bool
     {
         return $filename !== '';
     }
-
-    public function loadxxx(string $filename): void
-    {
-        $this->loadSpreadsheetFromFile($filename);
-    }
 }