Merge pull request #79 from neo4j-php/rework

Rework

Author: transistive

.github/workflows/static-analysis.yml

@@ -19,6 +19,6 @@ jobs:
           php_version: 8.0
           version: 2
       - name: "PHP-CS-Fixer"
-        run: vendor/bin/php-cs-fixer fix --dry-run
+        run: composer check-cs
       - name: "PSalm"
-        run: ./console debug:config && vendor/bin/psalm --show-info=true
+        run: composer psalm

.github/workflows/tests.yml

@@ -15,14 +15,8 @@ jobs:
       max-parallel: 10
       matrix:
         php: [ '8.0', '8.1', '8.2']
-        sf_version: [ '5.4.*', '6.2.*', '6.3.*' ]
+        sf_version: [ '5.4.*', '6.0.*', '6.3.*' ]
         exclude:
-          - php: 7.4
-            sf_version: 6.2.*
-          - php: 8.0
-            sf_version: 6.2.*
-          - php: 7.4
-            sf_version: 6.3.*
           - php: 8.0
             sf_version: 6.3.*
 
@@ -39,5 +33,4 @@ jobs:
           php_version: ${{ matrix.php }}
           memory_limit: 1024M
           version: 9
-          testsuite: Unit
           bootstrap: vendor/autoload.php

.php-cs-fixer.dist.php

@@ -24,6 +24,7 @@
 try {
     $finder = PhpCsFixer\Finder::create()
         ->in(__DIR__.'/src')
+        ->in(__DIR__.'/config')
         ->in(__DIR__.'/tests');
 } catch (Throwable $e) {
     echo $e->getMessage()."\n";
@@ -35,28 +36,6 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
-
-        'array_syntax' => ['syntax' => 'short'],
-        'linebreak_after_opening_tag' => true,
-        'ordered_imports' => true,
-        'phpdoc_order' => true,
-        'phpdoc_to_comment' => false,
-        'yoda_style' => false,
-        'declare_strict_types' => true,
-        'global_namespace_import' => [
-            'import_classes' => true,
-            'import_constants' => true,
-            'import_functions' => true,
-        ],
-        ConstructorEmptyBracesFixer::name() => true,
-        IssetToArrayKeyExistsFixer::name() => true,
-        MultilineCommentOpeningClosingAloneFixer::name() => true,
-        MultilinePromotedPropertiesFixer::name() => true,
-        PhpUnitAssertArgumentsOrderFixer::name() => true,
-        PhpdocNoSuperfluousParamFixer::name() => true,
-        PhpdocParamOrderFixer::name() => true,
-        StringableInterfaceFixer::name() => true,
     ])
     ->setFinder($finder)
-    ->registerCustomFixers(new PhpCsFixerCustomFixers\Fixers())
 ;

Dockerfile

@@ -0,0 +1,16 @@
+FROM php:8.1-cli
+RUN apt-get update \
+    && apt-get install -y \
+        libzip-dev \
+        unzip \
+        git \
+        wget \
+    && docker-php-ext-install -j$(nproc) bcmath sockets \
+    && pecl install xdebug \
+    && docker-php-ext-enable xdebug && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+WORKDIR /opt/project
+
+
+

bin/console.php

@@ -0,0 +1,10 @@
+<?php
+
+use Neo4j\Neo4jBundle\Tests\App\TestKernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+$console = new Application(new TestKernel('test', true));
+
+$console->run();

composer.json

@@ -2,29 +2,21 @@
     "name": "neo4j/neo4j-bundle",
     "description": "Symfony integration for Neo4j",
     "type": "symfony-bundle",
-    "keywords": ["neo4j"],
+    "keywords": ["neo4j", "symfony", "bundle", "graph", "database", "cypher"],
     "license": "MIT",
     "authors": [
-        {
-            "name": "Tobias Nyholm",
-            "email": "[email protected]"
-        },
-        {
-            "name": "Xavier Coureau",
-            "email": "[email protected]"
-        },
         {
             "name": "Ghlen Nagels",
             "email": "[email protected]"
         }
     ],
     "require": {
         "php": ">=8.0",
-        "laudis/neo4j-php-client": "dev-main",
+        "laudis/neo4j-php-client": "^3.0.5",
         "twig/twig": "^3.0",
         "ext-json": "*",
         "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/config": "^6.0"
+        "symfony/config": "^5.4 || ^6.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
@@ -35,9 +27,9 @@
         "symfony/http-kernel": "^5.4 || ^6.0",
         "symfony/test-pack": "^1.1",
         "symfony/yaml": "^5.4 || ^6.0",
-        "vimeo/psalm": "^5.12",
+        "vimeo/psalm": "^5.15.0",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "^3.30",
         "psalm/plugin-phpunit": "^0.18"
     },
     "autoload": {
@@ -55,5 +47,10 @@
         "allow-plugins": {
             "php-http/discovery": false
         }
+    },
+    "scripts": {
+        "psalm": "php bin/console.php cache:warmup && vendor/bin/psalm --show-info=true",
+        "fix-cs": "vendor/bin/php-cs-fixer fix",
+        "check-cs": "vendor/bin/php-cs-fixer fix --dry-run"
     }
 }

config/data-collector.xml

@@ -0,0 +1,54 @@
+<?php
+
+use Laudis\Neo4j\Basic\Driver;
+use Laudis\Neo4j\Basic\Session;
+use Laudis\Neo4j\Contracts\ClientInterface;
+use Laudis\Neo4j\Contracts\DriverInterface;
+use Laudis\Neo4j\Contracts\SessionInterface;
+use Laudis\Neo4j\Contracts\TransactionInterface;
+use Neo4j\Neo4jBundle\ClientFactory;
+use Neo4j\Neo4jBundle\EventHandler;
+use Neo4j\Neo4jBundle\EventListener\Neo4jProfileListener;
+use Neo4j\Neo4jBundle\SymfonyClient;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $configurator) {
+    $services = $configurator->services();
+
+    $services->set('neo4j.event_handler', EventHandler::class)
+        ->autowire()
+        ->autoconfigure();
+
+    $services->set('neo4j.client_factory', ClientFactory::class)
+        ->args([
+            service('neo4j.event_handler'),
+        ]);
+
+    $services->set('neo4j.client', SymfonyClient::class)
+        ->factory([service('neo4j.client_factory'), 'create'])
+        ->public();
+
+    $services->set('neo4j.driver', Driver::class)
+        ->factory([service('neo4j.client'), 'getDriver'])
+        ->public();
+
+    $services->set('neo4j.session', Session::class)
+        ->factory([service('neo4j.driver'), 'createSession'])
+        ->share(false)
+        ->public();
+
+    $services->set('neo4j.transaction', TransactionInterface::class)
+        ->factory([service('neo4j.session'), 'beginTransaction'])
+        ->share(false)
+        ->public();
+
+    $services->alias(ClientInterface::class, 'neo4j.client');
+    $services->alias(DriverInterface::class, 'neo4j.driver');
+    $services->alias(SessionInterface::class, 'neo4j.session');
+    $services->alias(TransactionInterface::class, 'neo4j.transaction');
+
+    $services->set('neo4j.subscriber', Neo4jProfileListener::class)
+        ->tag('kernel.event_subscriber');
+};

config/services.php

@@ -0,0 +1,33 @@
+version: '3.7'
+networks:
+    neo4j-symfony:
+
+services:
+    app:
+        user: ${UID-1000}:${GID-1000}
+        build:
+            context: .
+        ports:
+            - ${DOCKER_HOST_APP_PORT:-8000}:80
+        volumes:
+            - ./:/opt/project
+        environment:
+            - NEO4J_HOST=neo4j
+            - NEO4J_DATABASE=neo4j
+            - NEO4J_PORT=7687
+            - NEO4J_USER=neo4j
+            - NEO4J_PASSWORD=testtest
+        working_dir: /opt/project
+        networks:
+            - neo4j-symfony
+
+    neo4j:
+        environment:
+            - NEO4J_AUTH=neo4j/testtest
+        image: neo4j:5
+        ports:
+            - ${DOCKER_HOST_NEO4J_HTTP_PORT:-7474}:7474
+            - ${DOCKER_HOST_NEO4J_BOLT_PORT:-7687}:7687
+        networks:
+            - neo4j-symfony
+