Commit 015520cd authored by Jan Stockfisch's avatar Jan Stockfisch Committed by Frank Nägler
Browse files

[BUGFIX] AbstractSubModule implements ContentProviderInterface by default

Because all submodules must implement the interface anyway, it's now
implemented by default in the AbstractSubModule. Without implementing
an InvalidArgumentException is thrown.

Resolves: #88598
Releases: master,9.5
Change-Id: I72f764a5fca63d85fb501ddcecc27bfc849b63bb
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/61901


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
Reviewed-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
parent 58703507
......@@ -23,9 +23,8 @@ use TYPO3\CMS\Core\Localization\LanguageService;
*
* Extend this class when writing own sub modules
*/
abstract class AbstractSubModule implements ModuleInterface
abstract class AbstractSubModule implements ModuleInterface, ContentProviderInterface
{
/**
* Returns LanguageService
*
......
......@@ -19,7 +19,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\Debug;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\Log\InMemoryLogWriter;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\InitializableInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
......@@ -34,7 +33,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
*
* @internal
*/
class Log extends AbstractSubModule implements DataProviderInterface, ContentProviderInterface, ModuleSettingsProviderInterface, InitializableInterface
class Log extends AbstractSubModule implements DataProviderInterface, ModuleSettingsProviderInterface, InitializableInterface
{
protected $logLevel = LogLevel::INFO;
......
......@@ -19,7 +19,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\Debug;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\Log\DoctrineSqlLogger;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
use TYPO3\CMS\Core\Database\ConnectionPool;
......@@ -31,7 +30,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
*
* @internal
*/
class QueryInformation extends AbstractSubModule implements DataProviderInterface, ContentProviderInterface
class QueryInformation extends AbstractSubModule implements DataProviderInterface
{
/**
* Identifier for this Sub-module,
......
......@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\Info;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
use TYPO3\CMS\Core\Context\Context;
......@@ -34,7 +33,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
*
* @internal
*/
class GeneralInformation extends AbstractSubModule implements DataProviderInterface, ContentProviderInterface
class GeneralInformation extends AbstractSubModule implements DataProviderInterface
{
/**
* @inheritdoc
......
......@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\Info;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
use TYPO3\CMS\Core\Utility\GeneralUtility;
......@@ -29,7 +28,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
*
* @internal
*/
class PhpInformation extends AbstractSubModule implements DataProviderInterface, ContentProviderInterface
class PhpInformation extends AbstractSubModule implements DataProviderInterface
{
/**
* @inheritdoc
......
......@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\Info;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
use TYPO3\CMS\Core\Utility\GeneralUtility;
......@@ -29,7 +28,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
*
* @internal
*/
class RequestInformation extends AbstractSubModule implements DataProviderInterface, ContentProviderInterface
class RequestInformation extends AbstractSubModule implements DataProviderInterface
{
/**
* @inheritdoc
......
......@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Adminpanel\Modules\TsDebug;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\ContentProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\InitializableInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleSettingsProviderInterface;
......@@ -35,7 +34,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
*
* @internal
*/
class TypoScriptWaterfall extends AbstractSubModule implements InitializableInterface, ContentProviderInterface, ModuleSettingsProviderInterface
class TypoScriptWaterfall extends AbstractSubModule implements InitializableInterface, ModuleSettingsProviderInterface
{
/**
* @var ConfigurationService
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment