* compatibility for PHP 7.2

* compatibility with MySQL strict mode
franzholz · Mar 25, 2019 · 010601e · 010601e
1 parent b7d8ee4
commit 010601e
Show file tree

Hide file tree

Showing 153 changed files with 1,628 additions and 1,954 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
-2019-03-09 Franz Holzinger <[email protected]>
+2019-03-25 Franz Holzinger <[email protected]>
     * compatibility for PHP 7.2
+    * compatibility with MySQL strict mode
 
 2019-02-20 Franz Holzinger <[email protected]>
     * change hook tx_double6 into JambageCom\Div2007\Hooks\Evaluation\Double6
@@ -598,7 +599,7 @@
 	* tt_address table can be used for manufacturer with the new address field of tt_products
 
 2007-02-09 Franz Holzinger <[email protected]>
-	* fix bug 4940: $TSFE->reqCHash() must not be called. The new parameter useCacheHash must be passed to all link functions in the fh_library 0.0.16.
+	* fix bug 4940: $GLOBALS['TSFE']->reqCHash() must not be called. The new parameter useCacheHash must be passed to all link functions in the fh_library 0.0.16.
 
 2007-01-16 Franz Holzinger <[email protected]>
 	* fix CSS issue: check the recs array for $this->infoArray in lib/class.tx_ttproducts_address.php

diff --git a/Classes/Hooks/StatusProvider.php b/Classes/Hooks/StatusProvider.php
@@ -17,7 +17,7 @@
 use JambageCom\Div2007\Utility\StatusUtility;
 
 /**
- * Hook into the backend module "Reports" checking the configuration required for agency
+ * Hook into the backend module "Reports" checking the configuration required for tt_products
  */
 class StatusProvider extends \JambageCom\Div2007\Base\StatusProviderBase
 {
@@ -32,7 +32,7 @@ class StatusProvider extends \JambageCom\Div2007\Base\StatusProviderBase
     protected $extensionName = 'Shop System (' . TT_PRODUCTS_EXT . ')';
 
     public function getGlobalVariables () {
-        $result = null;
+        $result = '';
 
         if (
             (

diff --git a/Configuration/TCA/Overrides/fe_users.php b/Configuration/TCA/Overrides/fe_users.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined ('TYPO3_MODE')) {
-	die ('Access denied.');
-}
+defined('TYPO3_MODE') || die('Access denied.');
 
 $temporaryColumns = array (
 	'tt_products_memoItems' => array (
@@ -13,7 +10,7 @@
 			'size' => '50',
 			'max' => '256',
 			'eval' => 'null',
-			'default' => NULL,
+			'default' => ''
 		)
 	),
 	'tt_products_memodam' => array (
@@ -24,7 +21,7 @@
 			'size' => '50',
 			'max' => '256',
 			'eval' => 'null',
-			'default' => NULL,
+			'default' => '',
 		)
 	),
 	'tt_products_discount' => array (
@@ -50,6 +47,7 @@
 			'size' => '5',
 			'max' => '20',
 			'eval' => 'trim,integer',
+			'default' => 0
 		)
 	),
 	'tt_products_vouchercode' => array (
@@ -58,7 +56,8 @@
 		'config' => array (
 			'type' => 'input',
 			'size' => '20',
-			'max' => '256'
+			'max' => '256',
+			'default' => ''
 		)
 	),
 	'tt_products_vat' => array (
@@ -82,6 +81,7 @@
 			),
 			'size' => 1,
 			'maxitems' => 1,
+			'default' => 0
 		)
 	),
 	'tt_products_organisation_form' => array (
@@ -121,6 +121,7 @@
 			),
 			'size' => 1,
 			'maxitems' => 1,
+			'default' => 'U'
 		)
 	),
 );

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined ('TYPO3_MODE')) {
-	die ('Access denied.');
-}
+defined('TYPO3_MODE') || die('Access denied.');
 
 $imageFile = PATH_TTPRODUCTS_ICON_TABLE_REL . 'tt_products.gif';
 
@@ -12,10 +9,10 @@
     // add folder icon
     $pageType = 'ttpproduct';
 
-    $addToModuleSelection = TRUE;
+    $addToModuleSelection = true;
     foreach ($GLOBALS['TCA']['pages']['columns']['module']['config']['items'] as $item) {
         if ($item['1'] == $pageType) {
-            $addToModuleSelection = FALSE;
+            $addToModuleSelection = false;
             break;
         }
     }
@@ -57,10 +54,10 @@ class_exists($callingClassName) &&
         );
     }
 
-    $addToModuleSelection = TRUE;
+    $addToModuleSelection = true;
     foreach ($GLOBALS['TCA']['pages']['columns']['module']['config']['items'] as $item) {
         if ($item['1'] == $pageType) {
-            $addToModuleSelection = FALSE;
+            $addToModuleSelection = false;
             continue;
         }
     }

diff --git a/Configuration/TCA/Overrides/pages_language_overlay.php b/Configuration/TCA/Overrides/pages_language_overlay.php
@@ -1,9 +1,5 @@
 <?php
-
-if (!defined ('TYPO3_MODE')) {
-	die ('Access denied.');
-}
-
+defined('TYPO3_MODE') || die('Access denied.');
 
 $table = 'pages_language_overlay';
 

diff --git a/Configuration/TCA/Overrides/sys_products_cards.php b/Configuration/TCA/Overrides/sys_products_cards.php
@@ -1,7 +1,5 @@
 <?php
-if (!defined ('TYPO3_MODE')) {
-	die ('Access denied.');
-}
+defined('TYPO3_MODE') || die('Access denied.');
 
 $table = 'sys_products_cards';
 

diff --git a/Configuration/TCA/Overrides/sys_products_orders.php b/Configuration/TCA/Overrides/sys_products_orders.php
@@ -1,8 +1,5 @@
 <?php
-
-if (!defined ('TYPO3_MODE')) {
-    die ('Access denied.');
-}
+defined('TYPO3_MODE') || die('Access denied.');
 
 $table = 'sys_products_orders';
 

diff --git a/Configuration/TCA/Overrides/tt_products.php b/Configuration/TCA/Overrides/tt_products.php
@@ -1,11 +1,8 @@
 <?php
-
-if (!defined ('TYPO3_MODE')) {
-	die ('Access denied.');
-}
+defined('TYPO3_MODE') || die('Access denied.');
 
 $table = 'tt_products';
-$bSelectTaxMode = FALSE;
+$bSelectTaxMode = false;
 
 if (
     version_compare(TYPO3_version, '8.7.0', '<')
@@ -20,81 +17,81 @@
 
 if (
     defined('STATIC_INFO_TABLES_TAXES_EXT') &&
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded(STATIC_INFO_TABLES_TAXES_EXT)
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded(STATIC_INFO_TABLES_TAXES_EXT)
 ) {
-	$eInfo = tx_div2007_alpha5::getExtensionInfo_fh003(STATIC_INFO_TABLES_TAXES_EXT);
-
-	if (is_array($eInfo)) {
-		$sittVersion = $eInfo['version'];
-		if (version_compare($sittVersion, '0.3.0', '>=')) {
-			$bSelectTaxMode = TRUE;
-		}
-	}
+    $eInfo = tx_div2007_alpha5::getExtensionInfo_fh003(STATIC_INFO_TABLES_TAXES_EXT);
+
+    if (is_array($eInfo)) {
+        $sittVersion = $eInfo['version'];
+        if (version_compare($sittVersion, '0.3.0', '>=')) {
+            $bSelectTaxMode = true;
+        }
+    }
 }
 
 
 if ($bSelectTaxMode) {
-	$whereTaxCategory = \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('static_tax_categories');
-
-	$temporaryColumns = array (
-		'tax_id' => array (
-			'exclude' => 0,
-			'label' => 'LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'items' => array (
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.0', '0'),
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.1', '1'),
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.2', '2'),
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.3', '3'),
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.4', '4'),
-					array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.5', '5'),
-				),
-			)
-		),
-	);
-
-
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
-		$table,
-		$temporaryColumns
-	);
-	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-		$table,
-		'tax_id',
-		'',
-		'replace:tax_dummy'
-	);
-
-	$GLOBALS['TCA'][$table]['interface']['showRecordFieldList'] = str_replace(',tax,', ',tax,tax_id,', $GLOBALS['TCA'][$table]['interface']['showRecordFieldList']);
+    $whereTaxCategory = \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('static_tax_categories');
+
+    $temporaryColumns = array (
+        'tax_id' => array (
+            'exclude' => 0,
+            'label' => 'LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => array (
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.0', '0'),
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.1', '1'),
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.2', '2'),
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.3', '3'),
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.4', '4'),
+                    array('LLL:EXT:' . STATIC_INFO_TABLES_TAXES_EXT . '/locallang_db.xml:static_taxes.tx_rate_id.I.5', '5'),
+                ),
+                'default' => 0
+            )
+        ),
+    );
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
+        $table,
+        $temporaryColumns
+    );
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+        $table,
+        'tax_id',
+        '',
+        'replace:tax_dummy'
+    );
 
+    $GLOBALS['TCA'][$table]['interface']['showRecordFieldList'] = str_replace(',tax,', ',tax,tax_id,', $GLOBALS['TCA'][$table]['interface']['showRecordFieldList']);
 }
 
 
 
 switch ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][TT_PRODUCTS_EXT]['articleMode']) {
-	case '1':
-		$GLOBALS['TCA'][$table]['columns']['article_uid'] = array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:' . TT_PRODUCTS_EXT . '/locallang_db.xml:tt_products.article_uid',
-			'config' => array (
-				'type' => 'group',
-				'internal_type' => 'db',
-				'allowed' => 'tt_products_articles',
-				'MM' => 'tt_products_products_mm_articles',
-				'foreign_table' => 'tt_products_articles',
-				'foreign_table_where' => ' ORDER BY tt_products_articles.title',
-				'size' => 10,
-				'selectedListStyle' => 'width:450px',
-				'minitems' => 0,
-				'maxitems' => 1000,
-			)
-		);
-		break;
-	case '2':
-		// leave the settings of article_uid
-		break;
+    case '1':
+        $GLOBALS['TCA'][$table]['columns']['article_uid'] = array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:' . TT_PRODUCTS_EXT . '/locallang_db.xml:tt_products.article_uid',
+            'config' => array (
+                'type' => 'group',
+                'internal_type' => 'db',
+                'allowed' => 'tt_products_articles',
+                'MM' => 'tt_products_products_mm_articles',
+                'foreign_table' => 'tt_products_articles',
+                'foreign_table_where' => ' ORDER BY tt_products_articles.title',
+                'size' => 10,
+                'selectedListStyle' => 'width:450px',
+                'minitems' => 0,
+                'maxitems' => 1000,
+                'default' => 0
+            )
+        );
+        break;
+    case '2':
+        // leave the settings of article_uid
+        break;
     case '0':
     default:
         unset($GLOBALS['TCA'][$table]['columns']['article_uid']);
@@ -104,8 +101,6 @@
         break;
 }
 
-
-
 $addressTable = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][TT_PRODUCTS_EXT]['addressTable'];
 
 if (!$addressTable) {
@@ -122,6 +117,7 @@
         'size' => 1,
         'minitems' => 0,
         'maxitems' => 1,
+        'default' => 0
     )
 );
 
@@ -134,8 +130,6 @@
     'before:price'
 );
 
-
-
 $orderBySortingTablesArray = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][TT_PRODUCTS_EXT]['orderBySortingTables']);
 if (
     !empty($orderBySortingTablesArray) &&