Update page resource

Author: timdesm

src/OminityApiClient.php

@@ -18,7 +18,7 @@ class OminityApiClient
     /**
      * Version of our client.
      */
-    public const CLIENT_VERSION = "1.1.34";
+    public const CLIENT_VERSION = "1.1.35";
 
     /**
      * Endpoint of the remote API.

src/Resources/Cms/Page.php

@@ -4,6 +4,7 @@
 
 use Ominity\Api\Resources\BaseResource;
 use Ominity\Api\Resources\ResourceFactory;
+use Ominity\Api\Types\PageStatus;
 
 class Page extends BaseResource
 {
@@ -35,6 +36,13 @@ class Page extends BaseResource
      */
     public $slug;
 
+    /**
+     * Status of the page.
+     *
+     * @var string
+     */
+    public $status;
+
     /**
      * Page meta data for SEO puposes.
      *
@@ -99,20 +107,33 @@ class Page extends BaseResource
     public $_links;
 
     /**
-     * Is this page published?
+     * Is this page a draft?
      *
      * @return bool
      */
-    public function isPublished()
+    public function isDraft()
     {
-        if (is_null($this->publishedAt)) {
-            return false;
-        }
+        return $this->status === PageStatus::DRAFT;
+    }
 
-        $publishedTimestamp = strtotime($this->publishedAt);
-        $currentTimestamp = time();
+    /**
+     * Is this page scheduled?
+     *
+     * @return bool
+     */
+    public function isScheduled()
+    {
+        return $this->status === PageStatus::SCHEDULED;
+    }
 
-        return $publishedTimestamp <= $currentTimestamp;
+    /**
+     * Is this page published?
+     *
+     * @return bool
+     */
+    public function isPublished()
+    {
+        return $this->status === PageStatus::PUBLISHED;
     }
 
     /**
@@ -121,6 +142,14 @@ public function isPublished()
      */
     public function layout() 
     {
+        if (isset($this->_embedded, $this->_embedded->layout)) 
+        {
+            return ResourceFactory::createFromApiResult(
+                $this->_embedded->layout,
+                new Layout($this->client)
+            );
+        }
+
         return $this->client->cms->layouts->get($this->layoutId);
     }
 

src/Resources/Cms/PageComponent.php

@@ -4,6 +4,7 @@
 
 use Ominity\Api\Resources\BaseResource;
 use Ominity\Api\Resources\ResourceFactory;
+use Ominity\Api\Types\PageComponentStatus;
 
 class PageComponent extends BaseResource
 {
@@ -21,6 +22,20 @@ class PageComponent extends BaseResource
      */
     public $id;
 
+    /**
+     * Internal label of the page component.
+     *
+     * @var string
+     */
+    public $label;
+
+    /**
+     * Status of the page component.
+     *
+     * @var string
+     */
+    public $status;
+
     /**
      * The ID of the page for this page component.
      *
@@ -42,6 +57,14 @@ class PageComponent extends BaseResource
      */
     public $fields;
 
+    /** 
+     * UTC datetime the page component was published in ISO-8601 format.
+     *
+     * @example "2013-12-25T10:30:54+00:00"
+     * @var string|null
+     */
+    public $publishedAt;
+
     /** 
      * UTC datetime the page component was last updated in ISO-8601 format.
      *
@@ -63,6 +86,36 @@ class PageComponent extends BaseResource
      */
     public $_links;
 
+    /**
+     * Is this page component a draft?
+     *
+     * @return bool
+     */
+    public function isDraft()
+    {
+        return $this->status === PageComponentStatus::DRAFT;
+    }
+
+    /**
+     * Is this page component scheduled?
+     *
+     * @return bool
+     */
+    public function isScheduled()
+    {
+        return $this->status === PageComponentStatus::SCHEDULED;
+    }
+
+    /**
+     * Is this page component published?
+     *
+     * @return bool
+     */
+    public function isPublished()
+    {
+        return $this->status === PageComponentStatus::PUBLISHED;
+    }
+
     /**
      * @return Page
      * @throws ApiException

src/Types/PageComponentStatus.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Ominity\Api\Types;
+
+class PageComponentStatus
+{
+    public const DRAFT = 'draft';
+    public const SCHEDULED = 'scheduled';
+    public const PUBLISHED = 'published';
+}

src/Types/PageStatus.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Ominity\Api\Types;
+
+class PageStatus
+{
+    public const DRAFT = 'draft';
+    public const SCHEDULED = 'scheduled';
+    public const PUBLISHED = 'published';
+}