Skip to content

Commit

Permalink
[TASK] Use phpspreadsheet consistently
Browse files Browse the repository at this point in the history
- raise version numbers
- suggest the direct use of `phpoffice/phpspreadsheet` via composer
- suggest `EXT:base_excel` for legacy installations
- test for class existence of PhpSpreadSheet

Related: #1214
Related: #1208
  • Loading branch information
mschwemer committed Feb 20, 2025
1 parent 1ea1e43 commit 4a02f86
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Classes/Controller/AbstractController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
Expand Down Expand Up @@ -110,7 +109,7 @@ public function __construct(
$this->uploadService = $uploadService;
$this->eventDispatcher = $eventDispatcher;

$this->isPhpSpreadsheetInstalled = ExtensionManagementUtility::isLoaded('base_excel');
$this->isPhpSpreadsheetInstalled = class_exists(\PhpOffice\PhpSpreadsheet\IOFactory::class);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"ext-curl": "*"
},
"suggest": {
"sjbr/static-info-tables": "*",
"jambagecom/base-excel": "^v1.29.0"
"sjbr/static-info-tables": "Provides country information for the country field",
"phpoffice/phpspreadsheet": "Enables xlsx export via the powermail module"
},
"replace": {
"typo3-ter/powermail": "self.version"
Expand Down
1 change: 1 addition & 0 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'conflicts' => [
],
'suggests' => [
'base_excel' => '',
'static_info_tables' => ''
],
],
Expand Down

0 comments on commit 4a02f86

Please sign in to comment.