Merge pull request #121 from ticktackk/develop

1.4.2
ticktackk · Apr 15, 2022 · 1b746d4 · 1b746d4
2 parents 89958fc + 82aaf57
commit 1b746d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 ==========================
 
+## 1.4.2 (`1040270`)
+
+- **Fix:** Command `tck-dt:entity-class-properties` duplicates class hint for getters (#120)
+
 ## 1.4.1 (`1040170`)
 
 - **Fix:** Command `tck-devtools:create-entity-from-table` marks auto increment primary key as required (#118)

diff --git a/Cli/Command/EntityClassProperties.php b/Cli/Command/EntityClassProperties.php
@@ -256,6 +256,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
                             $newType[] = '\\' . $class . ($isMulti ? '[]' : '');
                         }
                     }
+                    $newType = array_unique($newType);
 
                     $type = implode('|', $newType);
                 }
@@ -279,13 +280,18 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
                     'type' => !empty($def['typeHint']) ? $def['typeHint'] : $typeMap[$def['type']],
                     'null' => !empty($def['nullable'])
                 ];
+
                 if (array_key_exists('list', $def)
                     && array_key_exists('type', $def['list'])
                     && isset($listMap[$def['list']['type']])
                 )
                 {
                     $columns[$column]['type'] = 'array|' . $listMap[$def['list']['type']] . '[]';
                 }
+                else if ($def['type'] === Entity::STR && array_key_exists('censor', $def))
+                {
+                    $columns[$column . '_'] = $columns[$column];
+                }
             }
 
             $relations = [];
@@ -452,7 +458,7 @@ protected function getAllClassesExtendingClass(
             $classes[] = $classExtension->to_class;
         }
 
-        return $classes;
+        return array_unique($classes);
     }
 
     /**

diff --git a/addon.json b/addon.json
@@ -2,8 +2,8 @@
     "legacy_addon_id": "",
     "title": "Developer Tools",
     "description": "This add-on provides enhancements for add-on developers.",
-    "version_id": 1040170,
-    "version_string": "1.4.1",
+    "version_id": 1040270,
+    "version_string": "1.4.2",
     "dev": "TickTackk",
     "dev_url": "https://xenforo.com/community/members/90375/",
     "faq_url": "",