Rewritten according to the latest atom package changes.

mekras · Jul 7, 2016 · 1563b83 · 1563b83
1 parent adf88b1
commit 1563b83
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 155 deletions.
diff --git a/src/Document/CategoryDocument.php b/src/Document/CategoryDocument.php
@@ -7,7 +7,7 @@
  */
 namespace Mekras\AtomPub\Document;
 
-use Mekras\Atom\Element\Meta\Categories;
+use Mekras\Atom\Element\Meta\HasCategories;
 
 /**
  * Category Document.
@@ -18,7 +18,7 @@
  */
 class CategoryDocument extends Document
 {
-    use Categories;
+    use HasCategories;
 
     /**
      * Indicating whether the list of categories is a fixed or an open set.

diff --git a/src/Document/ServiceDocument.php b/src/Document/ServiceDocument.php
@@ -35,7 +35,7 @@ function () {
                 $workspaces = [];
                 $items = $this->getDomElement()->getElementsByTagNameNS($this->ns(), 'workspace');
                 foreach ($items as $item) {
-                    $workspaces[] = $this->getExtensions()->parseElement($item);
+                    $workspaces[] = $this->getExtensions()->parseElement($this, $item);
                 }
 
                 return $workspaces;
@@ -59,7 +59,7 @@ public function addWorkspace($title)
         $workspaces = $this->getWorkspaces();
 
         /** @var Workspace $workspace */
-        $workspace = $this->getExtensions()->createElement($this, 'workspace');
+        $workspace = $this->getExtensions()->createElement($this, 'app:workspace');
         $workspace->setTitle($title);
 
         $workspaces[] = $workspace;

diff --git a/src/Element/Collection.php b/src/Element/Collection.php
@@ -7,7 +7,7 @@
  */
 namespace Mekras\AtomPub\Element;
 
-use Mekras\Atom\Element\Meta\Title;
+use Mekras\Atom\Element\Meta\HasTitle;
 
 /**
  * Collection.
@@ -18,7 +18,7 @@
  */
 class Collection extends Element
 {
-    use Title;
+    use HasTitle;
 
     /**
      * The IRI of the Collection.

diff --git a/src/Element/Entry.php b/src/Element/Entry.php
@@ -18,5 +18,5 @@
  */
 class Entry extends AtomEntry
 {
-    use Meta\MemberUri;
+    use Meta\HasMemberUri;
 }
diff --git a/src/Element/Feed.php b/src/Element/Feed.php
diff --git a/src/Element/Meta/MemberUri.php → src/Element/Meta/HasMemberUri.php b/src/Element/Meta/MemberUri.php → src/Element/Meta/HasMemberUri.php
@@ -8,8 +8,8 @@
 namespace Mekras\AtomPub\Element\Meta;
 
 use Mekras\Atom\Atom;
-use Mekras\Atom\Element\Meta\Base;
 use Mekras\Atom\Node;
+use Mekras\Atom\NodeInterfaceTrait;
 
 /**
  * Support for "atom:link[rel=edit]".
@@ -18,9 +18,9 @@
  *
  * @link  https://tools.ietf.org/html/rfc4287#section-9.1
  */
-trait MemberUri
+trait HasMemberUri
 {
-    use Base;
+    use NodeInterfaceTrait;
 
     /**
      * Return Member URI.

diff --git a/src/Element/Workspace.php b/src/Element/Workspace.php
@@ -7,7 +7,7 @@
  */
 namespace Mekras\AtomPub\Element;
 
-use Mekras\Atom\Element\Meta\Title;
+use Mekras\Atom\Element\Meta\HasTitle;
 
 /**
  * Workspace.
@@ -18,7 +18,7 @@
  */
 class Workspace extends Element
 {
-    use Title;
+    use HasTitle;
 
     /**
      * Return collections.
@@ -38,7 +38,7 @@ function () {
                 /** @var \DOMNodeList $items */
                 $items = $this->query('app:collection');
                 foreach ($items as $item) {
-                    $result[] = $this->getExtensions()->parseElement($item);
+                    $result[] = $this->getExtensions()->parseElement($this, $item);
                 }
 
                 return $result;
@@ -62,7 +62,7 @@ public function addCollection($title)
         $collections = $this->getCollections();
 
         /** @var Collection $collection */
-        $collection = $this->getExtensions()->createElement($this, 'collection');
+        $collection = $this->getExtensions()->createElement($this, 'app:collection');
         $collection->setTitle($title);
 
         $collections[] = $collection;

diff --git a/src/Extension/AtomPubExtension.php b/src/Extension/AtomPubExtension.php
@@ -12,6 +12,7 @@
 use Mekras\Atom\Element\Element;
 use Mekras\Atom\Extension\DocumentExtension;
 use Mekras\Atom\Extension\ElementExtension;
+use Mekras\Atom\Extension\NamespaceExtension;
 use Mekras\Atom\Extensions;
 use Mekras\Atom\Node;
 use Mekras\AtomPub\AtomPub;
@@ -27,7 +28,7 @@
  *
  * @since 1.0
  */
-class AtomPubExtension implements DocumentExtension, ElementExtension
+class AtomPubExtension implements DocumentExtension, ElementExtension, NamespaceExtension
 {
     /**
      * Create Atom document from XML DOM document.
@@ -70,9 +71,9 @@ public function parseDocument(Extensions $extensions, \DOMDocument $document)
     public function createDocument(Extensions $extensions, $name)
     {
         switch ($name) {
-            case 'service':
+            case 'app:service':
                 return new ServiceDocument($extensions);
-            case 'categories':
+            case 'app:categories':
                 return new CategoryDocument($extensions);
         }
 
@@ -82,30 +83,30 @@ public function createDocument(Extensions $extensions, $name)
     /**
      * Create Atom node from XML DOM element.
      *
-     * @param Extensions  $extensions Extension registry.
-     * @param \DOMElement $element    DOM element.
+     * @param Node        $parent  Parent node.
+     * @param \DOMElement $element DOM element.
      *
      * @return Element|null
      *
      * @throws \InvalidArgumentException
      *
      * @since 1.0
      */
-    public function parseElement(Extensions $extensions, $element)
+    public function parseElement(Node $parent, \DOMElement $element)
     {
         if (Atom::NS === $element->namespaceURI) {
             switch ($element->localName) {
                 case 'entry':
-                    return new Entry($extensions, $element);
+                    return new Entry($parent, $element);
                 case 'feed':
-                    return new Feed($extensions, $element);
+                    return new Feed($parent, $element);
             }
         } elseif (AtomPub::NS === $element->namespaceURI) {
             switch ($element->localName) {
                 case 'collection':
-                    return new Collection($extensions, $element);
+                    return new Collection($parent, $element);
                 case 'workspace':
-                    return new Workspace($extensions, $element);
+                    return new Workspace($parent, $element);
             }
         }
 
@@ -115,29 +116,40 @@ public function parseElement(Extensions $extensions, $element)
     /**
      * Create new Atom node.
      *
-     * @param Extensions $extensions Extension registry.
-     * @param Node       $parent     Parent node.
-     * @param string     $name       Element name.
+     * @param Node   $parent Parent node.
+     * @param string $name   Element name.
      *
      * @return Element|null
      *
      * @throws \InvalidArgumentException
      *
      * @since 1.0
      */
-    public function createElement(Extensions $extensions, Node $parent, $name)
+    public function createElement(Node $parent, $name)
     {
         switch ($name) {
-            case 'entry':
-                return new Entry($extensions, $parent);
-            case 'feed':
-                return new Feed($extensions, $parent);
-            case 'collection':
-                return new Collection($extensions, $parent);
-            case 'workspace':
-                return new Workspace($extensions, $parent);
+            case 'atom:entry':
+                return new Entry($parent);
+            case 'atom:feed':
+                return new Feed($parent);
+            case 'app:collection':
+                return new Collection($parent);
+            case 'app:workspace':
+                return new Workspace($parent);
         }
 
         return null;
     }
+
+    /**
+     * Return additional XML namespaces.
+     *
+     * @return string[] prefix => namespace.
+     *
+     * @since 1.0
+     */
+    public function getNamespaces()
+    {
+        return [AtomPub::NS];
+    }
 }
diff --git a/tests/Element/CollectionTest.php b/tests/Element/CollectionTest.php
@@ -21,7 +21,7 @@ class CollectionTest extends TestCase
     public function testParse()
     {
         $collection = new Collection(
-            $this->createExtensions(),
+            $this->createFakeNode(),
             $this->loadFixture('Collection.xml')->documentElement
         );
 
@@ -43,7 +43,7 @@ public function testCreate()
             '<collection xmlns="http://www.w3.org/2007/app" ' .
             'xmlns:atom="http://www.w3.org/2005/Atom"/>'
         );
-        $collection = new Collection($this->createExtensions(), $doc->documentElement);
+        $collection = new Collection($this->createFakeNode(), $doc->documentElement);
         $collection->setTitle('Foo');
         $collection->setHref('http://example.org/foo');
         $collection->setAcceptedTypes(['a', 'b', 'c']);

diff --git a/tests/Element/EntryTest.php b/tests/Element/EntryTest.php
@@ -21,7 +21,7 @@ class EntryTest extends TestCase
     public function testGetMemberUri()
     {
         $entry = new Entry(
-            $this->createExtensions(),
+            $this->createFakeNode(),
             $this->loadFixture('EntryDocument.xml')->documentElement
         );
         static::assertEquals('http://example.com/atom/atom/?edit=0001', $entry->getMemberUri());
@@ -33,7 +33,7 @@ public function testGetMemberUri()
     public function testSetMemberUri1()
     {
         $entry = new Entry(
-            $this->createExtensions(),
+            $this->createFakeNode(),
             $this->loadFixture('EntryDocument.xml')->documentElement
         );
         $entry->setMemberUri('http://example.com/atom/atom/?edit=0002');
@@ -50,7 +50,7 @@ public function testSetMemberUri1()
     public function testSetMemberUri2()
     {
         $entry = new Entry(
-            $this->createExtensions(),
+            $this->createFakeNode(),
             $this->loadFixture('EmptyEntry.xml')->documentElement
         );
         $entry->setMemberUri('http://example.com/atom/atom/?edit=0001');

diff --git a/tests/Element/FeedTest.php b/tests/Element/FeedTest.php