wip #5414 @0.25

diff --git a/src/ExcelToArray.php b/src/ExcelToArray.php
index 385407083d702f7627de93ba8f725d2454e8e903..83e169a4f4f582516aa64ba77f0c58ccdfb7d371 100644 (file)
--- a/src/ExcelToArray.php
+++ b/src/ExcelToArray.php
@@ -4,6 +4,7 @@ namespace Cubist\Excel;
 
 use Cubist\Util\Files\Files;
 use Cubist\Util\Url;
+use Exception;
 use PhpOffice\PhpSpreadsheet\Reader\BaseReader;
 use PhpOffice\PhpSpreadsheet\Reader\Ods;
 use PhpOffice\PhpSpreadsheet\Reader\Xls;
@@ -39,7 +40,7 @@ class ExcelToArray
      */
     protected static function _loadFile($file)
     {
-        $reader = self::_reader();
+        $reader = self::_reader($file);
         return $reader->load($file);
     }
 
@@ -53,14 +54,14 @@ class ExcelToArray
         $e = explode('.', $file);
         $ext = array_pop($e);
         switch ($ext) {
-            case 'xlsx':
-                return new Xlsx();
             case 'xls':
                 return new Xls();
             case 'ods':
                 return new Ods();
+            case 'xlsx':
+            default:
+                return new Xlsx();
         }
-        throw new Exception('The file type ' . $ext . ' is not supported');
     }
 
     public static function excelToArrayRaw($file, $force = false)