Merge pull request #124 from ticktackk/develop

1.4.3

Author: ticktackk

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 ==========================
 
+## 1.4.3 (`1040370`)
+
+- **Fix:** Command `tck-dt:entity-class-properties` does not set getters and relations make use of `@property-read` tag as it should (#122)
+- **Fix:** Error: Call to undefined method `XF\Mvc\Reply\Error::getParam()` (#123)
+
 ## 1.4.2 (`1040270`)
 
 - **Fix:** Command `tck-dt:entity-class-properties` duplicates class hint for getters (#120)

Cli/Command/EntityClassProperties.php

@@ -262,7 +262,8 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
                 }
 
                 $getters[$getter] = [
-                    'type' => $type ? (is_array($type) ? $type : trim($type)) : 'mixed'
+                    'type' => $type ? (is_array($type) ? $type : trim($type)) : 'mixed',
+                    'readOnly' => true
                 ];
             }
 
@@ -271,6 +272,8 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
             {
                 if (isset($getters[$column]))
                 {
+                    $getters[$column]['readOnly'] = false;
+
                     // There's an overlapping getter so this column
                     // is only accessible via the bypass suffix.
                     $column .= '_';
@@ -314,7 +317,8 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
 
                 $relations[$relation] = [
                     'type' => $relationEntityClasses,
-                    'many' => ($def['type'] === Entity::TO_MANY)
+                    'many' => ($def['type'] === Entity::TO_MANY),
+                    'readOnly' => true
                 ];
             }
 
@@ -349,7 +353,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
                         $typeProp = '\XF\Mvc\Entity\AbstractCollection|' . $typeProp . '[]';
                     }
 
-                    $newComment .= "\n" . ' * @property ' . $typeProp . ' $' . $relation;
+                    $newComment .= "\n" . ' * @property' . ($type['readOnly'] ? '-read' : '') . ' ' . $typeProp . ' $' . $relation;
                 }
             }
 
@@ -371,7 +375,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
                         $type['type'] = '\\' . implode('|\\', $type['type']);
                     }
 
-                    $newComment .= "\n" . ' * @property ' . $type['type'] . ' $' . $getter;
+                    $newComment .= "\n" . ' * @property' . ($type['readOnly'] ? '-read' : '') . ' ' . $type['type'] . ' $' . $getter;
                 }
             }
 

XF/Admin/Controller/Template.php

@@ -26,28 +26,31 @@ public function actionEdit(ParameterBag $params)
     {
         $reply = parent::actionEdit($params);
 
-        $addModificationCount = true;
-        $addOns = \XF::app()->container('addon.cache');
-        if (isset($addOns['SV/StandardLib']) && $addOns['SV/StandardLib'] >= 1050000)
+        if ($reply instanceof ViewReply)
         {
-            $addModificationCount = false;
-        }
+            $addModificationCount = true;
+            $addOns = \XF::app()->container('addon.cache');
+            if (isset($addOns['SV/StandardLib']) && $addOns['SV/StandardLib'] >= 1050000)
+            {
+                $addModificationCount = false;
+            }
 
-        /** @var TemplateEntity $template */
-        $template = $reply->getParam('template');
-        if ($addModificationCount && $reply instanceof ViewReply && $template)
-        {
-            $modifications = $this->finder('XF:TemplateModification')
-                ->where([
-                    'type' => $template->type,
-                    'template' => $template->title,
-                    //'enabled'  => 1
-                ])
-                ->whereAddOnActive()
-                ->order('execution_order')
-                ->total();
-
-            $reply->setParam('modificationCount', $modifications);
+            /** @var TemplateEntity $template */
+            $template = $reply->getParam('template');
+            if ($addModificationCount && $template)
+            {
+                $modifications = $this->finder('XF:TemplateModification')
+                    ->where([
+                        'type' => $template->type,
+                        'template' => $template->title,
+                        //'enabled'  => 1
+                    ])
+                    ->whereAddOnActive()
+                    ->order('execution_order')
+                    ->total();
+
+                $reply->setParam('modificationCount', $modifications);
+            }
         }
 
         return $reply;

addon.json

@@ -2,8 +2,8 @@
     "legacy_addon_id": "",
     "title": "Developer Tools",
     "description": "This add-on provides enhancements for add-on developers.",
-    "version_id": 1040270,
-    "version_string": "1.4.2",
+    "version_id": 1040370,
+    "version_string": "1.4.3",
     "dev": "TickTackk",
     "dev_url": "https://xenforo.com/community/members/90375/",
     "faq_url": "",