Skip to content

Commit

Permalink
Merge pull request #155 from xerc/master
Browse files Browse the repository at this point in the history
[FIX] wrap coalescing
  • Loading branch information
lochmueller authored Nov 6, 2024
2 parents 15ddd4a + ceec6fb commit 4c8d1bd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Classes/Middleware/AbstractMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected function responseIsAlterable(ResponseInterface $response): bool
return false;
}

if (!$GLOBALS['TSFE'] instanceof TypoScriptFrontendController) { // need for configuration
if (!$GLOBALS['TSFE'] instanceof TypoScriptFrontendController) { // need for configuration
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion Classes/Resource/SvgFileRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function findAllByStorageUids(array $storageUids): \Traversable
),
$queryBuilder->expr()->lt(
'sys_file.size',
$queryBuilder->createNamedParameter((int) $GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'] ?? null, \TYPO3\CMS\Core\Database\Connection::PARAM_INT)
$queryBuilder->createNamedParameter((int) ($GLOBALS['TSFE']->config['config']['svgstore.']['fileSize'] ?? null), \TYPO3\CMS\Core\Database\Connection::PARAM_INT)
),
$queryBuilder->expr()->eq(
'sys_file.mime_type',
Expand Down
2 changes: 1 addition & 1 deletion Classes/Service/RegExRepService.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function process(string $html): string
}

if (preg_match_all('/"([\w\-]+)\.";/', serialize(array_keys($config[$section])), $matches)) {
$cObj ??= $GLOBALS['TSFE']->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj ??= ($GLOBALS['TSFE']->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class));

foreach ($matches[1] as $key) {
$config[$section][$key] = $cObj
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

## Version

#### >= 5.2.2
#### >= 5.2.5
https://github.com/lochmueller/sourceopt/blob/173f7bd2a44b546844961ced1f0831371badd620/composer.json#L8-L9

#### <= 5.2.0 (legacy)
Expand Down

0 comments on commit 4c8d1bd

Please sign in to comment.