Upgrade to mekras/atom 0.3.1.

mekras · Jul 12, 2016 · c8bde03 · c8bde03
1 parent 3b7fa56
commit c8bde03
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.6",
-        "mekras/atom": "~0.2",
+        "mekras/atom": "~0.3.1",
         "mekras/class-helpers": "^1.2"
     },
     "require-dev": {

diff --git a/src/Document/CategoryDocument.php b/src/Document/CategoryDocument.php
@@ -25,14 +25,16 @@ class CategoryDocument extends Document
      *
      * @return bool
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function isFixed()
     {
         return $this->getCachedProperty(
             'fixed',
             function () {
-                return $this->getDomElement()->getAttribute('fixed') === 'yes';
+                return $this->getAttribute('fixed') === 'yes';
             }
         );
     }
@@ -42,11 +44,13 @@ function () {
      *
      * @param bool $state
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function setFixed($state)
     {
-        $this->getDomElement()->setAttribute('fixed', $state ? 'yes' : 'no');
+        $this->setAttribute('fixed', $state ? 'yes' : 'no');
         $this->setCachedProperty('fixed', $state);
     }
 
@@ -55,14 +59,16 @@ public function setFixed($state)
      *
      * @return string|null
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function getScheme()
     {
         return $this->getCachedProperty(
             'scheme',
             function () {
-                return $this->getDomElement()->getAttribute('scheme') ?: null;
+                return $this->getAttribute('scheme');
             }
         );
     }
@@ -72,15 +78,13 @@ function () {
      *
      * @param  string|null $iri Scheme IRI.
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function setScheme($iri)
     {
-        if (null === $iri) {
-            $this->getDomElement()->removeAttribute('scheme');
-        } else {
-            $this->getDomElement()->setAttribute('scheme', $iri);
-        }
+        $this->setAttribute('scheme', $iri);
         $this->setCachedProperty('scheme', $iri);
     }
 
@@ -89,14 +93,16 @@ public function setScheme($iri)
      *
      * @return string|null
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function getHref()
     {
         return $this->getCachedProperty(
             'href',
             function () {
-                return $this->getDomElement()->getAttribute('href') ?: null;
+                return $this->getAttribute('href');
             }
         );
     }
@@ -106,15 +112,13 @@ function () {
      *
      * @param  string|null $iri IRI.
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function setHref($iri)
     {
-        if (null === $iri) {
-            $this->getDomElement()->removeAttribute('href');
-        } else {
-            $this->getDomElement()->setAttribute('href', $iri);
-        }
+        $this->setAttribute('href', $iri);
         $this->setCachedProperty('href', $iri);
     }
 

diff --git a/src/Element/Collection.php b/src/Element/Collection.php
@@ -23,25 +23,29 @@ class Collection extends Element
     /**
      * The IRI of the Collection.
      *
-     * @return string
+     * @return string|null
+     *
+     * @throws \InvalidArgumentException
      *
      * @since 1.0
      */
     public function getHref()
     {
-        return $this->getDomElement()->getAttribute('href');
+        return $this->getAttribute('href');
     }
 
     /**
      * Set IRI of the Collection.
      *
      * @param string $href
      *
+     * @throws \InvalidArgumentException
+     *
      * @since 1.0
      */
     public function setHref($href)
     {
-        $this->getDomElement()->setAttribute('href', $href);
+        $this->setAttribute('href', $href);
     }
 
     /**

diff --git a/tests/Document/CategoryDocumentTest.php b/tests/Document/CategoryDocumentTest.php
@@ -41,7 +41,7 @@ public function testCreate()
         $document = new CategoryDocument($this->createExtensions());
         $document->setFixed(false);
         $document->setScheme('http://example.com/cats/big3');
-        $document->setHref(null);
+        //$document->setHref(null);
         $document->addCategory('animal');
         $document->addCategory('vegetable');
         $document->addCategory('mineral');