PHP 8.2 Update

Removed Port/Spreadsheet

Author: FBGER\dwinter

composer.json

@@ -20,17 +20,17 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0|^8.1",
+        "php": ">=8.2",
         "ext-zlib": "*",
         "doctrine/persistence": "^2.4|^3.0",
         "guzzlehttp/guzzle": "^7.5",
         "portphp/csv": "^2.0",
-        "portphp/spreadsheet": "^1.0",
-        "symfony/config": "^4.4|^5.0|^6.0",
-        "symfony/filesystem": "^4.4|^5.0|^6.0",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-        "symfony/string": "^4.4|^5.0|^6.0",
-        "webmozart/assert" : "^1.11"
+        "symfony/config": "^6.0",
+        "symfony/filesystem": "^6.0",
+        "symfony/framework-bundle": "^6.0",
+        "symfony/string": "^6.0",
+        "webmozart/assert" : "^1.11",
+        "phpoffice/phpspreadsheet": "^2.1"
     },
     "require-dev": {
         "fastbolt/test-helpers": "^0.1.1",

src/Reader/XlsxReader.php

@@ -8,13 +8,13 @@
 
 namespace Fastbolt\EntityImporter\Reader;
 
-use Port\Spreadsheet\SpreadsheetReader;
+use PhpOffice\PhpSpreadsheet\IOFactory;
 use SplFileObject;
 
 /**
  * @psalm-suppress PropertyNotSetInConstructor
  */
-class XlsxReader extends SpreadsheetReader implements ReaderInterface
+class XlsxReader implements ReaderInterface
 {
     /**
      * Faulty rows
@@ -23,21 +23,58 @@ class XlsxReader extends SpreadsheetReader implements ReaderInterface
      */
     protected ?array $errors = null;
 
+    /**
+     * @var array
+     */
+    protected array $columnHeaders;
+
+    /**
+     * Total number of rows
+     *
+     * @var int
+     */
+    protected int $count;
+
+    /**
+     * @var int|null
+     */
+    protected ?int $headerRowNumber = null;
+
+    /**
+     * @var int
+     */
+    protected int $pointer = 0;
+
+    /**
+     * @var array
+     */
+    protected array $worksheet;
+
     /**
      * @param SplFileObject     $file
      * @param array<int,string> $columnHeaders
      * @param ?int              $headerRowNumber
      */
     public function __construct(SplFileObject $file, array $columnHeaders, ?int $headerRowNumber)
     {
-        parent::__construct($file, $headerRowNumber);
+        $reader = IOFactory::createReaderForFile($file->getPathName());
+        $reader->setReadDataOnly(true);
+
+        $spreadsheet = $reader->load($file->getPathname());
+
+        $this->worksheet = $spreadsheet->getActiveSheet()->toArray();
 
         if (null !== $headerRowNumber) {
             $this->setHeaderRowNumber($headerRowNumber);
         }
         $this->setColumnHeaders($columnHeaders);
     }
 
+    public function setColumnHeaders(array $columnHeaders): void
+    {
+        $this->columnHeaders = $columnHeaders;
+    }
+
     /**
      * @inheritDoc
      */
@@ -61,4 +98,53 @@ public function getErrors(): array
         /** @psalm-var array<int,array<int,mixed>> */
         return $this->errors;
     }
+
+    public function current()
+    {
+        $row = $this->worksheet[$this->pointer];
+
+        // If the spreadsheet file has column headers, use them to construct an associative
+        // array for the columns in this line
+        if (!empty($this->columnHeaders) && count($this->columnHeaders) === count($row)) {
+            return array_combine(array_values($this->columnHeaders), $row);
+        }
+
+        // Else just return the column values
+        return $row;
+    }
+
+    public function setHeaderRowNumber(int $rowNumber): void
+    {
+        $this->headerRowNumber = $rowNumber;
+        $this->columnHeaders   = $this->worksheet[$rowNumber];
+    }
+
+    public function getColumnHeaders(): array
+    {
+        return $this->columnHeaders;
+    }
+
+    public function next(): void
+    {
+        $this->pointer++;
+    }
+
+    public function key(): mixed
+    {
+        return $this->pointer;
+    }
+
+    public function valid(): bool
+    {
+        return isset($this->worksheet[$this->pointer]);
+    }
+
+    public function rewind(): void
+    {
+        if (null === $this->headerRowNumber) {
+            $this->pointer = 0;
+        } else {
+            $this->pointer = $this->headerRowNumber + 1;
+        }
+    }
 }