phpunit bumped to 10 and fix in PreparedStatement::getQuery()

Author: zozlak

.gitignore

@@ -2,6 +2,7 @@
 /vendor
 /build
 /.phpunit.result.cache
+/.phpunit.cache
 /.phpdoc
 /composer.lock
 /docs

README.md

@@ -58,22 +58,22 @@ $connection = new \sparqlClient\StandardConnection('https://query.wikidata.org/s
 // the single `?` is a positional parameter while the `:sf` is a named parameter
 $query      = $connection->prepare('SELECT * WHERE {?a ? ?c . ?a :sf ?d .} LIMIT 10');
 $query->execute([
-    $factory->namedNode('http://creativecommons.org/ns#license'),
-    'sf' => $factory->namedNode('http://schema.org/softwareVersion'),
+    $factory::namedNode('http://creativecommons.org/ns#license'),
+    'sf' => $factory::namedNode('http://schema.org/softwareVersion'),
 ]);
 foreach ($query as $i) {
     print_r($i);
 }
 
 // bind a (positional) parameter to a variable
 $query = $connection->prepare('SELECT * WHERE {?a ? ?c .} LIMIT 2');
-$value = $factory->namedNode('http://creativecommons.org/ns#license');
+$value = $factory::namedNode('http://creativecommons.org/ns#license');
 $query->bindParam(0, $value);
 $query->execute();
 foreach ($query as $i) {
     print_r($i);
 }
-$value = $factory->namedNode('http://schema.org/softwareVersion');
+$value = $factory::namedNode('http://schema.org/softwareVersion');
 $query->execute();
 foreach ($query as $i) {
     print_r($i);

composer.json

@@ -31,10 +31,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "phpunit/php-code-coverage": "^9.2",
+        "phpunit/phpunit": "^10",
         "phpstan/phpstan": "*",
-        "squizlabs/php_codesniffer": "*",
         "php-coveralls/php-coveralls": "^2.4",
         "http-interop/http-factory-guzzle": "^1.0",
         "sweetrdf/quick-rdf": "^1.0.0 | ^2.0.0-RC1"

phpunit.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" verbose="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
     </report>
@@ -12,4 +9,9 @@
   <testsuite name="tests">
     <directory>tests</directory>
   </testsuite>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>

src/sparqlClient/PreparedStatement.php

@@ -151,13 +151,12 @@ private function getQuery(): string {
             if (isset($matches[2])) {
                 $pn   = $n;
                 $from = '?';
-                $to   = $param[$pn] ?? null;
                 $n++;
             } else {
                 $pn   = $matches[1];
                 $from = ":$pn";
-                $to   = $this->escapeValue($pn);
             }
+            $to = $this->escapeValue($pn);
             if ($to === null) {
                 throw new SparqlException("Parameter $pn value missing");
             }

tests/SparqlTest.php

@@ -27,7 +27,7 @@
 namespace sparqlClient;
 
 use PDO;
-use quickRdf\DataFactory;
+use quickRdf\DataFactory as DF;
 use rdfInterface\TermInterface;
 
 /**
@@ -38,11 +38,10 @@
 class SparqlTest extends \PHPUnit\Framework\TestCase {
 
     public function testSelect(): void {
-        $df    = new DataFactory();
-        $c     = new StandardConnection('https://query.wikidata.org/sparql', $df);
+        $c     = new StandardConnection('https://query.wikidata.org/sparql', new DF());
         $query = 'select ?a ?b ?c where {?a ?b ?c} limit 10';
 
-        $s  = $c->query($query);
+        $s = $c->query($query);
         $d = iterator_to_array($s);
         $this->assertCount(10, $d);
         foreach ($d as $i) {
@@ -53,28 +52,25 @@ public function testSelect(): void {
     }
 
     public function testAsk(): void {
-        $df    = new DataFactory();
-        $c     = new StandardConnection('https://query.wikidata.org/sparql', $df);
+        $c     = new StandardConnection('https://query.wikidata.org/sparql', new DF());
         $query = 'ask {<http://foo> <http://bar> <http://baz>}';
         $this->assertFalse($c->query($query)->fetchColumn());
     }
 
     public function testPrepare(): void {
-        $df = new DataFactory();
-        $c  = new StandardConnection('https://query.wikidata.org/sparql', $df);
-        $q  = $c->prepare('SELECT * WHERE {?a ? ?c . ?a :sf ?d . ?a ? ?e} LIMIT 1');
+        $c = new StandardConnection('https://query.wikidata.org/sparql', new DF());
+        $q = $c->prepare('SELECT * WHERE {?a ? ?c . ?a :sf ?d . ?a ? ?e} LIMIT 1');
         $q->execute([
-            $df->namedNode('http://creativecommons.org/ns#license'),
-            $df->namedNode('http://schema.org/dateModified'),
-            'sf' => $df->namedNode('http://schema.org/softwareVersion'),
+            DF::namedNode('http://creativecommons.org/ns#license'),
+            DF::namedNode('http://schema.org/dateModified'),
+            'sf' => DF::namedNode('http://schema.org/softwareVersion'),
         ]);
-        $r  = $q->fetchAll();
+        $r = $q->fetchAll();
         $this->assertCount(1, $r);
     }
 
     public function testExceptions(): void {
-        $df = new DataFactory();
-        $c  = new StandardConnection('https://query.wikidata.org/sparql', $df);
+        $c = new StandardConnection('https://query.wikidata.org/sparql', new DF());
 
         $query = 'wrongQuery';
         try {
@@ -87,7 +83,7 @@ public function testExceptions(): void {
         $query = "";
         try {
             $q = $c->prepare($query);
-            $q->execute([$df->literal('foo')]);
+            $q->execute([DF::literal('foo')]);
         } catch (SparqlException $ex) {
             $this->assertEquals('Unknown parameter 0', $ex->getMessage());
         }
@@ -99,11 +95,11 @@ public function testExceptions(): void {
         } catch (SparqlException $ex) {
             $this->assertEquals('Parameter 0 value missing', $ex->getMessage());
         }
-        
+
         $query = "? :p ";
         try {
             $q = $c->prepare($query);
-            $q->execute([$df->literal('foo')]);
+            $q->execute([DF::literal('foo')]);
         } catch (SparqlException $ex) {
             $this->assertEquals('Parameter p value missing', $ex->getMessage());
         }

tests/StatementTest.php

@@ -99,9 +99,9 @@ private function testWikidata(string $format): void {
         $r = $stmt->fetch(PDO::FETCH_OBJ);
         $this->assertIsObject($r);
         $this->assertCount(3, get_object_vars($r));
-        $this->assertObjectHasAttribute('a', $r);
-        $this->assertObjectHasAttribute('b', $r);
-        $this->assertObjectHasAttribute('c', $r);
+        $this->assertObjectHasProperty('a', $r);
+        $this->assertObjectHasProperty('b', $r);
+        $this->assertObjectHasProperty('c', $r);
 
         $r = $stmt->fetch(PDO::FETCH_COLUMN);
         if ($format === 'text/csv') {