fix: add rector and process changes for PHP 8.0

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=8.0",
         "ext-json": "*",
         "guzzlehttp/psr7": "^1.6",
         "php-http/client-implementation": "^1.0",
@@ -25,6 +25,7 @@
         "php-http/mock-client": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^9.0",
+        "rector/rector": "^0.18.3",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
@@ -40,7 +41,8 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "rector/rector-installer": true
         }
     },
     "extra": {

rector.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_80
+    ]);
+};

src/Entity/Collection/EntityCollection.php

@@ -7,16 +7,13 @@
 
 abstract class EntityCollection implements \Iterator, \Countable
 {
-    private $iteratorPosition = 0;
+    private int $iteratorPosition = 0;
 
     /**
-     * @var \stdClass
+     * @param \stdClass $data
      */
-    protected $rawData;
-
-    final public function __construct($data)
+    final public function __construct(protected $rawData)
     {
-        $this->rawData = $data;
     }
 
     /**
@@ -30,7 +27,7 @@ final public function __construct($data)
      */
     public static function fromResponse(ResponseInterface $response)
     {
-        return new static(json_decode((string) $response->getBody()));
+        return new static(json_decode((string) $response->getBody(), null, 512, JSON_THROW_ON_ERROR));
     }
 
     public function getSelfLink()
@@ -132,6 +129,6 @@ public function rewind()
      */
     public function count()
     {
-        return count($this->rawData->list);
+        return is_countable($this->rawData->list) ? count($this->rawData->list) : 0;
     }
 }

src/Entity/Entity.php

@@ -9,16 +9,13 @@ abstract class Entity
     /**
      * @var mixed
      */
-    protected $rawData;
+    protected $data;
 
     /**
-     * @var mixed
+     * @param mixed $raw_data
      */
-    protected $data;
-
-    final public function __construct($raw_data)
+    final public function __construct(protected $rawData)
     {
-        $this->rawData = $raw_data;
     }
 
     /**
@@ -61,7 +58,7 @@ public function getData()
      */
     public function __get($name)
     {
-        return isset($this->rawData->$name) ? $this->rawData->$name : null;
+        return $this->rawData->$name ?? null;
     }
 
     /**
@@ -72,7 +69,7 @@ public function __get($name)
      * @param mixed $value
      *   Value
      */
-    public function __set($name, $value): void
+    public function __set($name, mixed $value): void
     {
         $this->rawData->$name = $value;
     }
@@ -129,6 +126,6 @@ abstract protected function getIntegerFields(): array;
      */
     public static function fromResponse(ResponseInterface $response): self
     {
-        return new static(json_decode((string) $response->getBody()));
+        return new static(json_decode((string) $response->getBody(), null, 512, JSON_THROW_ON_ERROR));
     }
 }

tests/Entity/Collection/EntityCollectionTest.php

@@ -20,7 +20,7 @@ class EntityCollectionTest extends TestCase
 
     public function testEntityCollection()
     {
-        $raw_data = json_decode(file_get_contents(__DIR__ . '/../../fixtures/comment-collection.json'));
+        $raw_data = json_decode(file_get_contents(__DIR__ . '/../../fixtures/comment-collection.json'), null, 512, JSON_THROW_ON_ERROR);
         $collection = $this->getMockForAbstractClass(EntityCollection::class, [
             'data' => $raw_data,
         ]);

tests/Request/CommentRequestTest.php

@@ -10,7 +10,7 @@ class CommentRequestTest extends TestCase
 
     public function testRequest()
     {
-        $req = new CommentRequest(10199115);
+        $req = new CommentRequest(10_199_115);
         $this->assertEquals('https://www.drupal.org/api-d7/comment/10199115.json', $req->getUri());
     }
 }

tests/Request/FileRequestTest.php

@@ -10,7 +10,7 @@ class FileRequestTest extends TestCase
 
     public function testRequest()
     {
-        $req = new FileRequest(5314867);
+        $req = new FileRequest(5_314_867);
         $this->assertEquals('https://www.drupal.org/api-d7/file/5314867.json', $req->getUri());
     }
 }