Optional properties fix

Author: sebastiandedeyne

generate.php

@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 
 if (file_exists(__DIR__.'/vendor/autoload.php')) {

generator/Parser/RdfaParser.php

@@ -62,6 +62,11 @@ protected function parseProperties()
                 $property = new Property();
 
                 $property->name = $this->getText($node, '[property="rdfs:label"]');
+
+                if (empty($property->name)) {
+                    return;
+                }
+
                 $property->description = $this->getText($node, '[property="rdfs:comment"]');
                 $property->resource = $this->getAttribute($node, 'resource');
 

src/BaseType.php

@@ -2,7 +2,6 @@
 
 namespace Spatie\SchemaOrg;
 
-use DateTimeInterface;
 use ReflectionClass;
 use Spatie\SchemaOrg\Exceptions\InvalidProperty;
 
@@ -40,43 +39,27 @@ public function getProperties(): array
 
     public function toArray(): array
     {
-        $properties = $this->serialize($this->getProperties());
+        $properties = array_map(function ($property) {
+            if ($property instanceof Type) {
+                $property = $property->toArray();
+                unset($property['@context']);
+            }
+
+            if (is_object($property)) {
+                throw new InvalidProperty();
+            }
+
+            return $property;
+        }, $this->getProperties());
 
         return [
             '@context' => $this->getContext(),
             '@type' => $this->getType(),
         ] + $properties;
     }
 
-    protected function serialize($property)
-    {
-        if (is_array($property)) {
-            return array_map(function ($property) {
-                return $this->serialize($property);
-            }, $property);
-        }
-
-        if ($property instanceof Type) {
-            $property = $property->toArray();
-            unset($property['@context']);
-            return $property;
-        }
-
-        if ($property instanceof DateTimeInterface) {
-            return $property->format('c');
-        }
-
-        if (is_object($property)) {
-            throw new InvalidProperty();
-        }
-
-        return $property;
-    }
-
     public function toScript(): string
     {
-        return '<script type="application/ld+json">'.
-            json_encode($this->toArray()).
-        '</script>';
+        return '<script type="application/ld+json">'.json_encode($this->toArray()).'</script>';
     }
 }

src/DatedMoneySpecification.php

@@ -41,32 +41,4 @@ public function currency($currency)
         return $this->setProperty('currency', $currency);
     }
 
-    /**
-     * 
-     *
-     * @param \DateTimeInterface $
-     *
-     * @return static
-     *
-     * @see http://schema.org/startDate
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
-    /**
-     * 
-     *
-     * @param \DateTimeInterface $
-     *
-     * @return static
-     *
-     * @see http://schema.org/endDate
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
 }

src/MusicRelease.php

@@ -39,20 +39,6 @@ public function creditedTo($creditedTo)
         return $this->setProperty('creditedTo', $creditedTo);
     }
 
-    /**
-     * 
-     *
-     * @param  $
-     *
-     * @return static
-     *
-     * @see http://schema.org/duration
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
     /**
      * Format of this release (the type of recording media used, ie. compact
      * disc, digital media, LP, etc.).

src/VisualArtwork.php

@@ -70,48 +70,6 @@ public function artworkSurface($artworkSurface)
         return $this->setProperty('artworkSurface', $artworkSurface);
     }
 
-    /**
-     * 
-     *
-     * @param  $
-     *
-     * @return static
-     *
-     * @see http://schema.org/width
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
-    /**
-     * 
-     *
-     * @param  $
-     *
-     * @return static
-     *
-     * @see http://schema.org/height
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
-    /**
-     * 
-     *
-     * @param  $
-     *
-     * @return static
-     *
-     * @see http://schema.org/depth
-     */
-    public function ($)
-    {
-        return $this->setProperty('', $);
-    }
-
     /**
      * The number of copies when multiple copies of a piece of artwork are
      * produced - e.g. for a limited edition of 20 prints, 'artEdition' refers

tests/data/schema-excerpt.rdfa

@@ -59,6 +59,19 @@
        <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/WebPage">WebPage</a></span>
     </div>
 
+    <div typeof="rdfs:Class" resource="http://schema.org/MusicPlaylist">
+      <span class="h" property="rdfs:label">MusicPlaylist</span>
+      <span property="rdfs:comment">A collection of music tracks in playlist form.</span>
+       <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/CreativeWork">CreativeWork</a></span>
+    </div>
+
+    <div typeof="rdfs:Class" resource="http://schema.org/MusicRelease">
+      <span class="h" property="rdfs:label">MusicRelease</span>
+      <span property="rdfs:comment">A MusicRelease is a specific release of a music album.</span>
+      <link property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ"/>
+    <span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/MusicPlaylist">MusicPlaylist</a></span>
+    </div>
+
     <div typeof="rdf:Property" resource="http://schema.org/schemaVersion">
       <span class="h" property="rdfs:label">schemaVersion</span>
       <span property="rdfs:comment">Indicates (by URL or string) a particular version of a schema used in some CreativeWork. For example, a document could declare a schemaVersion using an URL such as http://schema.org/version/2.0/ if precise indication of schema version was required by some application. </span>
@@ -73,5 +86,15 @@
       <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/CreativeWork">CreativeWork</a></span>
       <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Thing">Thing</a></span>
     </div>
+
+    <div typeof="rdf:Property" resource="http://schema.org/duration">
+          <span class="h" property="rdfs:label">duration</span>
+          <span property="rdfs:comment">The duration of the item (movie, audio recording, event, etc.) in [ISO 8601 date format](http://en.wikipedia.org/wiki/ISO_8601).</span>
+          <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/MediaObject">MediaObject</a></span>
+          <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Event">Event</a></span>
+          <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Movie">Movie</a></span>
+          <span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/MusicRecording">MusicRecording</a></span>
+          <span>Range: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Duration">Duration</a></span>
+        </div>
   </body>
   </html>