Merge remote-tracking branch 'origin/main' into configuration-injection-factory-method

Author: Pratiksha

.github/workflows/cs-fixer.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.1
           tools: composer
 
       - name: Install dependencies

.github/workflows/psalm.yml

@@ -9,14 +9,15 @@ jobs:
     name: Run Psalm
     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.3
+          php-version: 8.1
           tools: composer, psalm
 
       - name: Install dependencies

.github/workflows/test.yml

@@ -10,17 +10,30 @@ concurrency:
 
 jobs:
   tests:
+    services:
+      neo4j:
+        image: neo4j:latest
+        ports:
+          - 7474:7474
+          - 7687:7687
+        env:
+          NEO4J_AUTH: neo4j/password
+        options: >-
+          --health-cmd "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1"
+          --health-interval 10s
+          --health-retries 5
+          --health-timeout 5s
+
     name: Run PHPUnit Tests
     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
+          php-version: 8.1
           tools: composer, xdebug
 
       - name: Cache Composer dependencies
@@ -35,7 +48,7 @@ jobs:
 
       - name: Run Tests without phpunit.xml
         env:
-          NEO4J_ADDRESS: ${{ secrets.NEO4J_ADDRESS }}
-          NEO4J_USERNAME: ${{ secrets.NEO4J_USERNAME }}
-          NEO4J_PASSWORD: ${{ secrets.NEO4J_PASSWORD }}
+          NEO4J_ADDRESS: "http://localhost:7474"
+          NEO4J_USERNAME: "neo4j"
+          NEO4J_PASSWORD: "password"
         run: vendor/bin/phpunit --configuration phpunit.dist.xml

.github/workflows/testaura.yml

@@ -0,0 +1,44 @@
+name: Test Neo4j Aura
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch: # Allows manual trigger
+
+concurrency:
+  group: neo4j-aura-test-main
+  cancel-in-progress: true
+
+jobs:
+  tests-aura:
+    name: Run PHPUnit Tests with Neo4j Aura
+    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.1
+          tools: composer, xdebug
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist
+
+      - name: Run Tests
+        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

@@ -13,3 +13,8 @@ test
 #PHP-CS-FIXER
 .php-cs-fixer.php
 .php-cs-fixer.cache
+
+
+coverage
+
+composer.lock

Dockerfile

@@ -0,0 +1,13 @@
+# Use an official PHP image as the base image
+FROM php:8.1-cli
+
+# Install necessary extensions (e.g., for Composer)
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libfreetype6-dev git libzip-dev zip \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install gd zip
+
+# Set working directory
+WORKDIR /var/www
+
+# Copy the composer.phar file to the container
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

composer.json

@@ -3,18 +3,21 @@
     "name": "neo4j-php/query-api",
     "description": "Easy to use class to run Cypher queries on the Query API",
     "require": {
-        "guzzlehttp/guzzle": "^7.9",
         "psr/http-client": "^1.0",
         "ext-json": "*",
         "php": "^8.1",
-        "nyholm/psr7": "^1.8"
+        "nyholm/psr7": "^1.8",
+        "php-http/discovery": "^1.17"
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.0",
+        "guzzlehttp/guzzle": "^7.9",
+        "phpunit/phpunit": "^10.0",
         "friendsofphp/php-cs-fixer": "^3.68",
-        "vimeo/psalm": "^6.5"
-
+        "vimeo/psalm": "^6.8",
+        "dg/bypass-finals": "^1.9",
+        "psalm/plugin-phpunit": "^0.19.2"
     },
+
     "autoload": {
         "psr-4": {
             "Neo4j\\QueryAPI\\": "src/"
@@ -28,7 +31,15 @@
     "authors": [
         {
             "name": "p123-stack",
-            "email": "[email protected]"
+            "email": "[email protected]"
+        },
+        {
+            "name": "123kiran17",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Ghlen Nagels",
+            "email": "[email protected]"
         }
     ],
     "config": {
@@ -40,7 +51,7 @@
     "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",
-        "psalm": "vendor/bin/psalm"
+        "psalm": "vendor/bin/psalm --no-cache --show-info=true"
     }
 
 }