Feature/php8.3 support (#18)

* Fix styling

* removed phpcpd

* PHP coding style set to PER

* Disabled phpmd for now

* Bumped rector & code to 8.1

* replaced ? by null in @param

* reinstated spatie/dto package for now

* Fix styling

---------

Co-authored-by: LaravelFreelancerNL <LaravelFreelancerNL@users.noreply.github.com>

Author: LaravelFreelancerNL

.github/workflows/coverage.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.3
           extensions: mbstring, intl
           ini-values: post_max_size=256M, short_open_tag=On
           coverage: xdebug

.github/workflows/run-tests.yml

@@ -12,8 +12,8 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        arangodb: [3.8, 3.9, 3.10]
-        php: [8.0, 8.1, 8.2]
+        arangodb: ["3.10", 3.11]
+        php: [8.1, 8.2, 8.3]
         stability: [prefer-stable]
 
     name: P${{ matrix.php }} - A${{ matrix.arangodb }} - ${{ matrix.stability }}

bin/qa.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 printf "\nRun PHPMD\n"
-./vendor/bin/phpmd src/ text phpmd-ruleset.xml
-
-printf "\nRun PHPCPD\n"
-./vendor/bin/phpcpd src
+# disabled for now @see: https://github.com/pdepend/pdepend/issues/695
+#./vendor/bin/phpmd src/ text phpmd-ruleset.xml
 
 printf "\nRun PHPStan\n"
 composer analyse

composer.json

@@ -16,12 +16,12 @@
     "minimum-stability": "dev",
     "prefer-stable" : true,
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-curl": "*",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^7.3",
         "halaxa/json-machine": "^1.0",
-        "spatie/data-transfer-object": "^3.1"
+        "spatie/data-transfer-object": "^3.9"
     },
     "require-dev": {
         "laravel/pint": "^1.2.1",
@@ -30,8 +30,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^0.14.8",
-        "scrutinizer/ocular": "^1.8",
-        "sebastian/phpcpd": "^6.0"
+        "scrutinizer/ocular": "^1.8"
     },
     "autoload": {
         "psr-4": {

pint.json

@@ -0,0 +1,3 @@
+{
+  "preset": "per"
+}

rector.php

@@ -8,16 +8,16 @@
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
-        __DIR__.'/src',
-        __DIR__.'/tests',
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
     ]);
 
     // define sets of rules
     $rectorConfig->sets([
         SetList::CODE_QUALITY,
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 
     // Path to PHPStan with extensions, that PHPStan in Rector uses to determine types
-    $rectorConfig->phpstanConfig(__DIR__.'/phpstan.neon.dist');
+    $rectorConfig->phpstanConfig(__DIR__ . '/phpstan.neon.dist');
 };

src/Admin/AdminManager.php

@@ -11,9 +11,7 @@
 
 class AdminManager extends Manager
 {
-    public function __construct(protected ArangoClient $arangoClient)
-    {
-    }
+    public function __construct(protected ArangoClient $arangoClient) {}
 
     /**
      * @SuppressWarnings(PHPMD.BooleanArgumentFlag)

src/ArangoClient.php

@@ -62,7 +62,7 @@ public function generateEndpoint(array $config): string
             $endpoint = (string) $config['host'];
         }
         if (isset($config['port'])) {
-            $endpoint .= ':'.(string) $config['port'];
+            $endpoint .= ':' . (string) $config['port'];
         }
 
         return $endpoint;
@@ -126,11 +126,11 @@ public function debugRequest(
 
     protected function prependDatabaseToUri(string $uri, ?string $database = null): string
     {
-        if (! isset($database)) {
+        if (!isset($database)) {
             $database = $this->config->database;
         }
 
-        return '/_db/'.urlencode($database).$uri;
+        return '/_db/' . urlencode($database) . $uri;
     }
 
     /**
@@ -148,10 +148,10 @@ protected function handleGuzzleException(Throwable $e): void
         }
 
         throw(
-            new ArangoException(
-                $code.' - '.$message,
-                $code
-            )
+        new ArangoException(
+            $code . ' - ' . $message,
+            $code
+        )
         );
     }
 

src/Exceptions/ArangoException.php

@@ -2,6 +2,4 @@
 
 namespace ArangoClient\Exceptions;
 
-class ArangoException extends \Exception
-{
-}
+class ArangoException extends \Exception {}

src/HandlesJson.php

@@ -26,7 +26,7 @@ public function jsonEncode(mixed $data): string
         $response = json_encode($data, $options);
 
         if ($response === false) {
-            throw new ArangoException('JSON encoding failed with error: '.json_last_error_msg(), json_last_error());
+            throw new ArangoException('JSON encoding failed with error: ' . json_last_error_msg(), json_last_error());
         }
 
         return $response;
@@ -38,7 +38,7 @@ public function jsonEncode(mixed $data): string
     protected function decodeResponse(?ResponseInterface $response): stdClass
     {
         $decodedResponse = new stdClass();
-        if (! isset($response)) {
+        if (!isset($response)) {
             return $decodedResponse;
         }