resolved merge conflicts

Author: p123-stack

.env

@@ -0,0 +1,4 @@
+# Database Configuration
+NEO4J_ADDRESS=https://6f72daa1.databases.neo4j.io/
+NEO4J_USERNAME=neo4j
+NEO4J_PASSWORD=O9lWmptqBgxBOz8NVcTJjgs3cHPyYmsy63ui6Spmw1d0

.github/workflows/cs-fixer.yml

@@ -0,0 +1,32 @@
+name: PHP CS Fixer
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**/*.php'
+  pull_request:
+    paths:
+      - '**/*.php'
+
+jobs:
+  php-cs-fixer:
+    name: PHP CS Fixer
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: composer
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist
+
+      - name: Run PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --allow-risky=yes

.github/workflows/ci.yml renamed to .github/workflows/test.yml

@@ -35,7 +35,9 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --prefer-dist
 
-
-
       - name: Run Tests without phpunit.xml
+        env:
+          NEO4J_ADDRESS: ${{ secrets.NEO4J_ADDRESS }}
+          NEO4J_USERNAME: ${{ secrets.NEO4J_USERNAME }}
+          NEO4J_PASSWORD: ${{ secrets.NEO4J_PASSWORD }}
         run: vendor/bin/phpunit --configuration phpunit.dist.xml

.gitignore

@@ -1,5 +1,14 @@
+#IDE
 .idea/
+
+#COMPOSER
 vendor
+
+#PHPUNIT
 phpunit.xml
 test
 .phpunit.result.cache
+
+#PHP-CS-FIXER
+.php-cs-fixer.php
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+return (new Config())
+    ->setRules([
+        '@PSR12' => true,
+    ])
+    ->setFinder(
+        Finder::create()
+            ->in(__DIR__)
+            ->exclude([
+                'vendor',
+            ])
+    );

composer.json

@@ -32,5 +32,11 @@
         "allow-plugins": {
             "php-http/discovery": true
         }
+    },
+
+    "scripts": {
+        "cs": "vendor/bin/php-cs-fixer fix --dry-run --diff --allow-risky=yes",
+        "cs:fix": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     }
-}
+
+}

src/Exception/Neo4jException.php

@@ -4,7 +4,6 @@
 
 use Exception;
 
-
 /**
  * @api
  */
@@ -20,8 +19,7 @@ public function __construct(
         array       $errorDetails = [],
         int         $statusCode = 0,
         ?\Throwable $previous = null
-    )
-    {
+    ) {
         $this->errorCode = $errorDetails['code'] ?? 'Neo.UnknownError';
         $errorParts = explode('.', $this->errorCode);
         $this->errorType = $errorParts[1] ?? null;

src/OGM.php

@@ -103,4 +103,4 @@ private function mapProperties(array $properties): array
         return $mappedProperties;
     }
 
-}
+}

src/Objects/Bookmarks.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Neo4j\QueryAPI\Objects;
+
 /**
  * @api
  */

src/Objects/Node.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Neo4j\QueryAPI\Objects;
 
 /**