Merge pull request #4647 from humhub/fix/4646-fix-duplicate-array-keys

Clean up duplicated array keys

CHANGELOG_DEV.md

@@ -7,3 +7,4 @@ HumHub Changelog
 - Enh #4543: Order members by newest in `about` page
 - Enh #4347: Add `hideMembersSidebar` to make members sidebar optional in space stream page
 - Enh #4585: Group notifications must be enabled explicitly
+- Fix #4646: Clean up duplicated array keys

protected/humhub/libs/EmojiMap.php

@@ -72,7 +72,7 @@ class EmojiMap
         'woozy_face' => '🥴',
         'woozy' => '🥴',
         'dizzy_face' => '😵',
-        'dizzy' => '😵',
+        'dizzy_face_with_spiral_eyes' => '😵‍💫',
         'exploding_head' => '🤯',
         'cowboy_hat_face' => '🤠',
         'partying_face' => '🥳',

protected/humhub/libs/Iso3166Codes.php

@@ -278,7 +278,7 @@ class Iso3166Codes
         'AX' => '358',
         'AL' => '355',
         'DZ' => '213',
-        'AD' => '1684',
+        'AS' => '1684',
         'AD' => '376',
         'AO' => '244',
         'AQ' => '672',

protected/humhub/modules/user/models/fieldtype/Text.php

@@ -67,7 +67,7 @@ class Text extends BaseType
     /**
      * Rules for validating the Field Type Settings Form
      *
-     * @return type
+     * @return array
      */
     public function rules()
     {
@@ -82,7 +82,7 @@ class Text extends BaseType
      * Returns Form Definition for edit/create this field.
      *
      * @param array $definition
-     * @return Array Form Definition
+     * @return array Form Definition
      */
     public function getFormDefinition($definition = [])
     {
@@ -91,12 +91,6 @@ class Text extends BaseType
                         'type' => 'form',
                         'title' => Yii::t('UserModule.profile', 'Text Field Options'),
                         'elements' => [
-                            'maxLength' => [
-                                'type' => 'text',
-                                'maxlength' => 32,
-                                'label' => Yii::t('UserModule.profile', 'Maximum length'),
-                                'class' => 'form-control',
-                            ],
                             'validator' => [
                                 'label' => Yii::t('UserModule.profile', 'Validator'),
                                 'type' => 'dropdownlist',
@@ -153,8 +147,8 @@ class Text extends BaseType
     /**
      * Returns the Field Rules, to validate users input
      *
-     * @param type $rules
-     * @return type
+     * @param array $rules
+     * @return array
      */
     public function getFieldRules($rules = [])
     {