added a (limited) TermsTest from rdfInterface

Author: k00ni

composer.json

@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "sweetrdf/rdf-interface": "^0.3.1"
+        "sweetrdf/rdf-interface": "0.*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.18.1",

src/Rdf/BlankNode.php

@@ -14,7 +14,6 @@
 
 use rdfInterface\BlankNode as iBlankNode;
 use rdfInterface\Term;
-use rdfInterface\TYPE_BLANK_NODE;
 
 class BlankNode implements iBlankNode
 {
@@ -41,12 +40,12 @@ public function __toString(): string
 
     public function equals(Term $term): bool
     {
-        return $this === $term;
+        return $this == $term;
     }
 
     public function getType(): string
     {
-        return TYPE_BLANK_NODE;
+        return \rdfInterface\TYPE_BLANK_NODE;
     }
 
     public function getValue(): string

src/Rdf/DataFactory.php

@@ -12,6 +12,7 @@
  * file that was distributed with this source code.
  */
 
+use Exception;
 use rdfInterface\BlankNode as iBlankNode;
 use rdfInterface\DataFactory as iDataFactory;
 use rdfInterface\DefaultGraph as iDefaultGraph;
@@ -35,8 +36,9 @@ public static function namedNode(string | Stringable $iri): iNamedNode
         return new NamedNode($iri);
     }
 
-    public static function defaultGraph(string | Stringable | null $iri = null): iDefaultGraph
-    {
+    public static function defaultGraph(
+        string | Stringable | null $iri = null
+    ): iDefaultGraph {
         return new DefaultGraph($iri);
     }
 
@@ -52,7 +54,7 @@ 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($subject, $predicate, $object, $graphIri);
     }
@@ -61,13 +63,13 @@ 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 {
-        throw new RdfException('quadTemplate is not implemented yet.');
+        throw new Exception('quadTemplate is not implemented yet.');
     }
 
     public static function variable(string | Stringable $name): iVariable
     {
-        throw new RdfException('variable is not implemented yet.');
+        throw new Exception('variable is not implemented yet.');
     }
 }

src/Rdf/DefaultGraph.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-use rdfInterface\DefaultGraph;
+use rdfInterface\DefaultGraph as iDefaultGraph;
 use rdfInterface\Term;
 use rdfInterface\TYPE_DEFAULT_GRAPH;
 use sweetrdf\InMemoryStoreSqlite\NamespaceHelper;

src/Rdf/Literal.php

@@ -15,7 +15,6 @@
 use Exception;
 use rdfInterface\Literal as iLiteral;
 use rdfInterface\Term;
-use rdfInterface\TYPE_LITERAL;
 use Stringable;
 use sweetrdf\InMemoryStoreSqlite\NamespaceHelper;
 
@@ -33,8 +32,10 @@ public function __construct(
         ?string $datatype = null
     ) {
         $this->value = $value;
-        $this->lang = $lang;
-        $this->datatype = $datatype;
+        // TODO later check with feedback on
+        // https://github.com/sweetrdf/rdfInterface/issues/14
+        $this->lang = !empty($lang) ? $lang : null;
+        $this->datatype = $datatype ?? NamespaceHelper::NAMESPACE_XSD.'string';
     }
 
     public function __toString(): string
@@ -61,17 +62,17 @@ public function getLang(): ?string
 
     public function getDatatype(): string
     {
-        return $this->datatype ?? NamespaceHelper::NAMESPACE_XSD;
+        return $this->datatype;
     }
 
     public function getType(): string
     {
-        return TYPE_LITERAL;
+        return \rdfInterface\TYPE_LITERAL;
     }
 
     public function equals(Term $term): bool
     {
-        return $this === $term;
+        return $this == $term;
     }
 
     public function withValue(int | float | string | bool | Stringable $value): self

src/Rdf/NamedNode.php

@@ -14,7 +14,6 @@
 
 use rdfInterface\NamedNode as iNamedNode;
 use rdfInterface\Term;
-use rdfInterface\TYPE_NAMED_NODE;
 
 class NamedNode implements iNamedNode
 {
@@ -37,11 +36,11 @@ public function getValue(): string
 
     public function getType(): string
     {
-        return TYPE_NAMED_NODE;
+        return \rdfInterface\TYPE_NAMED_NODE;
     }
 
     public function equals(Term $term): bool
     {
-        return $this === $term;
+        return $this == $term;
     }
 }

src/Rdf/Quad.php

@@ -15,6 +15,7 @@
 use BadMethodCallException;
 use Exception;
 use rdfInterface\BlankNode as iBlankNode;
+use rdfInterface\DefaultGraph as iDefaultGraph;
 use rdfInterface\Literal as iLiteral;
 use rdfInterface\NamedNode as iNamedNode;
 use rdfInterface\Quad as iQuad;
@@ -28,13 +29,13 @@ class Quad implements iQuad
 
     private iTerm $object;
 
-    private iNamedNode | iBlankNode | null $graphIri;
+    private iNamedNode | iBlankNode | iDefaultGraph | null $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 must be of type NamedNode or BlankNode');
@@ -57,7 +58,7 @@ public function getType(): string
 
     public function equals(iTerm $term): bool
     {
-        return $this === $term;
+        return $this == $term;
     }
 
     public function getValue(): string
@@ -134,8 +135,9 @@ public function withObject(iTerm $object): iQuad
         throw new Exception('withObject not implemented yet.');
     }
 
-    public function withGraphIri(iNamedNode | iBlankNode $graphIri): iQuad
-    {
+    public function withGraphIri(
+        iNamedNode | iBlankNode | iDefaultGraph | null $graphIri
+    ): iQuad {
         throw new Exception('withGraphIri not implemented yet.');
     }
 }

tests/Integration/Rdf/TermsTest.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the sweetrdf/InMemoryStoreSqlite package and licensed under
+ * the terms of the GPL-3 license.
+ *
+ * (c) Konrad Abicht <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tests\Integration;
+
+use rdfInterface\DataFactory as iDataFactory;
+use rdfInterface\tests\TermsTest as _TermsTest;
+use sweetrdf\InMemoryStoreSqlite\Rdf\DataFactory;
+
+class TermsTest extends _TermsTest
+{
+    public static function getDataFactory(): iDataFactory
+    {
+        return new DataFactory();
+    }
+
+    public function testLiteralWith(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+
+    public function testQuadWith(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+
+    public function testQuadTemplate(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+
+    public function testQuadTemplateQuad(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+
+    public function testQuadTemplateWith(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+
+    public function testQuadTemplateExceptions(): void
+    {
+        $this->markTestSkipped('Function to test not implemented yet.');
+    }
+}