PHP 8.1 compatibility

Author: claudiu-cristea

composer.json

@@ -4,11 +4,11 @@
     "keywords": ["task-runner"],
     "type": "robo-tasks",
     "require": {
-        "php": "~7.1",
-        "consolidation/robo": "^1 || ^2"
+        "php": ">=7.4",
+        "consolidation/robo": "^3.0"
     },
     "require-dev": {
-        "easyrdf/easyrdf": "dev-master",
+        "easyrdf/easyrdf": "^1.1",
         "phpunit/phpunit": "~7 || ~8 || ~9",
         "slevomat/coding-standard": "~6",
         "squizlabs/php_codesniffer": "~3"
@@ -31,7 +31,11 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

src/Tasks/Sparql/AbstractImport.php

@@ -18,7 +18,7 @@ abstract class AbstractImport extends BaseTask
      *
      * @var array
      */
-    protected $stack = [];
+    protected array $stack = [];
 
     /**
      * {@inheritdoc}

src/Tasks/Sparql/Query.php

@@ -20,12 +20,12 @@ class Query extends BaseTask
      *
      * @var array
      */
-    protected $stack = [];
+    protected array $stack = [];
 
     /**
      * {@inheritdoc}
      */
-    public function run()
+    public function run(): Result
     {
         if (empty($this->endpointUrl)) {
             return Result::error($this, "Endpoint URL not set");

src/Tasks/Sparql/SparqlTrait.php

@@ -14,7 +14,7 @@ trait SparqlTrait
      *
      * @var string
      */
-    protected $endpointUrl;
+    protected string $endpointUrl;
 
     /**
      * Sets the SPARQL endpoint.

src/Tasks/Sparql/loadTasks.php

@@ -4,6 +4,8 @@
 
 namespace Robo\Sparql\Tasks\Sparql;
 
+use Robo\Collection\CollectionBuilder;
+
 /**
  * Provides loaders for SPARQL Robo tasks.
  */
@@ -15,7 +17,7 @@ trait loadTasks
      * @return \Robo\Sparql\Tasks\Sparql\Query|\Robo\Collection\CollectionBuilder
      *   The task object.
      */
-    public function taskSparqlQuery()
+    public function taskSparqlQuery(): CollectionBuilder
     {
         return $this->task(Query::class);
     }
@@ -26,7 +28,7 @@ public function taskSparqlQuery()
      * @return \Robo\Sparql\Tasks\Sparql\ImportFromString|\Robo\Collection\CollectionBuilder
      *   The task object.
      */
-    public function taskSparqlImportFromString()
+    public function taskSparqlImportFromString(): CollectionBuilder
     {
         return $this->task(ImportFromString::class);
     }

tests/src/SparqlRoboTasksTest.php

@@ -4,18 +4,19 @@
 
 namespace Robo\Sparql\Tests;
 
-use League\Container\ContainerAwareTrait;
+use EasyRdf\Sparql\Client;
 use PHPUnit\Framework\TestCase;
 use Robo\Collection\CollectionBuilder;
+use Robo\Common\BuilderAwareTrait;
+use Robo\Contract\BuilderAwareInterface;
 use Robo\Robo;
 use Robo\Sparql\Tasks\Sparql\loadTasks;
 use Robo\TaskAccessor;
-use Symfony\Component\Console\Output\NullOutput;
 
-class SparqlRoboTasksTest extends TestCase
+class SparqlRoboTasksTest extends TestCase implements BuilderAwareInterface
 {
+    use BuilderAwareTrait;
     use loadTasks;
-    use ContainerAwareTrait;
     use TaskAccessor;
 
     /**
@@ -24,19 +25,8 @@ class SparqlRoboTasksTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $container = Robo::createDefaultContainer(null, new NullOutput());
-        $this->setContainer($container);
-    }
-
-    /**
-     * Scaffold the collection builder.
-     *
-     * @return \Robo\Collection\CollectionBuilder
-     */
-    public function collectionBuilder(): CollectionBuilder
-    {
-        $emptyRobofile = new \Robo\Tasks();
-        return $this->getContainer()->get('collectionBuilder', [$emptyRobofile]);
+        $builder = CollectionBuilder::create(Robo::createContainer(), $this);
+        $this->setBuilder($builder);
     }
 
     /**
@@ -78,23 +68,21 @@ public function testImport(string $method, string $triples1, string $triples2):
             ->addTriples('http://example.com/graph2', $triples2)
             ->run();
 
-        $result = $this->taskSparqlQuery()
-          ->setEndpointUrl($this->getSparqlEndpoint() . '/sparql')
-          ->addQuery('SELECT ?subject ?predicate ?object WHERE { GRAPH <http://example.com/graph1> { ?subject ?predicate ?object } }')
-          ->addQuery('SELECT ?subject ?predicate ?object WHERE { GRAPH <http://example.com/graph2> { ?subject ?predicate ?object } }')
-          ->addQuery('CLEAR GRAPH <http://example.com/graph1>')
-          ->addQuery('CLEAR GRAPH <http://example.com/graph2>')
-          ->run();
+        $client = new Client($this->getSparqlEndpoint() . '/sparql');
 
-        /** @var \EasyRdf\Sparql\Result[] $results */
-        $results = $result->getData()['results'];
+        $results = $client->query('SELECT ?subject ?predicate ?object WHERE { GRAPH <http://example.com/graph1> { ?subject ?predicate ?object } }');
+        $this->assertSame('http://example.com/subject1', $results[0]->subject->getUri());
+        $this->assertSame('http://example.com/predicate', $results[0]->predicate->getUri());
+        $this->assertSame('test 1', $results[0]->object->getValue());
 
-        $this->assertSame('http://example.com/subject1', $results[0][0]->subject->getUri());
-        $this->assertSame('http://example.com/predicate', $results[0][0]->predicate->getUri());
-        $this->assertSame('test 1', $results[0][0]->object->getValue());
-        $this->assertSame('http://example.com/subject2', $results[1][0]->subject->getUri());
-        $this->assertSame('http://example.com/predicate', $results[1][0]->predicate->getUri());
-        $this->assertSame('test 2', $results[1][0]->object->getValue());
+        $results = $client->query('SELECT ?subject ?predicate ?object WHERE { GRAPH <http://example.com/graph2> { ?subject ?predicate ?object } }');
+        $this->assertSame('http://example.com/subject2', $results[0]->subject->getUri());
+        $this->assertSame('http://example.com/predicate', $results[0]->predicate->getUri());
+        $this->assertSame('test 2', $results[0]->object->getValue());
+
+        // Cleanup.
+        $client->query('CLEAR GRAPH <http://example.com/graph1>');
+        $client->query('CLEAR GRAPH <http://example.com/graph2>');
     }
 
     /**