Adjusted to rdfInterface 0.5.1

Author: zozlak

composer.json

@@ -15,8 +15,8 @@
     "require": {
         "php": ">=8.0",
         "zozlak/rdf-constants": "^1.1",
-        "sweetrdf/rdf-helpers": ">=0.4.0",
-        "sweetrdf/rdf-interface": ">=0.4.5"
+        "sweetrdf/rdf-helpers": ">=0.5.1",
+        "sweetrdf/rdf-interface": ">=0.5.0"
     },
     "suggest": {
         "sweetrdf/quick-rdf-io": "*"

src/simpleRdf/DataFactory.php

@@ -34,6 +34,7 @@
 use rdfInterface\DefaultGraph as iDefaultGraph;
 use rdfInterface\Quad as iQuad;
 use rdfInterface\QuadTemplate as iQuadTemplate;
+use rdfHelpers\DefaultGraph;
 
 /**
  * Description of DataFactory
@@ -50,8 +51,8 @@ public static function namedNode(string | Stringable $iri): iNamedNode {
         return new NamedNode($iri);
     }
 
-    public static function defaultGraph(string | Stringable | null $iri = null): iDefaultGraph {
-        return new DefaultGraph($iri);
+    public static function defaultGraph(): iDefaultGraph {
+        return new DefaultGraph();
     }
 
     public static function literal(
@@ -64,15 +65,15 @@ public static function literal(
 
     public static function quad(
         iTerm $subject, iNamedNode $predicate, iTerm $object,
-        iNamedNode | iBlankNode | null $graphIri = null
+        iNamedNode | iBlankNode | iDefaultGraph | null $graphIri = null
     ): iQuad {
         return new Quad(clone $subject, clone $predicate, clone $object, $graphIri);
     }
 
     public static function quadTemplate(
         iTerm | null $subject = null, iNamedNode | null $predicate = null,
         iTerm | null $object = null,
-        iNamedNode | iBlankNode | null $graphIri = null
+        iNamedNode | iBlankNode | iDefaultGraph | null $graphIri = null
     ): iQuadTemplate {
         return new QuadTemplate($subject, $predicate, $object, $graphIri);
     }

src/simpleRdf/DefaultGraph.php

@@ -29,6 +29,7 @@
 use BadMethodCallException;
 use rdfInterface\NamedNode as iNamedNode;
 use rdfInterface\BlankNode as iBlankNode;
+use rdfInterface\DefaultGraph as iDefaultGraph;
 use rdfInterface\Literal as iLiteral;
 use rdfInterface\Term as iTerm;
 use rdfInterface\Quad as iQuad;
@@ -41,33 +42,14 @@
  */
 class Quad implements iQuad {
 
-    /**
-     *
-     * @var iTerm
-     */
     private iTerm $subject;
-
-    /**
-     *
-     * @var iNamedNode
-     */
     private iNamedNode $predicate;
-
-    /**
-     *
-     * @var iTerm
-     */
     private iTerm $object;
-
-    /**
-     *
-     * @var iNamedNode|iBlankNode
-     */
-    private iNamedNode | iBlankNode $graphIri;
+    private iNamedNode | iBlankNode | iDefaultGraph $graphIri;
 
     public function __construct(
         iTerm $subject, iNamedNode $predicate, iTerm $object,
-        iNamedNode | iBlankNode | null $graphIri = null
+        iNamedNode | iBlankNode | iDefaultGraph | null $graphIri = null
     ) {
         if ($subject instanceof iLiteral) {
             throw new BadMethodCallException("subject can't be a literal");
@@ -99,7 +81,7 @@ public function equals(iTerm $term): bool {
     }
 
     public function getValue(): string {
-        throw new \BadMethodCallException();
+        throw new BadMethodCallException();
     }
 
     public function getSubject(): iTerm {
@@ -114,7 +96,7 @@ public function getObject(): iTerm {
         return $this->object;
     }
 
-    public function getGraphIri(): iNamedNode | iBlankNode {
+    public function getGraphIri(): iNamedNode | iBlankNode | iDefaultGraph {
         return $this->graphIri;
     }
 
@@ -130,7 +112,7 @@ public function withObject(iTerm $object): iQuad {
         return DF::quad($this->subject, $this->predicate, $object, $this->graphIri);
     }
 
-    public function withGraphIri(iNamedNode | iBlankNode $graphIri): iQuad {
+    public function withGraphIri(iNamedNode | iBlankNode | iDefaultGraph | null $graphIri): iQuad {
         return DF::quad($this->subject, $this->predicate, $this->object, $graphIri);
     }
 }

src/simpleRdf/Quad.php

@@ -30,6 +30,7 @@
 use rdfInterface\NamedNode as iNamedNode;
 use rdfInterface\BlankNode as iBlankNode;
 use rdfInterface\Literal as iLiteral;
+use rdfInterface\DefaultGraph as iDefaultGraph;
 use rdfInterface\Term as iTerm;
 use rdfInterface\Quad as iQuad;
 use rdfInterface\QuadTemplate as iQuadTemplate;
@@ -54,31 +55,22 @@ class QuadTemplate implements iQuadTemplate {
      */
     private iNamedNode | null $predicate;
 
-    /**
-     *
-     * @var iTerm|null
-     */
     private iTerm | null $object;
 
-    /**
-     *
-     * @var iNamedNode|iBlankNode|null
-     */
     private iNamedNode | iBlankNode | null $graphIri;
 
     public function __construct(
         iTerm | null $subject = null, iNamedNode | null $predicate = null,
         iTerm | null $object = null,
-        iNamedNode | iBlankNode | null $graphIri = null
+        iNamedNode | iBlankNode | iDefaultGraph | null $graphIri = null
     ) {
         if ($subject === null && $predicate === null && $object === null && $graphIri === null) {
             throw new BadMethodCallException("At least one part of the quad has to be specified");
         }
         if ($subject instanceof iLiteral) {
             throw new BadMethodCallException("subject can't be a literal");
         }
-        if ($graphIri instanceof iBlankNode) {
-            // all triples belong to the default graph, so nothing to search for
+        if ($graphIri instanceof iDefaultGraph) {
             $graphIri = null;
         }
         $this->subject   = $subject;
@@ -148,7 +140,7 @@ public function withObject(iTerm | null $object): iQuadTemplate {
         return DF::quadTemplate($this->subject, $this->predicate, $object, $this->graphIri);
     }
 
-    public function withGraphIri(\rdfInterface\NamedNode | \rdfInterface\BlankNode | null $graphIri): iQuadTemplate {
+    public function withGraphIri(iNamedNode | iBlankNode | iDefaultGraph | null $graphIri): iQuadTemplate {
         return DF::quadTemplate($this->subject, $this->predicate, $this->object, $graphIri);
     }
 }