fixes

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

@@ -17,8 +17,6 @@ jobs:
         php: [ '8.0', '8.1', '8.2']
         sf_version: [ '5.4.*', '6.2.*', '6.3.*' ]
         exclude:
-          - php: 7.4
-            sf_version: 6.2.*
           - php: 8.0
             sf_version: 6.2.*
           - php: 7.4
@@ -39,5 +37,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())
 ;

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,17 +2,9 @@
     "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]"
@@ -24,7 +16,7 @@
         "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": "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/services.php

@@ -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.xml

@@ -1,9 +1,10 @@
 version: '3.7'
 networks:
-    neo-eloquent:
+    neo4j-symfony:
 
 services:
     app:
+        user: ${UID-1000}:${GID-1000}
         build:
             context: .
         ports:
@@ -18,7 +19,7 @@ services:
             - NEO4J_PASSWORD=testtest
         working_dir: /opt/project
         networks:
-            - neo-eloquent
+            - neo4j-symfony
 
     neo4j:
         environment:
@@ -28,5 +29,5 @@ services:
             - ${DOCKER_HOST_NEO4J_HTTP_PORT:-7474}:7474
             - ${DOCKER_HOST_NEO4J_BOLT_PORT:-7687}:7687
         networks:
-            - neo-eloquent
+            - neo4j-symfony
 

docker-compose.yml

@@ -7,27 +7,46 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/neo4j/neo4j-bundle.svg?style=flat-square)](https://packagist.org/packages/neo4j/neo4j-bundle)
 
 
-## Install
+Installation
+============
 
-Via Composer
+Make sure Composer is installed globally, as explained in the
+[installation chapter](https://getcomposer.org/doc/00-intro.md)
+of the Composer documentation.
 
-``` bash
+Applications that use Symfony Flex
+----------------------------------
+
+Open a command console, enter your project directory and execute:
+
+```console
+$ composer require neo4j/neo4j-bundle
+```
+
+Applications that don't use Symfony Flex
+----------------------------------------
+
+### Step 1: Download the Bundle
+
+Open a command console, enter your project directory and execute the
+following command to download the latest stable version of this bundle:
+
+```console
 $ composer require neo4j/neo4j-bundle
 ```
 
-Enable the bundle in your kernel:
+### Step 2: Enable the Bundle
+
+Then, enable the bundle by adding it to the list of registered bundles
+in the `config/bundles.php` file of your project:
 
-``` php
-<?php
-// app/AppKernel.php
+```php
+// config/bundles.php
 
-public function registerBundles()
-{
-    $bundles = array(
-        // ...
-        new Neo4j\Neo4jBundle\Neo4jBundle(),
-    );
-}
+return [
+    // ...
+    \Neo4j\Neo4jBundle\Neo4jBundle::class => ['all' => true],
+];
 ```
 
 ## Documentation

docs/README.md

@@ -10,6 +10,7 @@
 >
     <projectFiles>
         <directory name="src"/>
+        <directory name="config"/>
         <directory name="tests"/>
         <ignoreFiles>
             <directory name="vendor"/>

psalm.xml

@@ -0,0 +1,2 @@
+*
+!.gitignore

public/.gitignore

@@ -4,7 +4,6 @@
 
 namespace Neo4j\Neo4jBundle;
 
-use InvalidArgumentException;
 use Laudis\Neo4j\Authentication\Authenticate;
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Common\Uri;
@@ -13,9 +12,11 @@
 use Laudis\Neo4j\Databags\HttpPsrBindings;
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Databags\SslConfiguration;
+use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Databags\TransactionConfiguration;
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Enum\SslMode;
+use Laudis\Neo4j\Types\CypherMap;
 use Neo4j\Neo4jBundle\DependencyInjection\Configuration;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -46,10 +47,12 @@ public function __construct(
         private ClientInterface|null $client,
         private StreamFactoryInterface|null $streamFactory,
         private RequestFactoryInterface|null $requestFactory,
-    ) {}
+    ) {
+    }
 
     public function create(): SymfonyClient
     {
+        /** @var ClientBuilder<SummarizedResult<CypherMap>> $builder */
         $builder = ClientBuilder::create();
 
         if ($this->driverConfig) {
@@ -73,7 +76,6 @@ public function create(): SymfonyClient
             );
         }
 
-        /** @psalm-suppress InvalidArgument */
         return new SymfonyClient($builder->build(), $this->eventHandler);
     }
 
@@ -129,19 +131,19 @@ private function makeTransactionConfig(): TransactionConfiguration
      */
     private function createAuth(array|null $auth, string $dsn): AuthenticateInterface
     {
-        if ($auth === null) {
+        if (null === $auth) {
             return Authenticate::disabled();
         }
 
         return match ($auth['type'] ?? null) {
             'basic' => Authenticate::basic(
-                $auth['username'] ?? throw new InvalidArgumentException('Missing username for basic authentication'),
-                $auth['password'] ?? throw new InvalidArgumentException('Missing password for basic authentication')
+                $auth['username'] ?? throw new \InvalidArgumentException('Missing username for basic authentication'),
+                $auth['password'] ?? throw new \InvalidArgumentException('Missing password for basic authentication')
             ),
-            'kerberos' => Authenticate::kerberos($auth['token'] ?? throw new InvalidArgumentException('Missing token for kerberos authentication')),
+            'kerberos' => Authenticate::kerberos($auth['token'] ?? throw new \InvalidArgumentException('Missing token for kerberos authentication')),
             'dsn', null => Authenticate::fromUrl(Uri::create($dsn)),
             'none' => Authenticate::disabled(),
-            'oid' => Authenticate::oidc($auth['token'] ?? throw new InvalidArgumentException('Missing token for oid authentication')),
+            'oid' => Authenticate::oidc($auth['token'] ?? throw new \InvalidArgumentException('Missing token for oid authentication')),
         };
     }
 
@@ -150,7 +152,7 @@ private function createAuth(array|null $auth, string $dsn): AuthenticateInterfac
      */
     private function makeSslConfig(array|null $ssl): SslConfiguration
     {
-        if ($ssl === null) {
+        if (null === $ssl) {
             return new SslConfiguration(
                 mode: SslMode::DISABLE(),
                 verifyPeer: false,