fx some php 8 issues

alnv · May 17, 2024 · b235b21 · b235b21
1 parent 8b1470f
commit b235b21
Show file tree

Hide file tree

Showing 4 changed files with 314 additions and 309 deletions.
diff --git a/config/config.php b/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-define("CATALOG_MANAGER_VERSION", "1.32.42");
+define("CATALOG_MANAGER_VERSION", "1.32.43");
 
 if (!\Config::get('hideCatalogManager')) {
     array_insert($GLOBALS['BE_MOD'], 3, [

diff --git a/library/alnv/CatalogDcExtractor.php b/library/alnv/CatalogDcExtractor.php
@@ -345,11 +345,8 @@ protected function convertDcSortingToCatalog($arrReturn, $arrDataContainer, $str
                     $strUpperCaseField = strtoupper($strField);
 
                     if (stripos($strUpperCaseField, 'ASC') || stripos($strUpperCaseField, 'DESC')) {
-
                         $arrFieldParameter = explode(' ', $strField);
-
                         if (!Toolkit::isEmpty($arrFieldParameter[0])) {
-
                             $arrFields[] = $arrFieldParameter[0];
                         }
 
@@ -363,7 +360,6 @@ protected function convertDcSortingToCatalog($arrReturn, $arrDataContainer, $str
             }
 
             if (is_array($arrDataContainer[$strDcConfigType]['sorting']['headerFields']) && !empty($arrDataContainer[$strDcConfigType]['sorting']['headerFields'])) {
-
                 $arrReturn['headerFields'] = $arrDataContainer[$strDcConfigType]['sorting']['headerFields'];
             }
         }
@@ -380,7 +376,7 @@ protected function convertDcLabelToCatalog($arrReturn, $arrDataContainer, $strDc
             if (isset($arrDataContainer[$strDcConfigType]['label']['format'])) {
                 $arrReturn['format'] = $arrDataContainer[$strDcConfigType]['label']['format'];
             }
-            if ($arrDataContainer[$strDcConfigType]['label']['showColumns']) {
+            if (($arrDataContainer[$strDcConfigType]['label']['showColumns']??'')) {
                 $arrReturn['showColumns'] = '1';
             }
             if (isset($arrDataContainer[$strDcConfigType]['label']['fields']) && is_array($arrDataContainer[$strDcConfigType]['label']['fields']) && !empty($arrDataContainer[$strDcConfigType]['label']['fields'])) {
@@ -396,9 +392,7 @@ protected function convertDcOperationsToCatalog($arrReturn, $arrDataContainer, $
     {
 
         if ($this->blnCore) {
-
             $arrReturn['operations'] = '';
-
             return $arrReturn;
         }
 

diff --git a/library/alnv/CatalogFieldBuilder.php b/library/alnv/CatalogFieldBuilder.php
@@ -634,7 +634,7 @@ protected function getCoreFields($blnDcFormat)
 
                     $arrReturn[$strFieldname]['fileType'] = $strFileType;
                     $arrReturn[$strFieldname]['extensions'] = $strExtensions;
-                    $arrReturn[$strFieldname]['filesOnly'] = $arrField['eval']['filesOnly'] ? '1' : '';
+                    $arrReturn[$strFieldname]['filesOnly'] = ($arrField['eval']['filesOnly']??'') ? '1' : '';
                 }
             }
         }