diff --git a/ChangeLog b/ChangeLog index 51351d05b..70f2e6515 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2019-03-09 Franz Holzinger + * compatibility for PHP 7.2 + 2019-02-20 Franz Holzinger * change hook tx_double6 into JambageCom\Div2007\Hooks\Evaluation\Double6 * new feature: error.configuration to show misconfiguration errors in the Front End diff --git a/composer.json b/composer.json index 938b334bc..41547760a 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ }, "replace": { "tt_products": "self.version", - "jambagecom/tt-products": "self.version" + "typo3-ter/tt-products": "self.version" }, "extra": { "typo3/cms": { diff --git a/model/class.tx_ttproducts_model_control.php b/model/class.tx_ttproducts_model_control.php index 8104b033a..c948394e7 100755 --- a/model/class.tx_ttproducts_model_control.php +++ b/model/class.tx_ttproducts_model_control.php @@ -188,10 +188,10 @@ public static function getControlArray () { public static function getTableConfArrays ( $cObj, - $functableArray, + array $functableArray, $theCode, - &$tableConfArray, - &$viewConfArray + array &$tableConfArray, + array &$viewConfArray ) { $tablesObj = t3lib_div::makeInstance('tx_ttproducts_tables'); diff --git a/model/class.tx_ttproducts_pid_list.php b/model/class.tx_ttproducts_pid_list.php index ce583462c..127027fbc 100755 --- a/model/class.tx_ttproducts_pid_list.php +++ b/model/class.tx_ttproducts_pid_list.php @@ -91,9 +91,10 @@ function setPageArray () { $this->pageArray = array_flip($this->pageArray); } - - function getPageArray ($pid=0) { - if ($pid) { + function getPageArray ($pid = 0) { + if ( + $pid + ) { $rc = isset($this->pageArray[$pid]); } else { $rc = $this->pageArray; diff --git a/model/class.tx_ttproducts_variant.php b/model/class.tx_ttproducts_variant.php index fe7fdd266..83a5836d6 100755 --- a/model/class.tx_ttproducts_variant.php +++ b/model/class.tx_ttproducts_variant.php @@ -14,8 +14,7 @@ * The GNU General Public License can be found at * http://www.gnu.org/copyleft/gpl.html. * A copy is found in the textfile GPL.txt and important notices to the license -* from the author is found in LICENSE.txt distributed with these scripts. -// * +* from the author is found in LICENSE.txt distributed with these scripts. * * This script is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -307,6 +306,7 @@ public function getVariantValuesByArticle ($articleRowArray, $productRow, $withS // the article rows must be in the correct order already public function filterArticleRowsByVariant ($row, $variant, $articleRowArray, $bCombined=FALSE) { + $rc = array(); $variantRowArray = $this->getVariantValuesByArticle($articleRowArray, $row, FALSE); foreach ($variantRowArray as $field => $valueArray) { if ($row[$field] != '') { diff --git a/view/class.tx_ttproducts_catlist_view_base.php b/view/class.tx_ttproducts_catlist_view_base.php index 0e10a393c..09c1cfe41 100755 --- a/view/class.tx_ttproducts_catlist_view_base.php +++ b/view/class.tx_ttproducts_catlist_view_base.php @@ -2,7 +2,7 @@ /*************************************************************** * Copyright notice * -* (c) 2006-2011 Franz Holzinger (franz@ttproducts.de) +* (c) 2006-2019 Franz Holzinger (franz@ttproducts.de) * All rights reserved * * This script is part of the TYPO3 project. The TYPO3 project is @@ -40,19 +40,19 @@ abstract class tx_ttproducts_catlist_view_base implements t3lib_Singleton { - var $pibase; // reference to object of pibase + protected $pibase; // reference to object of pibase public $pibaseClass; public $cObj; - var $conf; - var $config; - var $pidListObj; // pid where to go - var $subpartmarkerObj; // marker functions - var $urlObj; // url functions - var $htmlTagMain = ''; // main HTML tag - var $htmlTagElement = ''; // HTML tag element - var $htmlPartsMarkers = array('###ITEM_SINGLE_PRE_HTML###', '###ITEM_SINGLE_POST_HTML###'); - var $tableConfArray = array(); - var $viewConfArray; + public $conf; + public $config; + public $pidListObj; // pid where to go + public $subpartmarkerObj; // marker functions + public $urlObj; // url functions + public $htmlTagMain = ''; // main HTML tag + public $htmlTagElement = ''; // HTML tag element + public $htmlPartsMarkers = array('###ITEM_SINGLE_PRE_HTML###', '###ITEM_SINGLE_POST_HTML###'); + public $tableConfArray = array(); + public $viewConfArray = array; private $tMarkers; // all markers which are found in the template subpart for the whole view $t['listFrameWork'] @@ -301,6 +301,7 @@ protected function getPrintViewArrays ( $functableArray = array($functablename); $tableConfArray = array(); + $viewConfArray = array(); $searchVars = $pibaseObj->piVars[tx_ttproducts_model_control::getSearchboxVar()]; tx_ttproducts_model_control::getTableConfArrays( $pibaseObj->cObj, diff --git a/view/class.tx_ttproducts_list_view.php b/view/class.tx_ttproducts_list_view.php index f29d43070..21523411e 100755 --- a/view/class.tx_ttproducts_list_view.php +++ b/view/class.tx_ttproducts_list_view.php @@ -239,7 +239,7 @@ protected function getDisplayInfo ( } - public function &getBrowserConf ($tableConfArray) { + public function &getBrowserConf (array $tableConfArray) { $browserConf = ''; if (isset($tableConfArray['view.']) && $tableConfArray['view.']['browser'] == 'div2007') {