Merge pull request #462 from hydephp/437-refactor-author-model-to-use-same-format-for-create-method-as-constructor

Clean up author model hydephp/develop@e040a51

Author: github-actions

src/Models/Author.php

@@ -5,10 +5,9 @@
 use Illuminate\Support\Collection;
 
 /**
- * The Post Author Object Model.
+ * The Post Author model object.
  *
- * @todo #437 Refactor to use same format for create method as constructor
- * @phpstan-consistent-constructor
+ * @see \Hyde\Framework\Testing\Feature\AuthorTest
  */
 class Author implements \Stringable
 {
@@ -46,61 +45,52 @@ class Author implements \Stringable
      * @param  string  $username
      * @param  array|null  $data
      */
-    public function __construct(string $username, ?array $data = [])
+    final public function __construct(string $username, ?array $data = [])
     {
         $this->username = $username;
+
         if (isset($data['name'])) {
             $this->name = $data['name'];
         }
+
         if (isset($data['website'])) {
             $this->website = $data['website'];
         }
     }
 
-    public function __toString(): string
+    /** Dynamically get or create an author based on a username string or front matter array */
+    final public static function make(string|array $data): static
     {
-        return $this->getName();
+        if (is_string($data)) {
+            return static::get($data);
+        }
+
+        return static::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
     }
 
-    /**
-     * Get the author's preferred name.
-     *
-     * @see \Hyde\Framework\Testing\Unit\AuthorGetNameTest
-     *
-     * @return string
-     */
-    public function getName(): string
+    public static function get(string $username): static
     {
-        return $this->name ?? $this->username;
+        return static::all()->firstWhere('username', $username) ?? static::create($username);
     }
 
-    public static function create(string $username, ?string $name = null, ?string $website = null): static
+    public static function all(): Collection
     {
-        return new static($username, [
-            'name' => $name,
-            'website'=> $website,
-        ]);
+        return new Collection(config('authors', []));
     }
 
-    /** Dynamically get or create an author based on string or front matter array */
-    public static function make(string|array $data): static
+    public static function create(string $username, ?string $name = null, ?string $website = null): static
     {
-        if (is_string($data)) {
-            return static::get($data);
-        }
-
-        return static::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
+        return new static($username, ['name' => $name, 'website' => $website]);
     }
 
-    public static function all(): Collection
+    public function __toString(): string
     {
-        return new Collection(config('authors', []));
+        return $this->getName();
     }
 
-    public static function get(string $username): static
+    public function getName(): string
     {
-        return static::all()->firstWhere('username', $username)
-            ?? static::create($username);
+        return $this->name ?? $this->username;
     }
 
     protected static function findUsername(array $data): string

tests/Feature/AuthorHelperTest.php tests/Feature/AuthorTest.php

@@ -8,11 +8,9 @@
 use Illuminate\Support\Facades\Config;
 
 /**
- * Class AuthorHelperTest.
- *
  * @covers \Hyde\Framework\Models\Author
  */
-class AuthorHelperTest extends TestCase
+class AuthorTest extends TestCase
 {
     public function test_create_method_creates_new_author_model()
     {