ported code to sweetrdf/rdf-interface ^2.0

Author: k00ni

.php-cs-fixer.dist.php

@@ -19,6 +19,7 @@
     ->setRules([
         '@PSR12' => true,
         'phpdoc_summary' => false,
+        'no_unused_imports' => true,
     ])
 ;
 

README.md

@@ -44,47 +44,6 @@ echo \count($triples); // outputs: 2
 // $triples contains result set, which consists of arrays and scalar values
 ```
 
-### Example 2 (Consume SPARQL client result)
-
-Use `sweetrdf/sparql-client` and a PSR-7-compatible library (like `guzzlehttp/guzzle`) to query a SPARQL endpoint.
-For now you have to "transform" SPARQL result set to a quad-list manually.
-Afterwards add quads to store and query it.
-Check test `testSparqlClientCompatibility` in [InMemoryStoreSqliteTest.php](tests/Integration/Store/InMemoryStoreSqliteTest.php) for a working example.
-
-```php
-use GuzzleHttp\Client;
-use GuzzleHttp\Psr7\Request;
-use simpleRdf\Connection;
-use simpleRdf\DataFactory;
-
-/*
- * get data from a SPARQL endpoint
- */
-$httpClient = new Client();
-$dataFactory = new DataFactory();
-$connection = new Connection($httpClient, $dataFactory);
-$query = 'SELECT * WHERE {?s ?p ?o} limit 5';
-// set SPARQL endpoint URL
-$url = 'https://arche-sparql.acdh-dev.oeaw.ac.at/sparql?query=';
-$query = new Request('GET', $url.rawurlencode($query));
-$statement = $connection->query($query);
-
-/*
- * add result to the store
- */
-$quads = [];
-foreach ($statement as $entry) {
-    // $entry is an object; s, p and o are variables from your query
-    $quads[] = $dataFactory->quad($entry->s, $entry->p, $entry->o);
-}
-$store = InMemoryStoreSqlite::createInstance();
-$store->addQuads($quads);
-
-// send query and check result
-$result = $store->query('SELECT * WHERE {?s ?p ?o.}');
-echo count($result['result']['rows']); // outputs 5
-```
-
 ## SPARQL support
 
 Store supports a lot of SPARQL 1.0/1.1 features.

composer.json

@@ -15,12 +15,11 @@
     ],
     "require": {
         "php": ">=8.0",
-        "sweetrdf/rdf-interface": "~0.8",
-        "sweetrdf/simple-rdf": "~0.5"
+        "sweetrdf/rdf-interface": "^2.0.0",
+        "sweetrdf/simple-rdf": "^2.0.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "guzzlehttp/guzzle": "^7.2",
         "phpunit/phpunit": "^9.5 || ^10.0",
         "sweetrdf/sparql-client": "^0.1"
     },

src/Store/InMemoryStoreSqlite.php

@@ -14,11 +14,11 @@
 namespace sweetrdf\InMemoryStoreSqlite\Store;
 
 use Exception;
-use rdfInterface\BlankNode;
-use rdfInterface\DataFactory as iDataFactory;
-use rdfInterface\NamedNode;
-use rdfInterface\QuadIterator;
-use rdfInterface\Term as iTerm;
+use rdfInterface\BlankNodeInterface;
+use rdfInterface\DataFactoryInterface;
+use rdfInterface\LiteralInterface;
+use rdfInterface\NamedNodeInterface;
+use rdfInterface\QuadIteratorInterface;
 use simpleRdf\DataFactory;
 use sweetrdf\InMemoryStoreSqlite\KeyValueBag;
 use sweetrdf\InMemoryStoreSqlite\Log\LoggerPool;
@@ -41,7 +41,7 @@ class InMemoryStoreSqlite
 
     private PDOSQLiteAdapter $db;
 
-    private iDataFactory $dataFactory;
+    private DataFactoryInterface $dataFactory;
 
     private LoggerPool $loggerPool;
 
@@ -53,7 +53,7 @@ class InMemoryStoreSqlite
 
     public function __construct(
         PDOSQLiteAdapter $db,
-        iDataFactory $dataFactory,
+        DataFactoryInterface $dataFactory,
         NamespaceHelper $namespaceHelper,
         LoggerPool $loggerPool,
         KeyValueBag $rowCache,
@@ -102,7 +102,7 @@ public function getDBVersion()
         return $this->db->getServerVersion();
     }
 
-    public function addQuads(iterable | QuadIterator $quads): void
+    public function addQuads(iterable | QuadIteratorInterface $quads): void
     {
         $triples = [];
 
@@ -118,7 +118,7 @@ public function addQuads(iterable | QuadIterator $quads): void
 
             $triple = [
                 's' => $quad->getSubject()->getValue(),
-                's_type' => $quad->getSubject() instanceof NamedNode ? 'uri' : 'bnode',
+                's_type' => $quad->getSubject() instanceof NamedNodeInterface ? 'uri' : 'bnode',
                 'p' => $quad->getPredicate()->getValue(),
                 'o' => $quad->getObject()->getValue(),
                 'o_type' => '',
@@ -127,9 +127,9 @@ public function addQuads(iterable | QuadIterator $quads): void
             ];
 
             // o
-            if ($quad->getObject() instanceof NamedNode) {
+            if ($quad->getObject() instanceof NamedNodeInterface) {
                 $triple['o_type'] = 'uri';
-            } elseif ($quad->getObject() instanceof BlankNode) {
+            } elseif ($quad->getObject() instanceof BlankNodeInterface) {
                 $triple['o_type'] = 'bnode';
             } else {
                 $triple['o_type'] = 'literal';
@@ -185,7 +185,7 @@ public function addRawTriples(array $triples, string $graphIri): void
      * @param string $q      SPARQL query
      * @param string $format One of: raw, instances
      */
-    public function query(string $q, string $format = 'raw'): array | iTerm
+    public function query(string $q, string $format = 'raw'): array | LiteralInterface
     {
         $errors = [];
 

tests/Integration/Store/InMemoryStoreSqlite/SPARQL11/ComplianceTestCase.php

@@ -13,10 +13,7 @@
 
 namespace Tests\Integration\Store\InMemoryStoreSqlite\SPARQL11;
 
-use sweetrdf\InMemoryStoreSqlite\Log\Logger;
-use sweetrdf\InMemoryStoreSqlite\Parser\TurtleParser;
 use sweetrdf\InMemoryStoreSqlite\Store\InMemoryStoreSqlite;
-use sweetrdf\InMemoryStoreSqlite\StringReader;
 use Tests\TestCase;
 
 /**

tests/Integration/Store/InMemoryStoreSqliteTest.php

@@ -13,10 +13,7 @@
 
 namespace Tests\Integration\Store;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Psr7\Request;
 use simpleRdf\DataFactory;
-use sparqlClient\Connection;
 use sweetrdf\InMemoryStoreSqlite\KeyValueBag;
 use sweetrdf\InMemoryStoreSqlite\Log\LoggerPool;
 use sweetrdf\InMemoryStoreSqlite\NamespaceHelper;
@@ -70,7 +67,7 @@ public function testGetDBVersion()
      */
     public function testInsertSaftRegressionTest2()
     {
-        $res = $this->subjectUnderTest->query('INSERT INTO <http://localhost/Saft/TestGraph/> {<http://foo/1> <http://foo/2> <http://foo/3> . }');
+        $this->subjectUnderTest->query('INSERT INTO <http://localhost/Saft/TestGraph/> {<http://foo/1> <http://foo/2> <http://foo/3> . }');
 
         $res1 = $this->subjectUnderTest->query('SELECT * FROM <http://localhost/Saft/TestGraph/> WHERE {?s ?p ?o.}');
         $this->assertEquals(1, \count($res1['result']['rows']));