Skip to content

Commit 544cefb

Browse files
authored
Merge pull request #100 from b13/bugfix/issue-99
[BUGFIX] do not set ContentObjectRenderer in ContentObjects for v12
2 parents 0e93434 + 02b9d1b commit 544cefb

6 files changed

+1
-12
lines changed

Build/phpstan10.neon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ parameters:
66
- %currentWorkingDirectory%/Tests
77

88
ignoreErrors:
9-
-
10-
message: '#Call to an undefined method B13\\Menus\\ContentObject\\.*ContentObject::setContentObjectRenderer\(\).#'
11-
path: %currentWorkingDirectory%/Classes/ContentObject/*
129
-
1310
message: '#Property TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController::\$id \(string\) does not accept int#'
1411
path: %currentWorkingDirectory%/Tests/Functional/Compiler/LanguageMenuCompilerTest.php

Classes/ContentObject/BreadcrumbsContentObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public function __construct(ContentObjectRenderer $cObj)
2929
{
3030
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
3131
parent::__construct($cObj);
32-
} else {
33-
$this->setContentObjectRenderer($cObj);
3432
}
3533
$this->menuRepository = (GeneralUtility::makeInstance(ContentObjectServiceContainer::class))->getMenuRepository();
3634
}

Classes/ContentObject/LanguageMenuContentObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public function __construct(ContentObjectRenderer $cObj)
3030
{
3131
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
3232
parent::__construct($cObj);
33-
} else {
34-
$this->setContentObjectRenderer($cObj);
3533
}
3634
$this->languageMenuCompiler = (GeneralUtility::makeInstance(ContentObjectServiceContainer::class))->getLanguageMenuCompiler();
3735
}

Classes/ContentObject/ListMenuContentObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public function __construct(ContentObjectRenderer $cObj)
2929
{
3030
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
3131
parent::__construct($cObj);
32-
} else {
33-
$this->setContentObjectRenderer($cObj);
3432
}
3533
$this->listMenuCompiler = (GeneralUtility::makeInstance(ContentObjectServiceContainer::class))->getListMenuCompiler();
3634
}

Classes/ContentObject/TreeMenuContentObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public function __construct(ContentObjectRenderer $cObj)
2929
{
3030
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
3131
parent::__construct($cObj);
32-
} else {
33-
$this->setContentObjectRenderer($cObj);
3432
}
3533
$this->treeMenuCompiler = (GeneralUtility::makeInstance(ContentObjectServiceContainer::class))->getTreeMenuCompiler();
3634
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"typo3/cms-install": "^11.5",
1616
"typo3/coding-standards": "^0.5",
1717
"typo3/tailor": "^1.0",
18-
"typo3/testing-framework": "^7"
18+
"typo3/testing-framework": "7.0.2"
1919
},
2020
"config": {
2121
"vendor-dir": ".Build/vendor",

0 commit comments

Comments
 (0)