normalize

Author: bepsvpt

src/Facades/WordPress.php

@@ -12,18 +12,18 @@
 use Storipress\WordPress\Requests\User;
 
 /**
+ * @method static GeneralRequest request()
+ * @method static User user()
  * @method static Post post()
  * @method static Category category()
  * @method static Tag tag()
- * @method static User user()
- * @method static GeneralRequest request()
- * @method static \Storipress\WordPress\WordPress setSite(string $site)
+ * @method static \Storipress\WordPress\WordPress instance()
  * @method static \Storipress\WordPress\WordPress site()
- * @method static \Storipress\WordPress\WordPress setUsername(string $username)
+ * @method static \Storipress\WordPress\WordPress setSite(string $site)
  * @method static \Storipress\WordPress\WordPress username()
- * @method static \Storipress\WordPress\WordPress setApplicationKey(string $key)
- * @method static \Storipress\WordPress\WordPress applicationKey()
- * @method static \Storipress\WordPress\WordPress instance()
+ * @method static \Storipress\WordPress\WordPress setUsername(string $username)
+ * @method static \Storipress\WordPress\WordPress password()
+ * @method static \Storipress\WordPress\WordPress setPassword(string $password)
  */
 class WordPress extends Facade
 {

src/Objects/Post.php

@@ -14,7 +14,7 @@ class Post extends WordPressObject
 
     public string $date_gmt;
 
-    public RenderObject $guid;
+    public Render $guid;
 
     public string $modified;
 
@@ -30,11 +30,11 @@ class Post extends WordPressObject
 
     public string $link;
 
-    public RenderObject $title;
+    public Render $title;
 
-    public RenderObject $content;
+    public Render $content;
 
-    public RenderObject $excerpt;
+    public Render $excerpt;
 
     public int $author;
 
@@ -64,13 +64,13 @@ class Post extends WordPressObject
 
     public static function from(stdClass $data): static
     {
-        $data->guid = RenderObject::from($data->guid);
+        $data->guid = Render::from($data->guid);
 
-        $data->title = RenderObject::from($data->title);
+        $data->title = Render::from($data->title);
 
-        $data->content = RenderObject::from($data->content);
+        $data->content = Render::from($data->content);
 
-        $data->excerpt = RenderObject::from($data->excerpt);
+        $data->excerpt = Render::from($data->excerpt);
 
         return parent::from($data);
     }

src/Objects/RenderObject.php renamed to src/Objects/Render.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Storipress\WordPress\Objects;
 
-class RenderObject extends WordPressObject
+class Render extends WordPressObject
 {
     public ?string $raw;
 

src/Requests/Category.php

@@ -13,7 +13,7 @@ class Category extends Request
     /**
      * https://developer.wordpress.org/rest-api/reference/categories/#list-categories
      *
-     * @return CategoryObject[]
+     * @return array<int, CategoryObject>
      *
      * @throws HttpException
      * @throws UnexpectedValueException

src/Requests/GeneralRequest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Storipress\WordPress\Requests;
 
 use stdClass;
@@ -9,7 +11,7 @@ class GeneralRequest extends Request
     /**
      * @param  non-empty-string  $path
      * @param  array<mixed>  $arguments
-     * @return stdClass|stdClass[]
+     * @return stdClass|array<int, stdClass>
      *
      * @throws \Storipress\WordPress\Exceptions\HttpException
      * @throws \Storipress\WordPress\Exceptions\UnexpectedValueException
@@ -22,7 +24,7 @@ public function get(string $path, array $arguments): stdClass|array
     /**
      * @param  non-empty-string  $path
      * @param  array<mixed>  $arguments
-     * @return stdClass|stdClass[]
+     * @return stdClass|array<int, stdClass>
      *
      * @throws \Storipress\WordPress\Exceptions\HttpException
      * @throws \Storipress\WordPress\Exceptions\UnexpectedValueException
@@ -35,7 +37,7 @@ public function post(string $path, array $arguments): stdClass|array
     /**
      * @param  non-empty-string  $path
      * @param  array<mixed>  $arguments
-     * @return stdClass|stdClass[]
+     * @return stdClass|array<int, stdClass>
      *
      * @throws \Storipress\WordPress\Exceptions\HttpException
      * @throws \Storipress\WordPress\Exceptions\UnexpectedValueException

src/Requests/Post.php

@@ -13,7 +13,7 @@ class Post extends Request
     /**
      * https://developer.wordpress.org/rest-api/reference/posts/#list-posts
      *
-     * @return PostObject[]
+     * @return array<int, PostObject>
      *
      * @throws HttpException
      * @throws UnexpectedValueException

src/Requests/Request.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Storipress\WordPress\Requests;
 
 use Illuminate\Http\Client\Response;
@@ -24,7 +26,7 @@ public function __construct(
      * @param  'get'|'post'|'patch'|'delete'  $method
      * @param  non-empty-string  $path
      * @param  array<mixed>  $options
-     * @return ($method is 'delete' ? bool : stdClass|stdClass[])
+     * @return ($method is 'delete' ? bool : stdClass|array<int, stdClass>)
      *
      * @throws UnexpectedValueException
      * @throws HttpException
@@ -37,7 +39,7 @@ protected function request(
         $response = $this
             ->app
             ->http
-            ->withBasicAuth($this->app->username(), $this->app->applicationKey())
+            ->withBasicAuth($this->app->username(), $this->app->password())
             ->{$method}($this->getUrl($path), $options);
 
         if (!($response instanceof Response)) {

src/Requests/Tag.php

@@ -13,7 +13,7 @@ class Tag extends Request
     /**
      * https://developer.wordpress.org/rest-api/reference/tags/#list-tags
      *
-     * @return TagObject[]
+     * @return array<int, TagObject>
      *
      * @throws HttpException
      * @throws UnexpectedValueException

src/Requests/User.php

@@ -13,7 +13,7 @@ class User extends Request
     /**
      * https://developer.wordpress.org/rest-api/reference/users/#list-users
      *
-     * @return UserObject[]
+     * @return array<int, UserObject>
      *
      * @throws HttpException
      * @throws UnexpectedValueException

src/WordPress.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Storipress\WordPress;
 
 use Illuminate\Http\Client\Factory;
@@ -11,75 +13,85 @@
 
 class WordPress
 {
-    protected readonly Post $post;
+    protected readonly GeneralRequest $request;
 
-    protected readonly Tag $tag;
+    protected readonly User $user;
 
-    protected readonly Category $category;
+    protected readonly Post $post;
 
-    protected readonly User $user;
+    protected readonly Category $category;
 
-    protected readonly GeneralRequest $request;
+    protected readonly Tag $tag;
 
     protected string $site;
 
     protected string $username;
 
-    protected string $applicationKey;
+    protected string $password;
 
     public function __construct(
         public Factory $http,
     ) {
-        $this->post = new Post($this);
+        $this->request = new GeneralRequest($this);
 
-        $this->tag = new Tag($this);
+        $this->user = new User($this);
 
-        $this->category = new Category($this);
+        $this->post = new Post($this);
 
-        $this->user = new User($this);
+        $this->category = new Category($this);
 
-        $this->request = new GeneralRequest($this);
+        $this->tag = new Tag($this);
     }
 
     public function instance(): static
     {
         return $this;
     }
 
-    public function setApplicationKey(string $key): static
+    public function site(): string
+    {
+        return $this->site;
+    }
+
+    public function setSite(string $site): static
     {
-        $this->applicationKey = $key;
+        $this->site = $site;
 
         return $this;
     }
 
-    public function applicationKey(): string
+    public function username(): string
     {
-        return $this->applicationKey;
+        return $this->username;
     }
 
-    public function setSite(string $site): static
+    public function setUsername(string $username): static
     {
-        $this->site = $site;
+        $this->username = $username;
 
         return $this;
     }
 
-    public function site(): string
+    public function password(): string
     {
-        return $this->site;
+        return $this->password;
     }
 
-    public function setUsername(string $username): static
+    public function setPassword(string $key): static
     {
-        $this->username = $username;
+        $this->password = $key;
 
         return $this;
     }
 
-    public function username(): string
+    public function request(): GeneralRequest
     {
-        return $this->username;
+        return $this->request;
+    }
+
+    public function user(): User
+    {
+        return $this->user;
     }
 
     public function post(): Post
@@ -96,14 +108,4 @@ public function tag(): Tag
     {
         return $this->tag;
     }
-
-    public function user(): User
-    {
-        return $this->user;
-    }
-
-    public function request(): GeneralRequest
-    {
-        return $this->request;
-    }
 }