fix xlsx import (#102)

* fix xlsx import

Author: jgrygierek

.github/workflows/code_style.yml

@@ -1,6 +1,12 @@
 name: Code Style
 
-on: [ push, pull_request ]
+on:
+    push:
+        branches:
+            - '**'
+    pull_request:
+        branches:
+            - master
 
 jobs:
     pre_job:
@@ -18,8 +24,7 @@ jobs:
     php-cs-fixer:
         name: PHP CS Fixer
         runs-on: ubuntu-latest
-        needs:
-            - pre_job
+        needs: pre_job
         if: needs.pre_job.outputs.should_skip != 'true'
 
         steps:

.github/workflows/tests.yml

@@ -1,6 +1,12 @@
 name: Tests
 
-on: [ push, pull_request ]
+on:
+    push:
+        branches:
+            - '**'
+    pull_request:
+        branches:
+            - master
 
 jobs:
     pre_job:
@@ -18,14 +24,13 @@ jobs:
     tests:
         runs-on: ubuntu-latest
         name: Tests
-        needs:
-            - pre_job
+        needs: pre_job
         if: needs.pre_job.outputs.should_skip != 'true'
 
         strategy:
             fail-fast: false
             matrix:
-                php-versions: [ '8.1', '8.3' ]
+                php-versions: [ '8.1', '8.4' ]
                 vendors-version: [ '--prefer-lowest', '' ]
 
         steps:
@@ -51,11 +56,11 @@ jobs:
                     restore-keys: ${{ runner.os }}-composer-
 
             -   name: Run composer with knplabs/doctrine-behaviors
-                if: matrix.vendors-version != '' ||  matrix.php-versions != '8.3'
+                if: matrix.vendors-version != '' ||  matrix.php-versions != '8.4'
                 run: COMPOSER_MEMORY_LIMIT=-1 composer require knplabs/doctrine-behaviors --no-progress ${{ matrix.vendors-version }} --optimize-autoloader
 
             -   name: Run composer without knplabs/doctrine-behaviors
-                if: matrix.vendors-version == '' &&  matrix.php-versions == '8.3'
+                if: matrix.vendors-version == '' &&  matrix.php-versions == '8.4'
                 run: COMPOSER_MEMORY_LIMIT=-1 composer update --no-progress ${{ matrix.vendors-version }} --optimize-autoloader
 
             -   name: Run tests

composer.json

@@ -25,7 +25,7 @@
         "php": ">=8.1.0",
         "doctrine/annotations": "^1.14|^2.0",
         "doctrine/orm": "^2.9|^3.2",
-        "phpoffice/phpspreadsheet": "^2.2.2",
+        "phpoffice/phpspreadsheet": "^3.6.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0",
         "symfony/doctrine-bridge": "^5.4|^6.0|^7.0",

src/Model/Matrix/MatrixFactory.php

@@ -8,6 +8,7 @@
 use JG\BatchEntityImportBundle\Service\CsvDelimiterDetector;
 use PhpOffice\PhpSpreadsheet\Reader\BaseReader;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class MatrixFactory
@@ -54,6 +55,8 @@ private static function getReader(UploadedFile $file): BaseReader
         if ($reader instanceof Csv) {
             $detectedDelimiter = (new CsvDelimiterDetector())->detect($file->getContent());
             $reader->setDelimiter($detectedDelimiter->value);
+        } elseif ($reader instanceof Xlsx) {
+            $reader->setIgnoreRowsWithNoCells(true);
         }
 
         return $reader;