Create new auto inherit structure for context attributes ($structure)…

…. Attributes in the $structure property are now automatically merged with all parent classes

src/ContextTypes/AbstractContext.php

@@ -31,20 +31,6 @@ abstract class AbstractContext implements ContextTypeInterface
         'name' => '',
     ];
 
-    /**
-     * Property structure
-     *
-     * @var array
-     */
-    protected $extendStructure = [];
-
-    /**
-     * Property structure, will be merged up for objects extending Thing
-     *
-     * @var array
-     */
-    private $extendedStructure = [];
-
     /**
      * Create a new context type instance
      *
@@ -56,6 +42,11 @@ public function __construct(array $attributes = [])
         $path = explode('\\', get_class($this));
         $this->type = end($path);
 
+        $class = get_called_class();
+        while ($class = get_parent_class($class)) {
+            $this->structure += get_class_vars($class)['structure'];
+        }
+
         // Set attributes
         $this->fill($attributes);
     }
@@ -89,7 +80,7 @@ public function fill(array $attributes)
             '@context' => 'http://schema.org',
             '@type' => $this->type,
             'sameAs' => null
-        ], $this->structure, $this->extendStructure);
+        ], $this->structure);
 
         // Set properties from attributes
         foreach ($properties as $key => $property) {

src/ContextTypes/Article.php

@@ -12,7 +12,7 @@ class Article extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'articleBody' => null,
         'articleSection' => null,
         'pageEnd' => null,
@@ -22,17 +22,6 @@ class Article extends CreativeWork
         'mainEntityOfPage' => WebPage::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
     /**
      * {@inheritDoc}
      */

src/ContextTypes/Audiobook.php

@@ -12,21 +12,11 @@ class Audiobook extends Book
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'caption' => MediaObject::class,
         'transcript' => null,
         'duration' => Duration::class,
         'readBy' => Person::class,
     ];
 
-    /**
-     * @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/BlogPosting.php

@@ -9,7 +9,7 @@ class BlogPosting extends Article
      *
      * @var array
      */
-    protected $extendStructure = [
+    protected $structure = [
         'sharedContent' => CreativeWork::class,
     ];
 }

src/ContextTypes/Book.php

@@ -15,7 +15,7 @@ class Book extends CreativeWork
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'abridged' => null,
         'bookEdition' => null,
         'bookFormat' => BookFormatType::class,
@@ -24,14 +24,4 @@ class Book extends CreativeWork
         'numberOfPages' => null,
     ];
 
-    /**
-     * @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/BookFormatType.php

@@ -52,16 +52,5 @@ class BookFormatType extends Enumeration
      *
      * @var array
      */
-    protected $extendedStructure = [];
-
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
+    protected $structure = [];
 }

src/ContextTypes/Comment.php

@@ -12,19 +12,9 @@ class Comment extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'downvoteCount' => null,
         'upvoteCount' => null,
     ];
 
-    /**
-     * @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/Corporation.php

@@ -9,20 +9,8 @@ class Corporation extends Organization
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'tickerSymbol' => null,
     ];
 
-    /**
-     * Corporation 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

@@ -12,7 +12,7 @@ class CreativeWork extends Thing
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'about' => Thing::class,
         'aggregateRating' => AggregateRating::class,
         'alternativeHeadline' => null,
@@ -35,17 +35,6 @@ class CreativeWork extends Thing
         'video' => VideoObject::class,
     ];
 
-    /**
-     * @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.
      *

src/ContextTypes/Enumeration.php

@@ -14,18 +14,8 @@ class Enumeration extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'supersededBy' => Enumeration::class,
     ];
 
-    /**
-     * @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/Event.php

@@ -9,7 +9,7 @@ class Event extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'name' => null,
         'startDate' => null,
         'endDate' => null,
@@ -18,17 +18,6 @@ class Event extends Thing
         'location' => Place::class,
     ];
 
-    /**
-     * @param array $attributes
-     * @param array $extendedStructure
-     */
-    public function __construct(array $attributes, array $extendedStructure = [])
-    {
-        parent::__construct(
-            $attributes, array_merge($this->structure, $this->extendedStructure, $extendedStructure)
-        );
-    }
-
     /**
      * Set offers attributes.
      *

src/ContextTypes/MediaObject.php

@@ -20,7 +20,7 @@ class MediaObject extends CreativeWork
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'associatedArticle' => NewsArticle::class,
         'bitrate' => null,
         'contentSize' => null,
@@ -40,14 +40,4 @@ class MediaObject extends CreativeWork
         'width' => QuantitativeValue::class,
     ];
 
-    /**
-     * @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/Organization.php

@@ -9,25 +9,14 @@ class Organization extends Thing
      *
      * @var array
      */
-    private $extendedStructure = [
+    protected $structure = [
         'address' => PostalAddress::class,
         'logo' => ImageObject::class,
         'contactPoint' => ContactPoint::class,
         'email' => null,
         'hasPOS' => Place::class,
     ];
 
-    /**
-     * @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 contactPoints
      *

src/ContextTypes/Person.php

@@ -12,7 +12,7 @@ class Person extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'additionalName' => null,
         'address' => null, // PostalAddress or Text
         'affiliation' => null,
@@ -39,15 +39,6 @@ class Person extends Thing
         'workLocation' => Place::class,
     ];
 
-    /**
-     * @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
      *

src/ContextTypes/Place.php

@@ -9,18 +9,10 @@ class Place extends Thing
      *
      * @var array
      */
-    protected $extendedStructure = [
+    protected $structure = [
         'address' => PostalAddress::class,
         'review' => Review::class,
         'aggregateRating' => AggregateRating::class,
     ];
 
-    /**
-     * @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

@@ -9,18 +9,6 @@ class Sculpture extends CreativeWork
      *
      * @var array
      */
-    private $extendedStructure = [];
+    protected $structure = [];
 
-    /**
-     * 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)
-        );
-    }
 }