Merge pull request #42 from boly38/feature/repeatingAttributes

Fixes #41 an Article with N Comments

src/ContextTypes/AbstractContext.php

@@ -168,7 +168,7 @@ protected function setProperty($key, $property, $value = null)
         }
 
         // Map properties to object
-        if (is_array($value)) {
+        if ($property !== null && is_array($property) && is_array($value)) {
             return $this->properties[$key] = $this->mapProperty($property, $value);
         }
 

src/ContextTypes/Article.php

@@ -2,41 +2,35 @@
 
 namespace JsonLd\ContextTypes;
 
-class Article extends AbstractContext
+class Article extends CreativeWork
 {
     /**
      * Property structure
+     * reference: https://schema.org/Article (alphabetical order)
      *
      * @var array
      */
-    protected $structure = [
-        'name' => null,
-        'url' => null,
-        'description' => null,
-
-        'image' => ImageObject::class,
-        'video' => VideoObject::class,
-        'thumbnailUrl' => null,
-        'text' => null,
-        'review' => Review::class,
-        'publisher' => Organization::class,
-        'keywords' => null,
-        'inLanguage' => null,
-        'dateCreated' => null,
-        'dateModified' => null,
-        'datePublished' => null,
-        'author' => Person::class,
-        'aggregateRating' => AggregateRating::class,
-
+    private $extendedStructure = [
         'articleBody' => null,
         'articleSection' => null,
         'pageEnd' => null,
         'pageStart' => null,
         'pagination' => null,
+        'wordCount' => null,
         'mainEntityOfPage' => WebPage::class,
-        'headline' => null,
     ];
 
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct($attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure));
+    }
+
     /**
      * Set the description attribute.
      *

src/ContextTypes/Comment.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+class Comment extends CreativeWork 
+{
+    /**
+     * Property structure.
+     * reference: https://schema.org/Comment (alphabetical order)
+     *
+     * @var array
+     */
+    private $extendedStructure = [
+        'downvoteCount' => null,
+        'upvoteCount' => null,
+    ];
+
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct(
+            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
+        );
+    }
+}

src/ContextTypes/CreativeWork.php

@@ -2,32 +2,49 @@
 
 namespace JsonLd\ContextTypes;
 
-class CreativeWork extends AbstractContext
+class CreativeWork extends Thing
 {
     /**
      * Property structure
+     * reference: https://schema.org/CreativeWork (alphabetical order)
      *
      * @var array
      */
-    protected $structure = [
-        'name' => null,
-        'url' => null,
+    private $extendedStructure = [
+        'about' => Thing::class,
         'aggregateRating' => AggregateRating::class,
+        'alternativeHeadline' => null,
         'author' => Person::class,
+        'comment' => Comment::class,
+        'commentCount' => null,
         'creator' => Person::class,
         'dateCreated' => null,
         'dateModified' => null,
         'datePublished' => null,
         'headline' => null,
-        'image' => ImageObject::class,
         'inLanguage' => null,
+        'keywords' => null,
+        'mainEntity' => Thing::class,
         'publisher' => Organization::class,
         'review' => Review::class,
         'text' => null,
         'thumbnailUrl' => null,
         'video' => VideoObject::class,
     ];
 
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct(
+            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
+        );
+    }
+
     /**
      * Set the article body attribute.
      *
@@ -38,4 +55,21 @@ protected function setTextAttribute($txt)
     {
         return $this->truncate($txt, 260);
     }
-}
+
+    /**
+     * Set the comments
+     *
+     * @param array $items
+     * @return array
+     */
+    protected function setCommentAttribute($items)
+    {
+        if (is_array($items) === false) {
+            return $items;
+        }
+
+        return array_map(function ($item) {
+            return $this->getNestedContext(Comment::class, $item);
+        }, $items);
+    }
+}

src/ContextTypes/Person.php

@@ -2,14 +2,64 @@
 
 namespace JsonLd\ContextTypes;
 
-class Person extends AbstractContext
+class Person extends Thing
 {
     /**
      * Property structure
+     * reference: https://schema.org/Person (alphabetical order)
      *
      * @var array
      */
-    protected $structure = [
-        'name' => null,
+    protected $extendedStructure = [
+        'additionalName' => null,
+        'address' => null, // PostalAddress or Text
+        'affiliation' => null,
+        'alumniOf' => null,
+        'award' => null,
+        'birthDate' => null,
+        'birthPlace' => Place::class,
+        'brand' => null,
+        'children' => Person::class,
+        'colleague' => null,
+        'contactPoint' => null,
+        'deathDate' => null,
+        'deathPlace' => Place::class,
+        'duns' => null,
+        'email' => null,
+        'familyName' => null,
+        'faxNumber' => null,
+        'follows' => Person::class,
+        'homeLocation' => Place::class,
+        'givenName' => null,
+        'jobTitle' => null,
+        'parent' => Person::class,
+        'telephone' => null,
+        'workLocation' => Place::class,
     ];
-}
+
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct($attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure));
+    }
+
+    /**
+     * Set the address
+     *
+     * @param array $items
+     * @return array
+     */
+    protected function setAddressAttribute($items)
+    {
+        if (is_array($items) === false) {
+            return $items;
+        }
+
+        return $this->getNestedContext(PostalAddress::class, $items);
+    }
+}

src/ContextTypes/Place.php

@@ -2,17 +2,29 @@
 
 namespace JsonLd\ContextTypes;
 
-class Place extends AbstractContext
+class Place extends Thing
 {
     /**
      * Property structure
      *
      * @var array
      */
-    protected $structure = [
-        'name' => null,
+    protected $extendedStructure = [
         'address' => PostalAddress::class,
         'review' => Review::class,
         'aggregateRating' => AggregateRating::class,
     ];
+
+
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct($attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure));
+    }
+
 }

src/ContextTypes/Sculpture.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace JsonLd\ContextTypes;
+
+class Sculpture extends CreativeWork 
+{
+    /**
+     * Property structure.
+     *
+     * @var array
+     */
+    private $extendedStructure = [];
+
+    /**
+     * Constructor. Merges extendedStructure up
+     *
+     * @param array $attributes
+     * @param array $extendedStructure
+     */
+    public function __construct(array $attributes, array $extendedStructure = [])
+    {
+        parent::__construct(
+            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
+        );
+    }
+}

src/ContextTypes/Thing.php

@@ -6,14 +6,17 @@ class Thing extends AbstractContext
 {
     /**
      * Property structure
+     * reference: https://schema.org/Thing (alphabetical order)
      *
      * @var array
      */
     protected $structure = [
-        'name' => null,
         'alternateName' => null,
         'description' => null,
-        'image' => null,
+        'image' => ImageObject::class,
+        'mainEntityOfPage' => WebPage::class,
+        'name' => null,
+        'sameAs' => null,
         'url' => null,
     ];
 
@@ -40,4 +43,4 @@ protected function setTypeAttribute($type)
         // TODO: Add type validation
         return $type;
     }
-}
+}