diff --git a/Dockerfile b/Dockerfile index 23eb403..ad10216 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,19 @@ # Use an official PHP image as the base image -FROM php:8.1-cli +FROM php:8.2-fpm # 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 \ +RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libfreetype6-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install gd zip + && docker-php-ext-install gd # Set working directory WORKDIR /var/www # Copy the composer.phar file to the container COPY --from=composer:latest /usr/bin/composer /usr/bin/composer + +# Expose PHP-FPM port +EXPOSE 9000 + +# Start PHP-FPM server +CMD ["php-fpm"] diff --git a/composer.lock b/composer.lock index ce3d29b..249fa0f 100644 --- a/composer.lock +++ b/composer.lock @@ -6650,16 +6650,16 @@ }, { "name": "vimeo/psalm", - "version": "6.8.4", + "version": "6.8.6", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "7ee919229d510c5834af3112072f4b12cd7bb51a" + "reference": "34ba9e1e5ea2e7396d3e2e644ee3e3a1d4336603" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/7ee919229d510c5834af3112072f4b12cd7bb51a", - "reference": "7ee919229d510c5834af3112072f4b12cd7bb51a", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/34ba9e1e5ea2e7396d3e2e644ee3e3a1d4336603", + "reference": "34ba9e1e5ea2e7396d3e2e644ee3e3a1d4336603", "shasum": "" }, "require": { @@ -6764,7 +6764,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2025-02-20T10:00:51+00:00" + "time": "2025-02-21T10:03:22+00:00" }, { "name": "webmozart/assert", @@ -6827,13 +6827,13 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { "ext-json": "*", "php": "^8.1" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/docker-compose.yml b/docker-compose.yml index b5d8dd5..17a2afd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,10 +7,24 @@ services: context: . dockerfile: Dockerfile container_name: php-app + working_dir: /var/www volumes: - .:/var/www networks: - mynetwork + ports: + - "9000:9000" # Exposing port for PHP-FPM + + # Composer Service + composer: + image: composer:latest + container_name: composer + volumes: + - .:/var/www + working_dir: /var/www + networks: + - mynetwork + command: ["install", "--no-progress", "--prefer-dist"] # Neo4j Service (Optional, if you need Neo4j) neo4j: diff --git a/src/ResponseParser.php b/src/ResponseParser.php index 4bc440b..9acf56b 100644 --- a/src/ResponseParser.php +++ b/src/ResponseParser.php @@ -14,7 +14,7 @@ use Neo4j\QueryAPI\Objects\ProfiledQueryPlan; use Neo4j\QueryAPI\Objects\Point; -final class ResponseParser +class ResponseParser { public function __construct(private readonly OGM $ogm) { diff --git a/tests/Unit/Neo4jQueryAPIUnitTest.php b/tests/Unit/Neo4jQueryAPIUnitTest.php index 0b0be61..a14b6c0 100644 --- a/tests/Unit/Neo4jQueryAPIUnitTest.php +++ b/tests/Unit/Neo4jQueryAPIUnitTest.php @@ -20,6 +20,7 @@ use Psr\Http\Message\StreamInterface; use RuntimeException; use Neo4j\QueryAPI\Configuration; +use Neo4j\QueryAPI\ResponseParserInterface; /** * @api @@ -47,10 +48,6 @@ protected function setUp(): void $this->parser = new ResponseParser($this->ogm); } - - - - public function testCorrectClientSetup(): void { $neo4jQueryAPI = Neo4jQueryAPI::login($this->address, Authentication::fromEnvironment());