Replace array_merge with array_replace

Tastaturberuf · Jan 10, 2024 · 04c09a8 · 04c09a8
1 parent e977fca
commit 04c09a8
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 33 deletions.
diff --git a/config/config.php b/config/config.php
@@ -183,11 +183,8 @@
  *
  * You can register your mappings in the config.php file of your extension.
  */
-array_insert($GLOBALS['TL_MODELS'], 0, array
-(
-    'tl_anystores_category' => 'Tastaturberuf\AnyStoresCategoryModel',
-    'tl_anystores'          => 'Tastaturberuf\AnyStoresModel'
-));
+$GLOBALS['TL_MODELS']['tl_anystores_category'] = Tastaturberuf\AnyStoresCategoryModel::class;
+$GLOBALS['TL_MODELS']['tl_anystores'] = Tastaturberuf\AnyStoresModel::class;
 
 
 /**

diff --git a/dca/tl_form.php b/dca/tl_form.php
@@ -29,7 +29,7 @@
 /**
  * Fields
  */
-array_insert($GLOBALS['TL_DCA']['tl_form']['fields'], 0, array
+$GLOBALS['TL_DCA']['tl_form']['fields'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_form']['fields'] ?? [], array
 (
     'anystores_sendEmail' => array
     (
@@ -76,6 +76,8 @@ class tl_form_anystores
 
     public function getFormFields(DataContainer $dc)
     {
+        $arrFields = [];
+
         $arrOptions = array
         (
             'column' => array("type='stores'")
@@ -89,9 +91,9 @@ public function getFormFields(DataContainer $dc)
             {
                 $arrFields[$objFields->name] = $objFields->label;
             }
-
-            return $arrFields;
         }
+
+        return $arrFields;
     }
 
 }
diff --git a/dca/tl_module.php b/dca/tl_module.php
@@ -13,7 +13,7 @@
 /**
  * Add palettes to tl_module
  */
-array_insert($GLOBALS['TL_DCA']['tl_module']['palettes'], 1337, array
+$GLOBALS['TL_DCA']['tl_module']['palettes'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_module']['palettes'] ?? [], array
 (
     'anystores_search' => '
         {title_legend},name,headline,type;
@@ -70,7 +70,7 @@
 /**
  * Add fields to tl_module
  */
-array_insert($GLOBALS['TL_DCA']['tl_module']['fields'], 0, array
+$GLOBALS['TL_DCA']['tl_module']['fields'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_module']['fields'] ?? [], array
 (
     'anystores_defaultCountry' => array
     (
@@ -118,9 +118,9 @@
     'anystores_allowEmptySearch' => array
     (
         'label'     => &$GLOBALS['TL_LANG']['tl_module']['anystores_allowEmptySearch'],
-        'exclude'   => true,    
-        'inputType' => 'checkbox', 
-        'default'   => true, 
+        'exclude'   => true,
+        'inputType' => 'checkbox',
+        'default'   => true,
         'eval'      => array
         (
             'submitOnChange' => true,

diff --git a/dca/tl_page.php b/dca/tl_page.php
@@ -13,6 +13,9 @@
 /**
  * Palettes
  */
+
+use Tastaturberuf\AnyStoresCategoryModel;
+
 $GLOBALS['TL_DCA']['tl_page']['palettes']['root'] .= ';{anystores_legend},anystores_sitemap';
 
 
@@ -31,7 +34,7 @@
 /**
  * Fields
  */
-array_insert($GLOBALS['TL_DCA']['tl_page']['fields'], 0, array
+$GLOBALS['TL_DCA']['tl_page']['fields'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_page']['fields'] ?? [], array
 (
     'anystores_sitemap' => array
     (
@@ -69,7 +72,7 @@
 
             if ( $objCategories === null )
             {
-                return;
+                return [];
             }
 
             return $objCategories->fetchEach('title');

diff --git a/dca/tl_user.php b/dca/tl_user.php
@@ -20,7 +20,7 @@
 /**
  * Fields
  */
-array_insert($GLOBALS['TL_DCA']['tl_user']['fields'], 0, array
+$GLOBALS['TL_DCA']['tl_user']['fields'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_user']['fields'] ?? [], array
 (
     'anystores_categories' => array
     (

diff --git a/dca/tl_user_group.php b/dca/tl_user_group.php
@@ -19,7 +19,7 @@
 /**
  * Fields
  */
-array_insert($GLOBALS['TL_DCA']['tl_user_group']['fields'], 0, array
+$GLOBALS['TL_DCA']['tl_user_group']['fields'] = array_replace_recursive($GLOBALS['TL_DCA']['tl_user_group']['fields'] ?? [], array
 (
     'anystores_categories' => array
     (

diff --git a/languages/de/modules.php b/languages/de/modules.php
@@ -22,7 +22,7 @@
 /**
  * Front end modules
  */
-array_insert($GLOBALS['TL_LANG']['FMD'], 0, array
+$GLOBALS['TL_LANG']['FMD'] = array_replace($GLOBALS['TL_LANG']['FMD'] ?? [], array
 (
     'anystores'           => 'AnyStores',
     'anystores_search'    => array('anyStores Suche',   'Suchformular für Standorte.'),
@@ -33,7 +33,7 @@
 ));
 
 
-array_insert($GLOBALS['TL_LANG']['tl_module'], 0, array
+$GLOBALS['TL_LANG']['tl_module'] = array_replace($GLOBALS['TL_LANG']['tl_module'] ?? [], array
 (
     'map_legend'     => 'Karteneinstellungen',
     'map_api_legend' => 'API-Einstellungen',

diff --git a/languages/de/tl_form.php b/languages/de/tl_form.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_form'], 0, array
+$GLOBALS['TL_LANG']['tl_form'] = array_replace($GLOBALS['TL_LANG']['tl_form'] ?? [], array
 (
     'anystores_legend'    => 'AnyStores-Einstellungen',
     'anystores_sendEmail' => array

diff --git a/languages/de/tl_form_field.php b/languages/de/tl_form_field.php
@@ -10,12 +10,12 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['FFL'], 0, array
+$GLOBALS['TL_LANG']['FFL'] = array_replace($GLOBALS['TL_LANG']['FFL'] ?? [], array
 (
     'stores' => array('anyStores Liste', '')
 ));
 
-array_insert($GLOBALS['TL_LANG']['tl_form_field'], 0, array
+$GLOBALS['TL_LANG']['tl_form_field'] = array_replace($GLOBALS['TL_LANG']['tl_form_field'] ?? [], array
 (
     'anystores_idField'    => array('Spalte für den Value-Wert', ''),
     'anystores_categories' => array('Kategorien', '')

diff --git a/languages/de/tl_page.php b/languages/de/tl_page.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_page'], 0, array
+$GLOBALS['TL_LANG']['tl_page'] = array_replace($GLOBALS['TL_LANG']['tl_page'] ?? [], array
 (
     'anystores_legend'     => 'anyStores-Einstellungen',
     'anystores_sitemap'    => array('Zur Sitemap hinzufügen', 'Aktivieren um definierte Standorte in der Sitemap anzuzeigen.'),

diff --git a/languages/de/tl_user.php b/languages/de/tl_user.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_user'], 0, array
+$GLOBALS['TL_LANG']['tl_user'] = array_replace($GLOBALS['TL_LANG']['tl_user'] ?? [], array
 (
 
     'anystores_legend' => 'anyStores-Rechte',

diff --git a/languages/de/tl_user_group.php b/languages/de/tl_user_group.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_user_group'], 0, array
+$GLOBALS['TL_LANG']['tl_user_group'] = array_replace($GLOBALS['TL_LANG']['tl_user_group'] ?? [], array
 (
 
     'anystores_legend' => 'anyStores-Rechte',

diff --git a/languages/en/modules.php b/languages/en/modules.php
@@ -22,7 +22,7 @@
 /**
  * Front end modules
  */
-array_insert($GLOBALS['TL_LANG']['FMD'], 0, array
+$GLOBALS['TL_LANG']['FMD'] = array_replace($GLOBALS['TL_LANG']['FMD'] ?? [], array
 (
     'anystores'           => 'AnyStores',
     'anystores_search'    => array('anyStores Search',  'Searchform for locations.'),
@@ -33,7 +33,7 @@
 ));
 
 
-array_insert($GLOBALS['TL_LANG']['tl_module'], 0, array
+$GLOBALS['TL_LANG']['tl_module'] = array_replace($GLOBALS['TL_LANG']['tl_module'] ?? [], array
 (
     'map_legend'     => 'Map settings',
     'map_api_legend' => 'API settings',

diff --git a/languages/en/tl_form.php b/languages/en/tl_form.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_form'], 0, array
+$GLOBALS['TL_LANG']['tl_form'] = array_replace($GLOBALS['TL_LANG']['tl_form'] ?? [], array
 (
     'anystores_legend'    => 'AnyStores settings',
     'anystores_sendEmail' => array

diff --git a/languages/en/tl_form_field.php b/languages/en/tl_form_field.php
@@ -10,12 +10,12 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['FFL'], 0, array
+$GLOBALS['TL_LANG']['FFL'] = array_replace($GLOBALS['TL_LANG']['FFL'] ?? [], array
 (
     'stores' => array('anyStores list', '')
 ));
 
-array_insert($GLOBALS['TL_LANG']['tl_form_field'], 0, array
+$GLOBALS['TL_LANG']['tl_form_field'] = array_replace($GLOBALS['TL_LANG']['tl_form_field'] ?? [], array
 (
     'anystores_idField'    => array('Column for the value', ''),
     'anystores_categories' => array('Categories', '')

diff --git a/languages/en/tl_page.php b/languages/en/tl_page.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_page'], 0, array
+$GLOBALS['TL_LANG']['tl_page'] = array_replace($GLOBALS['TL_LANG']['tl_page'] ?? [], array
 (
     'anystores_legend'     => 'anyStores settings',
     'anystores_sitemap'    => array('Add to sitemap', 'Check to integrate locations to the sitemap.'),

diff --git a/languages/en/tl_user.php b/languages/en/tl_user.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_user'], 0, array
+$GLOBALS['TL_LANG']['tl_user'] = array_replace($GLOBALS['TL_LANG']['tl_user'] ?? [], array
 (
 
     'anystores_legend' => 'anyStores permissions',

diff --git a/languages/en/tl_user_goup.php b/languages/en/tl_user_goup.php
@@ -10,7 +10,7 @@
  */
 
 
-array_insert($GLOBALS['TL_LANG']['tl_user_group'], 0, array
+$GLOBALS['TL_LANG']['tl_user_group'] = array_replace($GLOBALS['TL_LANG']['tl_user_group'] ?? [], array
 (
 
     'anystores_legend' => 'anyStores permissions',
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
      */
-    array_insert($GLOBALS['TL_LANG']['tl_user'], 0, array
+    $GLOBALS['TL_LANG']['tl_user'] = array_replace($GLOBALS['TL_LANG']['tl_user'] ?? [], array
     (
         'anystores_legend' => 'anyStores-Rechte',
@@ Expand Down @@