From 42d5044d36b148457844a4fb4cebd80f3b3ebea3 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Wed, 21 Jan 2026 23:37:05 +0000
Subject: [PATCH 01/10] Fix: `canFeatureUnfeature` method signature in
 documentation. This fixes the obvious error I noted
 https://github.com/xenforo-ltd/docs/issues/63 after installing the add-on.

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 1e2af14..5da35bd 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -758,7 +758,7 @@ namespace Demo\Portal\XF\Entity;
 
 class Thread extends XFCP_Thread
 {
-	public function canFeatureUnfeature()
+	public function canFeatureUnfeature(&$error = null): bool
 	{
 		return true;
 	}

From 000f6dd5ab752909d50a6c4a83f8ec998d7a7e0a Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Thu, 22 Jan 2026 00:11:17 +0000
Subject: [PATCH 02/10] Fix: Correct type hint for `AttachmentRepository` in
 add-on documentation.

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 5da35bd..a59ce6f 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -1064,7 +1064,7 @@ Right now, this is going to generate an additional query for each post. So, we s
 $threads = $featuredThreads->pluckNamed('Thread');
 $posts = $threads->pluckNamed('FirstPost', 'first_post_id');
 
-/** @var \XF\Repository\Attachment $attachRepo */
+/** @var \XF\Repository\AttachmentRepository $attachRepo */
 $attachRepo = $this->repository('XF:Attachment');
 $attachRepo->addAttachmentsToContent($posts, 'post');
 ```

From 012a15c962ca5f53e674eeccb27a8c388abc34f4 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Thu, 22 Jan 2026 00:26:08 +0000
Subject: [PATCH 03/10] Update: Replace `Demo-Portal-1.0.0 Alpha.zip` with an
 updated version.

---
 static/files/Demo-Portal-1.0.0 Alpha.zip | Bin 20752 -> 21216 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/static/files/Demo-Portal-1.0.0 Alpha.zip b/static/files/Demo-Portal-1.0.0 Alpha.zip
index a4da03d27ce49014b6d49960e554f2f1c3ccfa8b..d463b8ea5a5101b66feb4067edfc639e7396bebe 100644
GIT binary patch
delta 11217
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
F{{eE!ro;dM

delta 10906
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


From f0d914921f2079904b0877c8a14ecd506442ba40 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Thu, 22 Jan 2026 01:58:44 +0000
Subject: [PATCH 04/10] Fix: Update class names and type hints in
 documentation.

---
 docs/devs/lets-build-an-add-on.md        |  64 ++++++++++++-----------
 static/files/Demo-Portal-1.0.0 Alpha.zip | Bin 21216 -> 21258 bytes
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index a59ce6f..8a7c2de 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -370,16 +370,16 @@ Finally, click save to save your template modification. If all has gone well, wh
 
 We have our column, we have a UI to pass an input to that column, now we have to handle saving data to that column. We will do this by extending the Forum controller and extending a special method which is called when a node and its data are saved. First, let's create a "Class extension" which can be found under the "Development" entry in the Admin CP. Click "Add class extension".
 
-Here we need to specify a "Base class name" which is the name of the class we are extending, which in this case will be `XF\Admin\Controller\Forum`. And we need to specify a "Extension class name" which is the class which will extend the base class. Enter this as `Demo\Portal\XF\Admin\Controller\Forum`. We should create that class before clicking Save.
+Here we need to specify a "Base class name" which is the name of the class we are extending, which in this case will be `XF\Admin\Controller\ForumController`. And we need to specify a "Extension class name" which is the class which will extend the base class. Enter this as `Demo\Portal\XF\Admin\Controller\ForumController`. We should create that class before clicking Save.
 
 Create a new file in `src/addons/Demo/Portal/XF/Admin/Controller` named `Forum.php`. This might seem like quite a long path, but we recommend a path like this for extended classes. It enables you to more easily identify the files that represent extended classes by virtue of the fact that they are in a directory of the same name as the extended "add-on" ID (in this case `XF`). It also makes it clear exactly which class has been extended as the directory structure follows the same path as the default class. The contents of the file should, for now, look like this:
 
-```php title="src/addons/Demo/Portal/XF/Admin/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Admin/Controller/ForumController.php"
 <?php
 
 namespace Demo\Portal\XF\Admin\Controller;
 
-class Forum extends XFCP_Forum
+class ForumController extends XFCP_ForumController
 {
 
 }
@@ -389,7 +389,7 @@ See [Extending classes](general-concepts.md#extending-classes) and [Type hinting
 
 Click save to save the Class extension. Now we can add some code. The particular method we need to extend is a protected function called `saveTypeData`. When extending any existing method in any class, it is important to inspect the original method for a couple of reasons. The first being we want to make sure the arguments we use in the extended method, match that of the method we're extending. The second being that we need to know what this method actually does. For example, should the method be returning something of a particular type, or a certain object? This is certainly the case in most controller actions as we mentioned in the [Modifying a controller action reply (properly)](controller-basics.md#modifying-a-controller-action-reply-properly) section. However, although this method is within a controller, it isn't actually a controller action itself. In fact, this particular method is a "void" method; it isn't expected to return anything. However, we should always ensure we call the parent method in our extended method so let's just add the new method itself, without the new code we need to add:
 
-```php title="src/addons/Demo/Portal/XF/Admin/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Admin/Controller/ForumController.php"
 protected function saveTypeData(FormAction $form, \XF\Entity\Node $node, \XF\Entity\AbstractNode $data)
 {
 	parent::saveTypeData($form, $node, $data);
@@ -403,7 +403,7 @@ This particular method's argument list assumes that we have a `use` declaration
 
 So, right now, we've extended that method, and our extension should be called, but right now it isn't doing anything other than calling its parent method. We now need to get the value of the input from the forum edit page and apply that to the `$data` entity (which in this case is the Forum entity).
 
-```php title="src/addons/Demo/Portal/XF/Admin/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Admin/Controller/ForumController.php"
 protected function saveTypeData(FormAction $form, \XF\Entity\Node $node, \XF\Entity\AbstractNode $data)
 {
 	parent::saveTypeData($form, $node, $data);
@@ -425,27 +425,27 @@ We've added a new column to the forum entity which will allow us to automaticall
 
 In XenForo, we make heavy use of Service objects. These typically take a "setup and go" type approach; you setup your configuration and then call a method to complete the action. We use a service object to setup and perform the thread creation, so this is a perfect place to add the code we need. It all starts with another class extension, so go to the "Add class extension" page.
 
-This time, the base class will be `XF\Service\Thread\Creator` and the extension class will be `Demo\Portal\XF\Service\Thread\Creator` and, as usual, this new class will look something like the code below. Create that code in the path `src/addons/Demo/Portal/XF/Service/Thread/Creator.php` then click "Save" to create the extension.
+This time, the base class will be `XF\Service\Thread\CreatorService` and the extension class will be `Demo\Portal\XF\Service\Thread\CreatorService` and, as usual, this new class will look something like the code below. Create that code in the path `src/addons/Demo/Portal/XF/Service/Thread/CreatorService.php` then click "Save" to create the extension.
 
-```php title="src/addons/Demo/Portal/XF/Service/Thread/Creator.php"
+```php title="src/addons/Demo/Portal/XF/Service/Thread/CreatorService.php"
 <?php
 
 namespace Demo\Portal\XF\Service\Thread;
 
-class Creator extends XFCP_Creator
+class CreatorService extends XFCP_CreatorService
 {
 
 }
 ```
 
-While we're here we will also create another extension. The base will be `XF\Pub\Controller\Forum` and the extension class will be `Demo\Portal\XF\Pub\Controller\Forum`. Creating the following code in the path `src/addons/Demo/Portal/XF/Pub/Controller/Forum.php` and click "Save":
+While we're here we will also create another extension. The base will be `XF\Pub\Controller\ForumController` and the extension class will be `Demo\Portal\XF\Pub\Controller\ForumController`. Creating the following code in the path `src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php` and click "Save":
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php"
 <?php
 
 namespace Demo\Portal\XF\Pub\Controller;
 
-class Forum extends XFCP_Forum
+class ForumController extends XFCP_ForumController
 {
 
 }
@@ -453,7 +453,7 @@ class Forum extends XFCP_Forum
 
 We're ultimately going to extend the `_save()` method in our extended thread creator object so we can feature our thread after it has been created. To fit in with the "setup and go" approach, we will create a method which can be used to indicate whether the thread should be created as featured, or not. For this, we need two things; a class property to store the value (it defaults to null) and a public method to allow that property to be set.
 
-```php title="src/addons/Demo/Portal/XF/Service/Thread/Creator.php"
+```php title="src/addons/Demo/Portal/XF/Service/Thread/CreatorService.php"
 protected $featureThread;
 
 public function setFeatureThread($featureThread)
@@ -464,10 +464,10 @@ public function setFeatureThread($featureThread)
 
 Going back to our newly extended forum controller, we will now extend the method that sets up the creator service, and opt in to featuring if the forum entity has the necessary value set. Remember, before extending a method, we need to know what it is expected to return (if anything), and ensure we call the parent method. If the parent method does return something, then it is this which we should return after our code has finished. The `setupThreadCreate()` method in this case returns the set up creator service, so we will start this off as follows:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php"
 protected function setupThreadCreate(\XF\Entity\Forum $forum)
 {
-    /** @var \Demo\Portal\XF\Service\Thread\Creator $creator */
+    /** @var \Demo\Portal\XF\Service\Thread\CreatorService $creator */
 	$creator = parent::setupThreadCreate($forum);
 
 	return $creator;
@@ -478,7 +478,7 @@ As expected, this doesn't actually do anything; the extended code is called, but
 
 In between the `$creator` line and the `return` line, add:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Forum.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php"
 if ($forum->demo_portal_auto_feature)
 {
 	$creator->setFeatureThread(true);
@@ -487,7 +487,7 @@ if ($forum->demo_portal_auto_feature)
 
 We can now add the `_save()` method to the extended creator class:
 
-```php title="src/addons/Demo/Portal/XF/Service/Thread/Creator.php"
+```php title="src/addons/Demo/Portal/XF/Service/Thread/CreatorService.php"
 protected function _save()
 {
 	$thread = parent::_save();
@@ -498,7 +498,7 @@ protected function _save()
 
 To make sure this thread gets featured, in between the `$thread` line and the `return` line we just need to add:
 
-```php title="src/addons/Demo/Portal/XF/Service/Thread/Creator.php"
+```php title="src/addons/Demo/Portal/XF/Service/Thread/CreatorService.php"
 if ($this->featureThread && $thread->discussion_state == 'visible')
 {
     /** @var \Demo\Portal\Entity\FeaturedThread $featuredThread */
@@ -599,8 +599,9 @@ This doesn't return the results of this query. This returns the finder object it
 Let's now use that in our `actionIndex()` method inside our portal controller. Change the existing `$viewParams = [];` line to the following:
 
 ```php title="src/addons/Demo/Portal/Pub/Controller/Portal.php"
-/** @var \Demo\Portal\Repository\FeaturedThread $repo */
-$repo = $this->repository('Demo\Portal:FeaturedThread');
+use Demo\Portal\Repository\FeaturedThread;
+
+$repo = $this->repository(FeaturedThread::class);
 
 $finder = $repo->findFeaturedThreadsForPortalView();
 
@@ -769,16 +770,16 @@ Ok, so, we haven't exactly done much here of value, yet. All the `canFeatureUnfe
 
 To test this works so far, open one of the threads you previously featured, and select "Edit thread" from the tools menu. We should see the "Set thread status" checkbox row has the "Featured" checkbox we added, and it should be checked, indicating that this thread is indeed featured.
 
-We can now move on to changing the thread editor service to look for this value and feature or unfeature accordingly. We are going to need two new class extensions for this. Go back to the "Add class extensions" page. The first one will have a base class of `XF\Pub\Controller\Thread` and extension class of `Demo\Portal\XF\Pub\Controller\Thread`. The second one will have a base class of `XF\Service\Thread\Editor` and an extension class of `Demo\Portal\XF\Service\Thread\Editor`.
+We can now move on to changing the thread editor service to look for this value and feature or unfeature accordingly. We are going to need two new class extensions for this. Go back to the "Add class extensions" page. The first one will have a base class of `XF\Pub\Controller\ThreadController` and extension class of `Demo\Portal\XF\Pub\Controller\ThreadController`. The second one will have a base class of `XF\Service\Thread\EditorService` and an extension class of `Demo\Portal\XF\Service\Thread\EditorService`.
 
 The editor service is actually going to be very similar to the extended creator service we created earlier, so create that in the relevant location. Here is all of the code for the extended class:
 
-```php title="src/addons/Demo/Portal/XF/Service/Thread/Editor.php"
+```php title="src/addons/Demo/Portal/XF/Service/Thread/EditorService.php"
 <?php
 
 namespace Demo\Portal\XF\Service\Thread;
 
-class Editor extends XFCP_Editor
+class EditorService extends XFCP_EditorService
 {
 	protected $featureThread;
 
@@ -825,16 +826,16 @@ In the case of unfeaturing, we actually just delete the featured thread entity b
 
 Before we finish the process of editing, we need to add code to our extended thread controller, and specifically extend the `setupThreadEdit()` method. The entire extended thread controller code will look like this:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Thread.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
 <?php
 
 namespace Demo\Portal\XF\Pub\Controller;
 
-class Thread extends XFCP_Thread
+class ThreadController extends XFCP_ThreadController
 {
 	public function setupThreadEdit(\XF\Entity\Thread $thread)
 	{
-		/** @var \Demo\Portal\XF\Service\Thread\Editor $editor */
+		/** @var \Demo\Portal\XF\Service\Thread\EditorService $editor */
 		$editor = parent::setupThreadEdit($thread);
 
 		$canFeatureUnfeature = $thread->canFeatureUnfeature();
@@ -854,8 +855,8 @@ We need to extend another method in the thread controller to handle a situation
 
 We just need to add the following code below the `setupThreadEdit()` method we added above:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Thread.php"
-public function finalizeThreadReply(\XF\Service\Thread\Replier $replier)
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
+public function finalizeThreadReply(\XF\Service\Thread\ReplierService $replier)
 {
 	parent::finalizeThreadReply($replier);
 
@@ -876,7 +877,7 @@ Note that we haven't actually returned anything in this method because it isn't
 
 For the final step in manually featuring/unfeaturing a thread, we need to go back to the forum controller and slightly change our existing code so that if featuring isn't automatic, we can handle it manually, instead. This should be fairly straight forward. Head into your extended forum controller, and replace this:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Thread.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
 if ($forum->demo_portal_auto_feature)
 {
 	$creator->setFeatureThread(true);
@@ -885,7 +886,7 @@ if ($forum->demo_portal_auto_feature)
 
 With this:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/Thread.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
 if ($forum->demo_portal_auto_feature)
 {
 	$creator->setFeatureThread(true);
@@ -1061,11 +1062,12 @@ You may have spotted earlier in the demo_portal_view template that each post we
 Right now, this is going to generate an additional query for each post. So, we should instead try to do a single query for all of the posts we are displaying and add them to the posts in advance. It probably sounds more complicated than it is. Just add the below code beneath the `->slice(0, $perPage, true);` line.
 
 ```php title="src/addons/Demo/Portal/Pub/Controller/Portal.php"
+use XF\Repository\AttachmentRepository;
+
 $threads = $featuredThreads->pluckNamed('Thread');
 $posts = $threads->pluckNamed('FirstPost', 'first_post_id');
 
-/** @var \XF\Repository\AttachmentRepository $attachRepo */
-$attachRepo = $this->repository('XF:Attachment');
+$attachRepo = $this->repository(AttachmentRepository::class);
 $attachRepo->addAttachmentsToContent($posts, 'post');
 ```
 
diff --git a/static/files/Demo-Portal-1.0.0 Alpha.zip b/static/files/Demo-Portal-1.0.0 Alpha.zip
index d463b8ea5a5101b66feb4067edfc639e7396bebe..3c71f6b1d0f7721c12422c147c8503561df81870 100644
GIT binary patch
delta 9623
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
AH2?qr

delta 9755
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
CqO@25


From 34dc6daf28e0174dc9c773cec12f931ffd813f28 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Thu, 22 Jan 2026 02:09:46 +0000
Subject: [PATCH 05/10] =?UTF-8?q?Addressed=20reviewed=20feedback:=20-=20Al?=
 =?UTF-8?q?ign=20filename=20in=20instructions=20with=20code=20block.=20-?=
 =?UTF-8?q?=20Fix=20article=20usage=20("a"=20=E2=86=92=20"an").=20-=20[Pos?=
 =?UTF-8?q?sibly]=20Replace=20hard=20tabs=20with=20spaces=20to=20satisfy?=
 =?UTF-8?q?=20MD010.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/devs/lets-build-an-add-on.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 8a7c2de..580d7c8 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -370,9 +370,9 @@ Finally, click save to save your template modification. If all has gone well, wh
 
 We have our column, we have a UI to pass an input to that column, now we have to handle saving data to that column. We will do this by extending the Forum controller and extending a special method which is called when a node and its data are saved. First, let's create a "Class extension" which can be found under the "Development" entry in the Admin CP. Click "Add class extension".
 
-Here we need to specify a "Base class name" which is the name of the class we are extending, which in this case will be `XF\Admin\Controller\ForumController`. And we need to specify a "Extension class name" which is the class which will extend the base class. Enter this as `Demo\Portal\XF\Admin\Controller\ForumController`. We should create that class before clicking Save.
+Here we need to specify a "Base class name" which is the name of the class we are extending, which in this case will be `XF\Admin\Controller\ForumController`. And we need to specify an "Extension class name" which is the class which will extend the base class. Enter this as `Demo\Portal\XF\Admin\Controller\ForumController`. We should create that class before clicking Save.
 
-Create a new file in `src/addons/Demo/Portal/XF/Admin/Controller` named `Forum.php`. This might seem like quite a long path, but we recommend a path like this for extended classes. It enables you to more easily identify the files that represent extended classes by virtue of the fact that they are in a directory of the same name as the extended "add-on" ID (in this case `XF`). It also makes it clear exactly which class has been extended as the directory structure follows the same path as the default class. The contents of the file should, for now, look like this:
+Create a new file in `src/addons/Demo/Portal/XF/Admin/Controller` named `ForumController.php`. This might seem like quite a long path, but we recommend a path like this for extended classes. It enables you to more easily identify the files that represent extended classes by virtue of the fact that they are in a directory of the same name as the extended "add-on" ID (in this case `XF`). It also makes it clear exactly which class has been extended as the directory structure follows the same path as the default class. The contents of the file should, for now, look like this:
 
 ```php title="src/addons/Demo/Portal/XF/Admin/Controller/ForumController.php"
 <?php
@@ -835,7 +835,7 @@ class ThreadController extends XFCP_ThreadController
 {
 	public function setupThreadEdit(\XF\Entity\Thread $thread)
 	{
-		/** @var \Demo\Portal\XF\Service\Thread\EditorService $editor */
+        /** @var \Demo\Portal\XF\Service\Thread\EditorService $editor */
 		$editor = parent::setupThreadEdit($thread);
 
 		$canFeatureUnfeature = $thread->canFeatureUnfeature();

From 9fdcfa6ec4b3ecba65669ed3fee83edf77191ae3 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Mon, 26 Jan 2026 21:01:30 +0000
Subject: [PATCH 06/10] Fix: directing user to the wrong admin option. `Basic
 board information` -> `Basic options`

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 580d7c8..1f629fa 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -706,7 +706,7 @@ public static function homePageUrl(&$homePageUrl, \XF\Mvc\Router $router)
 }
 ```
 
-Finally, we should consider changing the index page route to our portal page. Go to Admin CP and under Setup click Options followed by "Basic board information". Change the "Index page route" option to `portal/`.
+Finally, we should consider changing the index page route to our portal page. Go to Admin CP and under Setup click Options followed by "Basic options". Change the "Index page route" option to `portal/`.
 
 While you're in the Admin CP, let's see what happens now when you click on the Board title in the header. This should take you to your index page. All being well, that index page should now be your portal! In addition to that, the Home tab should be visible, and selected.
 

From df49a63ba2859b30999d25ad59c5013a11f440cd Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Mon, 26 Jan 2026 22:24:53 +0000
Subject: [PATCH 07/10] Fix: Correct controller filename in code block titles.

---
 docs/devs/lets-build-an-add-on.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 1f629fa..32d34f7 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -877,7 +877,7 @@ Note that we haven't actually returned anything in this method because it isn't
 
 For the final step in manually featuring/unfeaturing a thread, we need to go back to the forum controller and slightly change our existing code so that if featuring isn't automatic, we can handle it manually, instead. This should be fairly straight forward. Head into your extended forum controller, and replace this:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php"
 if ($forum->demo_portal_auto_feature)
 {
 	$creator->setFeatureThread(true);
@@ -886,7 +886,7 @@ if ($forum->demo_portal_auto_feature)
 
 With this:
 
-```php title="src/addons/Demo/Portal/XF/Pub/Controller/ThreadController.php"
+```php title="src/addons/Demo/Portal/XF/Pub/Controller/ForumController.php"
 if ($forum->demo_portal_auto_feature)
 {
 	$creator->setFeatureThread(true);

From 1202e213ed3d3e97fd84b3db7784070933966760 Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Mon, 26 Jan 2026 22:26:05 +0000
Subject: [PATCH 08/10] Fix: formatting inconsistency

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 32d34f7..9f1d689 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -1073,7 +1073,7 @@ $attachRepo->addAttachmentsToContent($posts, 'post');
 
 We use the `pluckNamed()` method first to get a collection of threads, then again to get a collection of the posts (keyed by the post ID) from the threads. Once we have the posts, we can just pass them into a special method in the attachment repo, which performs a single query and "hydrates" the Attachments relation for each post.
 
-The final permission related thing to finish up is to create a new permission to control who can feature / unfeature threads manually. To do this, in the Admin CP under "Development" click "Permission definitions" and click "Add permission". The "Permission group" will be "forum", "Permission ID" will be `demoPortalFeature`, "Title" should be `Can feature / unfeature threads`, set "Interface group" to `Forum moderator permissions` and after choosing an appropriate display order and ensuring your add-on is selected, click "Save".
+The final permission related thing to finish up is to create a new permission to control who can feature / unfeature threads manually. To do this, in the Admin CP under "Development" click "Permission definitions" and click "Add permission". The "Permission group" will be `forum`, "Permission ID" will be `demoPortalFeature`, "Title" should be `Can feature / unfeature threads`, set "Interface group" to `Forum moderator permissions` and after choosing an appropriate display order and ensuring your add-on is selected, click "Save".
 
 To actually use this permission, we need to go back to our extended thread entity to modify the `canFeatureUnfeature()` method. Replace `return true;` with:
 

From 749d0aae5784f1ce734181df182dfcafd9c8e77a Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Mon, 26 Jan 2026 22:26:33 +0000
Subject: [PATCH 09/10] Fix: Correct option field format from "Spin box" to
 "Number box"

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 9f1d689..261cc18 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -1089,7 +1089,7 @@ We currently display only 5 featured threads per page, but it would be nice to h
 
 In the Admin CP under Setup then Options click the "Add option group" button. We'll just call the "Group ID" `demoPortal` and give it a title of "Demo - Portal options". Give it an appropriate ̀"Description" and "Display order" and click "Save".
 
-Now click "Add option". Set the "Option ID" to `demoPortalFeaturedPerPage`, "Title" to `Featured threads per page`, edit format to `Spin box`, "Data type" to `Positive integer` and "Default value" to `10`. Click "Save".
+Now click "Add option". Set the "Option ID" to `demoPortalFeaturedPerPage`, "Title" to `Featured threads per page`, edit format to `Number box`, "Data type" to `Positive integer` and "Default value" to `10`. Click "Save".
 
 To implement that, go back to the portal controller and change:
 

From b56391c9f9e4436b0b625f0739ae56cf97b4322d Mon Sep 17 00:00:00 2001
From: QuackieMackie <dev.quackiemackie@gmail.com>
Date: Mon, 26 Jan 2026 22:26:55 +0000
Subject: [PATCH 10/10] Fix: Correct function reference in code example from
 `slice` to `sliceToPage`

---
 docs/devs/lets-build-an-add-on.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devs/lets-build-an-add-on.md b/docs/devs/lets-build-an-add-on.md
index 261cc18..d48bc6e 100644
--- a/docs/devs/lets-build-an-add-on.md
+++ b/docs/devs/lets-build-an-add-on.md
@@ -1059,7 +1059,7 @@ You may have spotted earlier in the demo_portal_view template that each post we
 'attachments': $post.attach_count ? $post.Attachments : [],
 ```
 
-Right now, this is going to generate an additional query for each post. So, we should instead try to do a single query for all of the posts we are displaying and add them to the posts in advance. It probably sounds more complicated than it is. Just add the below code beneath the `->slice(0, $perPage, true);` line.
+Right now, this is going to generate an additional query for each post. So, we should instead try to do a single query for all of the posts we are displaying and add them to the posts in advance. It probably sounds more complicated than it is. Just add the below code beneath the `->sliceToPage($page, $perPage);` line.
 
 ```php title="src/addons/Demo/Portal/Pub/Controller/Portal.php"
 use XF\Repository\AttachmentRepository;