Skip to content

Fix makeInstance DI for BackendConfigurationManager #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smirgol wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix makeInstance DI for BackendConfigurationManager #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions Classes/Utility/ConfigurationUtility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
namespace Pluswerk\MailLogger\Utility;

use Exception;
use ReflectionException;
use ReflectionMethod;
use RuntimeException;
use TYPO3\CMS\Core\TypoScript\TypoScriptService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager;
Expand All @@ -14,23 +17,49 @@ class ConfigurationUtility
/** @var array<array-key, mixed> */
protected static array $currentModuleConfiguration = [];

public function __construct(
private readonly BackendConfigurationManager $backendConfigurationManager,
private readonly TypoScriptService $typoScriptService
) {
}

/**
* @return array<array-key, mixed>
* @throws ReflectionException
*/
public static function getCurrentModuleConfiguration(string $key): array
{
return GeneralUtility::makeInstance(self::class)->getConfiguration($key);
}

/**
* @return array<array-key, mixed>
* @throws ReflectionException
*/
public function getConfiguration(string $key): array
{
if (!self::$currentModuleConfiguration) {
// we always use the BackendConfigurationManager, because flux is overwriting the ConfigurationManager and always uses the FrontendConfigurationManager instead of the correct one for the current context
$request = $GLOBALS['TYPO3_REQUEST'] ?? throw new Exception('No $GLOBALS[\'TYPO3_REQUEST\'] found', 1688138054);
$fullTypoScript = GeneralUtility::makeInstance(BackendConfigurationManager::class)->getTypoScriptSetup($request);
// we always use the BackendConfigurationManager, because flux is overwriting the ConfigurationManager
// and always uses the FrontendConfigurationManager instead of the correct one for the current context

$typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class);
// TYPO3 v13 requires $request parameter, v12 does not accept it
$reflection = new ReflectionMethod($this->backendConfigurationManager, 'getTypoScriptSetup');
if ($reflection->getNumberOfParameters() > 0) {
// v13: pass request parameter
$request = $GLOBALS['TYPO3_REQUEST'] ?? throw new Exception('No $GLOBALS[\'TYPO3_REQUEST\'] found', 1688138054);
/** @phpstan-ignore-next-line arguments.count - v13 compatibility */
$fullTypoScript = $this->backendConfigurationManager->getTypoScriptSetup($request);
} else {
// v12: no parameters
/** @phpstan-ignore-next-line arguments.count - v12 compatibility */
$fullTypoScript = $this->backendConfigurationManager->getTypoScriptSetup();
}

if (empty($fullTypoScript['module.']['tx_maillogger.'])) {
throw new Exception('Constants and setup TypoScript are not included!', 7780827935);
throw new RuntimeException('Constants and setup TypoScript are not included!', 7780827935);
}

self::$currentModuleConfiguration = $typoScriptService->convertTypoScriptArrayToPlainArray($fullTypoScript['module.']['tx_maillogger.']);
self::$currentModuleConfiguration = $this->typoScriptService->convertTypoScriptArrayToPlainArray($fullTypoScript['module.']['tx_maillogger.']);
}

return self::$currentModuleConfiguration[$key];
Expand Down