Page -> PageInterface, News deleted

src/Collections/PageCollection.php

@@ -3,9 +3,9 @@
 namespace Plasticode\Collections;
 
 use Plasticode\Collections\Basic\DbModelCollection;
-use Plasticode\Models\Page;
+use Plasticode\Models\Interfaces\PageInterface;
 
 class PageCollection extends DbModelCollection
 {
-    protected string $class = Page::class;
+    protected string $class = PageInterface::class;
 }

src/Config/Bootstrap.php

@@ -61,8 +61,6 @@
 use Plasticode\Repositories\Idiorm\Basic\RepositoryContext;
 use Plasticode\Repositories\Idiorm\MenuItemRepository;
 use Plasticode\Repositories\Idiorm\MenuRepository;
-use Plasticode\Repositories\Idiorm\NewsRepository;
-use Plasticode\Repositories\Idiorm\PageRepository;
 use Plasticode\Repositories\Idiorm\RoleRepository;
 use Plasticode\Repositories\Idiorm\TagRepository;
 use Plasticode\Repositories\Idiorm\UserRepository;
@@ -250,18 +248,6 @@ function ($record) use ($c) {
                 )
             );
 
-        $map['newsRepository'] = fn (CI $c) =>
-            new NewsRepository(
-                $c->repositoryContext,
-                $c->tagRepository
-            );
-
-        $map['pageRepository'] = fn (CI $c) =>
-            new PageRepository(
-                $c->repositoryContext,
-                $c->tagRepository
-            );
-
         $map['roleRepository'] = fn (CI $c) =>
             new RoleRepository(
                 $c->repositoryContext

src/Models/Interfaces/PageInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Plasticode\Models\Interfaces;
+
+interface PageInterface extends DbModelInterface
+{
+    function isPublished() : bool;
+    function getSlug() : string;
+}

src/Parsing/LinkMappers/PageLinkMapper.php

@@ -16,14 +16,9 @@
  */
 class PageLinkMapper extends EntityLinkMapper
 {
-    /** @var PageRepositoryInterface */
-    private $pageRepository;
-
-    /** @var TagRepositoryInterface */
-    private $tagRepository;
-
-    /** @var TagLinkMapper */
-    private $tagLinkMapper;
+    private PageRepositoryInterface $pageRepository;
+    private TagRepositoryInterface $tagRepository;
+    private TagLinkMapper $tagLinkMapper;
 
     public function __construct(
         PageRepositoryInterface $pageRepository,
@@ -53,9 +48,7 @@ protected function baseUrl() : string
     /**
      * Maps page chunks to a page link.
      *
-     * @param SlugChunk $slugChunk
      * @param string[] $otherChunks
-     * @return string|null
      */
     public function mapSlug(SlugChunk $slugChunk, array $otherChunks) : ?string
     {
@@ -68,7 +61,7 @@ public function mapSlug(SlugChunk $slugChunk, array $otherChunks) : ?string
             $page = $this->pageRepository->getBySlug($slug);
 
             if ($page && $page->isPublished()) {
-                return $this->renderPlaceholder($page->slug, $content);
+                return $this->renderPlaceholder($page->getSlug(), $content);
             }
         }
 

src/Parsing/Parsers/DoubleBracketsParser.php

@@ -10,7 +10,8 @@
 use Plasticode\Util\Arrays;
 
 /**
- * Parses double brackets tags such as [[about|About]] page or [[news:123|Some cool news]] news links.
+ * Parses double brackets tags such as [[about|About]] page
+ * or [[news:123|Some cool news]] news links.
  * 
  * - Default mapper parses [[slug|Content]] links.
  * - Tag mappers parse [[tag:id|Content]] links.
@@ -74,7 +75,6 @@ private function parseDoubleBracketsMatch(?string $match) : ?string
      * Render no-tag link.
      *
      * @param string[] $chunks
-     * @return string|null
      */
     private function renderDefault(array $chunks) : ?string
     {
@@ -88,9 +88,7 @@ private function renderDefault(array $chunks) : ?string
     /**
      * Renders tag link.
      *
-     * @param string $tag
      * @param string[] $chunks
-     * @return string|null
      */
     private function renderTag(string $tag, array $chunks) : ?string
     {
@@ -106,9 +104,6 @@ private function renderTag(string $tag, array $chunks) : ?string
 
     /**
      * Renders %template% links using registered link renderers.
-     * 
-     * @param ParsingContext $context
-     * @return ParsingContext
      */
     public function renderLinks(ParsingContext $context) : ParsingContext
     {

src/Repositories/Interfaces/PageRepositoryInterface.php

@@ -2,9 +2,9 @@
 
 namespace Plasticode\Repositories\Interfaces;
 
-use Plasticode\Models\Page;
+use Plasticode\Models\Interfaces\PageInterface;
 
 interface PageRepositoryInterface
 {
-    function getBySlug(?string $slug) : ?Page;
+    function getBySlug(?string $slug) : ?PageInterface;
 }

src/Testing/Dummies/PageDummy.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Plasticode\Testing\Dummies;
+
+use Plasticode\Models\DbModel;
+use Plasticode\Models\Interfaces\PageInterface;
+use Plasticode\Models\Traits\FullPublished;
+
+/**
+ * @property integer $id
+ * @property string $slug
+ * @property string $title
+ * @property string|null $text
+ */
+class PageDummy extends DbModel implements PageInterface
+{
+    use FullPublished;
+
+    public function getSlug() : string
+    {
+        return $this->slug;
+    }
+}

src/Testing/Mocks/Repositories/PageRepositoryMock.php

@@ -3,7 +3,7 @@
 namespace Plasticode\Testing\Mocks\Repositories;
 
 use Plasticode\Collections\PageCollection;
-use Plasticode\Models\Page;
+use Plasticode\Models\Interfaces\PageInterface;
 use Plasticode\Repositories\Interfaces\PageRepositoryInterface;
 use Plasticode\Testing\Seeders\Interfaces\ArraySeederInterface;
 
@@ -16,10 +16,12 @@ public function __construct(ArraySeederInterface $pageSeeder)
         $this->pages = PageCollection::make($pageSeeder->seed());
     }
 
-    public function getBySlug(?string $slug) : ?Page
+    public function getBySlug(?string $slug) : ?PageInterface
     {
-        return $this->pages
-            ->where('slug', $slug)
-            ->first();
+        return $this
+            ->pages
+            ->first(
+                fn (PageInterface $p) => $p->getSlug() == $slug
+            );
     }
 }

src/Testing/Seeders/PageSeeder.php

@@ -2,19 +2,19 @@
 
 namespace Plasticode\Testing\Seeders;
 
-use Plasticode\Models\Page;
+use Plasticode\Testing\Dummies\PageDummy;
 use Plasticode\Testing\Seeders\Interfaces\ArraySeederInterface;
 use Plasticode\Util\Date;
 
 class PageSeeder implements ArraySeederInterface
 {
     /**
-     * @return Page[]
+     * @return PageDummy[]
      */
     public function seed() : array
     {
         return [
-            new Page(
+            new PageDummy(
                 [
                     'id' => 1,
                     'slug' => 'about-us',
@@ -24,7 +24,7 @@ public function seed() : array
                     'published_at' => Date::dbNow(),
                 ]
             ),
-            new Page(
+            new PageDummy(
                 [
                     'id' => 2,
                     'slug' => 'illidan-stormrage',