From b5af54d78e69002151d598e7ab31dd62eab03a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Scho=CC=88ne?= Date: Mon, 29 Jul 2019 16:07:15 +0200 Subject: [PATCH 1/2] Avoid PHP warning due to using undefined constant instead of string as array key --- .../Domain/Configuration/Renderer/RendererConfigFactory.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/Domain/Configuration/Renderer/RendererConfigFactory.php b/Classes/Domain/Configuration/Renderer/RendererConfigFactory.php index bee196041..644a567ea 100755 --- a/Classes/Domain/Configuration/Renderer/RendererConfigFactory.php +++ b/Classes/Domain/Configuration/Renderer/RendererConfigFactory.php @@ -28,8 +28,8 @@ /** * Class implements a factory for renderer configurations - * - * @author Daniel Lienet + * + * @author Daniel Lienet * @package Domain * @subpackage Configuration\Renderer * @see Tx_PtExtlist_Tests_Domain_Configuration_Renderer_RendererConfigFactoryTest @@ -45,7 +45,7 @@ class Tx_PtExtlist_Domain_Configuration_Renderer_RendererConfigFactory */ public static function getRendererConfiguration(Tx_PtExtlist_Domain_Configuration_ConfigurationBuilder $configurationBuilder, $rendererSettings) { - Tx_PtExtbase_Assertions_Assert::isArray($rendererSettings, [message => 'No renderer settings found. 1281087488']); + Tx_PtExtbase_Assertions_Assert::isArray($rendererSettings, ['message' => 'No renderer settings found. 1281087488']); $config = new Tx_PtExtlist_Domain_Configuration_Renderer_RendererConfig($configurationBuilder, $rendererSettings); return $config; } From c3ff3b386d58cf74fb78ccf6bba749146e52b9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Scho=CC=88ne?= Date: Mon, 29 Jul 2019 16:13:58 +0200 Subject: [PATCH 2/2] Avoid PHP warning due to using undefined constant instead of string as array key --- Classes/Domain/Renderer/Default/Renderer.php | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Classes/Domain/Renderer/Default/Renderer.php b/Classes/Domain/Renderer/Default/Renderer.php index f69c9a849..c9c98e1c3 100755 --- a/Classes/Domain/Renderer/Default/Renderer.php +++ b/Classes/Domain/Renderer/Default/Renderer.php @@ -28,7 +28,7 @@ /** * Default renderer for list data - * + * * @package Domain * @subpackage Renderer\Default * @author Daniel Lienert @@ -43,26 +43,26 @@ class Tx_PtExtlist_Domain_Renderer_Default_Renderer extends Tx_PtExtlist_Domain_ * @var Tx_PtExtlist_Domain_Renderer_Strategy_CellRenderingStrategyInterface */ protected $cellRenderer; - - - + + + /** * The strategy for rendering captions. * * @var Tx_PtExtlist_Domain_Renderer_Strategy_CaptionRenderingStrategyInterface */ protected $captionRenderer; - - - + + + /** * Holds an instance of a row renderer * * @var Tx_PtExtlist_Domain_Renderer_Default_RowRenderer */ protected $rowRenderer; - - + + /** * Injector for configuration @@ -76,9 +76,9 @@ public function _injectConfiguration(Tx_PtExtlist_Domain_Configuration_Renderer_ $this->initRowRenderer(); $this->initCaptionRenderer(); } - - - + + + /** * Initializes the row renderer */ @@ -88,8 +88,8 @@ protected function initRowRenderer() $this->rowRenderer->injectRendererConfiguration($this->rendererConfiguration); $this->rowRenderer->injectCellRenderer(new Tx_PtExtlist_Domain_Renderer_Default_CellRenderer($this->rendererConfiguration)); } - - + + /** * Initializes the caption renderer @@ -98,9 +98,9 @@ protected function initCaptionRenderer() { $this->captionRenderer = new Tx_PtExtlist_Domain_Renderer_Default_CaptionRenderer(); } - - + + /** * @see Classes/Domain/Renderer/Tx_PtExtlist_Domain_Renderer_RendererInterface::renderCaptions() */ @@ -108,9 +108,9 @@ public function renderCaptions(Tx_PtExtlist_Domain_Model_List_Header_ListHeader { return $this->captionRenderer->renderCaptions($listHeader); } - - - + + + /** * Renders list data * @@ -119,7 +119,7 @@ public function renderCaptions(Tx_PtExtlist_Domain_Model_List_Header_ListHeader */ public function renderList(Tx_PtExtlist_Domain_Model_List_ListData $listData) { - Tx_PtExtbase_Assertions_Assert::isNotNull($listData, [message => 'No list data found in list. 1280405145']); + Tx_PtExtbase_Assertions_Assert::isNotNull($listData, ['message' => 'No list data found in list. 1280405145']); // We could get another type of list data here, so we have to instantiate this class $listDataClassName = get_class($listData); @@ -136,7 +136,7 @@ public function renderList(Tx_PtExtlist_Domain_Model_List_ListData $listData) } unset($listData); - + return $renderedList; } @@ -153,7 +153,7 @@ public function renderSingleRow(Tx_PtExtlist_Domain_Model_List_Row $row, $rowInd } - + /** * Returns a rendered aggregate list for a given row of aggregates * @@ -165,9 +165,9 @@ public function renderAggregateList(Tx_PtExtlist_Domain_Model_List_ListData $agg if ($aggregateListData->count() == 0) { return $aggregateListData; } - + $renderedAggregateList = new Tx_PtExtlist_Domain_Model_List_ListData(); - + $aggregateRowsConfiguration = $this->rendererConfiguration->getConfigurationBuilder()->buildAggregateRowsConfig(); $aggregateDataRow = $aggregateListData->getItemByIndex(0);