Fix #6839: The getObjectModel() method should work for all ActiveReco…

…rd classes (#6854)

CHANGELOG-DEV.md

@@ -61,3 +61,4 @@ HumHub Changelog
 - Enh #6838: Fix LDAP encryption labels and allow ignore also part of DNs
 - Enh #6490: Update button style on force password form
 - Enh #6847: Use prosemirror file handler flag
+- Fix #6839: The getObjectModel() method should work for all ActiveRecord classes

protected/humhub/components/ActiveRecord.php

@@ -8,9 +8,9 @@
 
 namespace humhub\components;
 
-use Yii;
-use humhub\modules\user\models\User;
 use humhub\modules\file\components\FileManager;
+use humhub\modules\user\models\User;
+use Yii;
 use yii\base\InvalidConfigException;
 use yii\db\ColumnSchema;
 use yii\db\Expression;
@@ -76,7 +76,7 @@ public function afterSave($insert, $changedAttributes)
             $this->created_at = date('Y-m-d H:i:s');
         }
 
-        if($this->hasAttribute('updated_at') && $this->updated_at instanceof Expression) {
+        if ($this->hasAttribute('updated_at') && $this->updated_at instanceof Expression) {
             $this->updated_at = date('Y-m-d H:i:s');
         }
 
@@ -136,9 +136,9 @@ public function getFileManager()
     /**
      * Returns the errors as string for all attribute or a single attribute.
      *
-     * @since 1.2
      * @param string $attribute attribute name. Use null to retrieve errors for all attributes.
      * @return string the error message
+     * @since 1.2
      */
     public function getErrorMessage($attribute = null)
     {
@@ -257,4 +257,27 @@ private function columnValueCanBeNormalized(?ColumnSchema $column, $value): bool
 
         return false;
     }
+
+    /**
+     * Returns the class used in the polymorphic content relation.
+     * By default, this function will return the static class.
+     *
+     * Subclasses of existing content record classes may overwrite this function in order to remain the actual
+     * base type as follows:
+     *
+     * ```
+     * public static function getObjectModel(): string {
+     *     return BaseType::class
+     * }
+     * ```
+     *
+     * This will force the usage of the `BaseType` class when creating, deleting or querying the content relation.
+     * This is used in cases in which a subclass extends the a base record class without implementing a custom content type.
+     *
+     * @return string
+     */
+    public static function getObjectModel(): string
+    {
+        return static::class;
+    }
 }

protected/humhub/components/behaviors/PolymorphicRelation.php

@@ -11,8 +11,6 @@
 use Exception;
 use humhub\components\ActiveRecord;
 use humhub\helpers\DataTypeHelper;
-use humhub\modules\content\components\ContentActiveRecord;
-use humhub\modules\content\components\ContentAddonActiveRecord;
 use ReflectionClass;
 use ReflectionException;
 use Yii;
@@ -119,7 +117,7 @@ public function setPolymorphicRelation(?object $object)
 
     public static function getObjectModel(ActiveRecordInterface $object): string
     {
-        return $object instanceof ContentActiveRecord || $object instanceof ContentAddonActiveRecord
+        return $object instanceof ActiveRecord
             ? $object::getObjectModel()
             : get_class($object);
     }

protected/humhub/modules/content/components/ContentActiveRecord.php

@@ -484,29 +484,6 @@ public function afterStateChange(?int $newState, ?int $previousState): void
         }
     }
 
-    /**
-     * Returns the class used in the polymorphic content relation.
-     * By default this function will return the static class.
-     *
-     * Subclasses of existing content record classes may overwrite this function in order to remain the actual
-     * base type as follows:
-     *
-     * ```
-     * public static function getObjectModel(): string {
-     *     return BaseType::class
-     * }
-     * ```
-     *
-     * This will force the usage of the `BaseType` class when creating, deleting or querying the content relation.
-     * This is used in cases in which a subclass extends the a base record class without implementing a custom content type.
-     *
-     * @return string
-     */
-    public static function getObjectModel(): string
-    {
-        return static::class;
-    }
-
     /**
      * Marks this content for deletion (soft delete).
      * Use `hardDelete()` method to delete record immediately.

protected/humhub/modules/content/components/ContentAddonActiveRecord.php

@@ -281,28 +281,4 @@ public function getUser()
     {
         return $this->hasOne(User::class, ['id' => 'created_by']);
     }
-
-    /**
-     * Returns the class used in the polymorphic content relation.
-     * By default this function will return the static class.
-     *
-     * Subclasses of existing content record classes may overwrite this function in order to remain the actual
-     * base type as follows:
-     *
-     * ```
-     * public static function getObjectModel(): string {
-     *     return BaseType::class
-     * }
-     * ```
-     *
-     * This will force the usage of the `BaseType` class when creating, deleting or querying the content relation.
-     * This is used in cases in which a subclass extends a base record class without implementing a custom content type.
-     *
-     * @return string
-     */
-    public static function getObjectModel(): string
-    {
-        return static::class;
-    }
-
 }