Skip to content

Commit 30f1984

Browse files
author
Vladimir Falcón Piva
committed
Merge branch 'release/2.0.0'
2 parents c84bc96 + 7e6fcbd commit 30f1984

61 files changed

Lines changed: 277 additions & 560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2026-03-05 [RELEASE] Release of bravo-handlebars-content 2.0.0 (Vladimir Falcón Piva)
2+
2026-02-11 2ef646f [TASK] Add #[Override] attribute to overridden methods (Vladimir Falcón Piva)
3+
2026-01-13 3cf1bc2 [FIX] Labels localization for handlebar templates. (Vladimir Falcón Piva)
4+
2026-01-12 3f42ee9 [FEATURE] Add configuration set for Bravo handlebars content (Vladimir Falcón Piva)
5+
2026-01-07 08e9fb0 [FIX] Fixed menuTargetVariableName in LanguageMenuProcessor (Vladimir Falcón Piva)
6+
2025-12-29 0385100 [FIX] Handle empty processed data in LanguageMenuProcessor (Vladimir Falcón Piva)
7+
2025-12-29 193fffe [TASK] Refactor sources to reach compatibility with TYPO3 v13 (Vladimir Falcón Piva)
8+
2025-12-23 a75803a [FIX] Remove custom Handlebars template content object (Vladimir Falcón Piva)
9+
2025-12-22 ff41135 Prepare packages for TYPO3 upgrade. (Vladimir Falcón Piva)
10+
111
2025-10-22 [RELEASE] Release of bravo-handlebars-content 1.5.1 (Vladimir Falcón Piva)
212
2025-10-22 e178531 Add HeaderSoftHyphen processor to handle soft hyphens in headers (Vladimir Falcón Piva)
313

Classes/Configuration/Extension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
*/
2222
final class Extension
2323
{
24-
public const KEY = SI::KEY;
24+
public const string KEY = SI::KEY;
2525

26-
public const NAME = SI::NAME;
26+
public const string NAME = SI::NAME;
2727

28-
public const VENDOR = SI::VENDOR_NAME;
28+
public const string VENDOR = SI::VENDOR_NAME;
2929
}

Classes/DataProcessing/CollectionDataProcessor.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ public function process(
104104
return $processedData;
105105
}
106106

107-
/**
108-
* @param mixed $variableName
109-
*/
110107
protected function assertValidVariableName(mixed $variableName): void
111108
{
112109
if (in_array($variableName, self::RESERVED_VARIABLE_NAMES, true)) {
@@ -124,7 +121,7 @@ protected function isContentObject(string $objectType): bool
124121
{
125122
try {
126123
$contentObject = $this->contentObjectRenderer->getContentObject($objectType);
127-
} catch (ContentRenderingException $e) {
124+
} catch (ContentRenderingException) {
128125
return false;
129126
}
130127

@@ -155,8 +152,7 @@ protected function getDataProcessor(string $objectType): DataProcessorInterface
155152
&& $this->container->has($objectType)) {
156153
try {
157154
$processor = $this->container->get($objectType);
158-
} catch (NotFoundExceptionInterface $e) {
159-
} catch (ContainerExceptionInterface $e) {
155+
} catch (NotFoundExceptionInterface|ContainerExceptionInterface) {
160156
}
161157
}
162158

Classes/DataProcessing/ContentObjectDataProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function process(
3838
$contentObjectsConf = $processorConfiguration['contentObjects.'] ?? [];
3939
$contentObjects = [];
4040
foreach ($contentObjectsConf as $theKey => $theValue) {
41-
if (!str_contains($theKey, '.')) {
41+
if (!str_contains((string)$theKey, '.')) {
4242
$conf = $contentObjectsConf[$theKey . '.'] ?? [];
4343
$contentObjects[$theKey] = $cObj->cObjGetSingle($theValue, $conf);
4444
}

Classes/DataProcessing/DatabaseQueryProcessor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*/
4040
class DatabaseQueryProcessor extends \TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
4141
{
42+
#[\Override]
4243
public function process(
4344
ContentObjectRenderer $cObj,
4445
array $contentObjectConfiguration,

Classes/DataProcessing/Dto/FieldProcessorConfiguration.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public function __construct(protected array $configuration = []) {}
1818

1919
/**
2020
* @param string $name field name
21-
*
22-
* @return array
2321
*/
2422
public function get(string $name): array
2523
{

Classes/DataProcessing/FieldAwareProcessorTrait.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ protected function assertValidFieldProcessorClass(string $processorClass): void
7070
}
7171

7272
/**
73-
* @param ContentObjectRenderer $cObj
74-
* @param array $processedData
7573
* @param mixed $data
7674
*
7775
* @throws InvalidClassException

Classes/DataProcessing/FieldMappingInterface.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ interface FieldMappingInterface
1515
{
1616
/**
1717
* Map given variables and returns resulting array
18-
*
19-
* @param array $variables
20-
*
21-
* @return array
2218
*/
2319
public function map(array $variables): array;
2420
}

Classes/DataProcessing/FieldProcessorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ interface FieldProcessorInterface
1717
* @param string $fieldName Field to processes
1818
* @param array $data Raw data (record)
1919
* @param array $variables Already processed variables. Will be returned by parent data processor.
20-
*
21-
* @return array
2220
*/
2321
public function process(string $fieldName, array $data, array $variables): array;
2422
}

Classes/DataProcessing/LanguageMenuProcessor.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323
class LanguageMenuProcessor extends \TYPO3\CMS\Frontend\DataProcessing\LanguageMenuProcessor
2424
{
25+
#[\Override]
2526
public function process(
2627
ContentObjectRenderer $cObj,
2728
array $contentObjectConfiguration,
@@ -30,10 +31,14 @@ public function process(
3031
): array {
3132
// Process menu
3233
$processedData = parent::process($cObj, $contentObjectConfiguration, $processorConfiguration, $processedData);
34+
$menuTargetVariableName = $this->getConfigurationValue('as');
35+
if (empty($processedData[$menuTargetVariableName])) {
36+
return $processedData;
37+
}
3338

34-
$processedData[$this->menuTargetVariableName] = $this->addMenuLevels($processedData[$this->menuTargetVariableName]);
39+
$processedData[$menuTargetVariableName] = $this->addMenuLevels($processedData[$menuTargetVariableName]);
3540

36-
$countAvailableLanguages = $this->countAvailableLanguages($processedData[$this->menuTargetVariableName]);
41+
$countAvailableLanguages = $this->countAvailableLanguages($processedData[$menuTargetVariableName]);
3742

3843
$processedData['available'] = $countAvailableLanguages > 1;
3944
$processedData['availableLanguagesCount'] = $countAvailableLanguages;

0 commit comments

Comments
 (0)