Refactor ArticlePage

Author: BurntimeX

com.woltlab.wcf/templates/article.tpl

@@ -116,7 +116,7 @@
 
 	{include file='entryTags' objectType='com.woltlab.wcf.article'}
 
-	{include file='entryAttachments' objectID=$article->articleID}
+	{include file='entryAttachments' attachments=$article->getAttachments()}
 
 	<footer class="entry__footer">
 		{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canViewLike')}

wcfsetup/install/files/lib/data/TCollectionAttachments.class.php

@@ -64,6 +64,7 @@ protected function getAttachmentPermissions(): array
 
     protected function hasAttachments(DatabaseObject $object): bool
     {
+        // @phpstan-ignore property.notFound
         return $object->attachments > 0;
     }
 

wcfsetup/install/files/lib/data/article/Article.class.php

@@ -4,7 +4,7 @@
 
 use wcf\data\article\category\ArticleCategory;
 use wcf\data\article\content\ArticleContent;
-use wcf\data\attachment\GroupedAttachmentList;
+use wcf\data\attachment\Attachment;
 use wcf\data\CollectionDatabaseObject;
 use wcf\data\ILinkableObject;
 use wcf\data\IPopoverObject;
@@ -336,19 +336,12 @@ public function getUsername(): string
     }
 
     /**
+     * @return Attachment[]
      * @since 6.0
      */
-    public function getAttachments(): ?GroupedAttachmentList
+    public function getAttachments(): array
     {
-        if ($this->attachments) {
-            $attachmentList = new GroupedAttachmentList('com.woltlab.wcf.article');
-            $attachmentList->getConditionBuilder()->add('attachment.objectID IN (?)', [$this->articleID]);
-            $attachmentList->readObjects();
-
-            return $attachmentList;
-        }
-
-        return null;
+        return $this->getCollection()->getAttachments($this);
     }
 
     #[\Override]

wcfsetup/install/files/lib/data/article/ArticleCollection.class.php

@@ -5,6 +5,7 @@
 use wcf\data\article\content\ArticleContent;
 use wcf\data\article\content\ArticleContentList;
 use wcf\data\DatabaseObjectCollection;
+use wcf\data\TCollectionAttachments;
 use wcf\data\TCollectionLabels;
 use wcf\data\TCollectionReactions;
 use wcf\data\TCollectionUserProfiles;
@@ -29,6 +30,7 @@ class ArticleCollection extends DatabaseObjectCollection
     use TCollectionUserProfiles;
     use TCollectionLabels;
     use TCollectionVisitTimes;
+    use TCollectionAttachments;
 
     /**
      * @var array<int, array<int, ArticleContent>>
@@ -131,4 +133,10 @@ protected function getVisitTrackerObjectType(): string
     {
         return 'com.woltlab.wcf.article';
     }
+
+    #[\Override]
+    protected function getAttachmentObjectType(): string
+    {
+        return 'com.woltlab.wcf.article';
+    }
 }