Add/update SymfonyDriver unit tests

Author: SiddheshBhatkar777

composer.json

@@ -58,9 +58,6 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test:unit": "vendor/bin/phpunit --testsuite='Unit tests'",
-        "test:functional": "vendor/bin/phpunit --testsuite='Functional tests'",
         "psalm": "APP_ENV=dev 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",

docker-compose.yml

@@ -31,8 +31,8 @@ services:
         environment:
             - NEO4J_AUTH=neo4j/testtest
 
-            # advertise "neo4j:7687" instead of localhost for proper routing
-            - NEO4J_server_default__advertised__address=neo4j
-            - NEO4J_server_bolt_advertised__address=neo4j:7687
+            # advertise “neo4j:7687” instead of localhost
+            - NEO4J_server_default__advertised__address=${DEFAULT_ADDRESS-localhost}
+            - NEO4J_server_bolt_advertised__address=${DEFAULT_ADDRESS-localhost}:7687
         networks:
             - neo4j-symfony

docs/README.md

@@ -14,6 +14,8 @@ Make sure Composer is installed globally, as explained in the
 [installation chapter](https://getcomposer.org/doc/00-intro.md)
 of the Composer documentation.
 
+Applications that don't use Symfony Flex
+
 ### Step 1: Download the Bundle
 
 Open a command console, enter your project directory and execute the
@@ -40,7 +42,7 @@ return [
 ## Documentation
 
 The bundle is a convenient way of registering services. We register `Drivers` and one
-`Client`. You will always have alias for the default services:
+`Clients`. You will always have alias for the default services:
 
 * neo4j.driver
 * neo4j.client
@@ -51,14 +53,7 @@ The bundle is a convenient way of registering services. We register `Drivers` an
 ```yaml
 neo4j:
   drivers:
-    - alias: default
-```
-
-Or even simpler, if you want to use all defaults:
-
-```yaml
-neo4j:
-  drivers: []
+    default: ~
 ```
 
 With the minimal configuration we have services named:
@@ -97,47 +92,6 @@ neo4j:
         username: '%neo4j.backup-user%'
         password: '%neo4j.backup-pass%'
 ```
-
-## Testing
-
-### Prerequisites
-
-Functional tests require a Neo4j instance to be running. The easiest way to set this up is using Docker Compose:
-
-```bash
-$ docker-compose up -d
-```
-
-This will start a Neo4j instance accessible at `bolt://neo4j:testtest@neo4j:7687`.
-
-> **Note:** For single-instance Neo4j setups, use the `bolt://` scheme. The `neo4j://` scheme is intended for clustered setups with routing support.
-
-### Running Tests
-
-Run all tests:
-
-```bash
-$ composer test
-```
-
-Run only unit tests (no Neo4j instance required):
-
-```bash
-$ composer test:unit
-```
-
-Run only functional tests (requires Neo4j instance):
-
-```bash
-$ composer test:functional
-```
-
-You can also run PHPUnit directly:
-
-```bash
-$ ./vendor/bin/phpunit
-```
-
 ### Code Quality
 
 Check code style:
@@ -164,4 +118,4 @@ See an example application at https://github.com/neo4j-examples/movies-symfony-p
 
 ## License
 
-The MIT License (MIT). Please see [License File](LICENSE) for more information.
+The MIT License (MIT). Please see [License File](../LICENSE) for more information.

src/Collector/Neo4jDataCollector.php

@@ -43,62 +43,26 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
 
                 $statement[$key] = $t->recursiveToArray($value);
             }
-
-            if (isset($summary['result']) && method_exists($summary['result'], 'getStatement')) {
-                /** @var object $result */
-                $result = $summary['result'];
-                if (method_exists($result, 'getStatement')) {
-                    $resultStatement = $result->getStatement();
-                    $statement['statement'] = $t->recursiveToArray($resultStatement);
-                    if (is_object($resultStatement) && method_exists($resultStatement, 'getParameters')) {
-                        $params = $resultStatement->getParameters();
-                        $statement['parameters'] = is_array($params)
-                            ? $params
-                            : $t->recursiveToArray($params);
-                    }
-                }
-            }
             $successfulStatements[] = $statement;
         }
 
         $failedStatements = array_map(
-            function (array $x) use ($t) {
-                $statement = [
-                    'status' => 'failure',
-                    'time' => $x['time'],
-                    'timestamp' => $x['timestamp'],
-                    'result' => [
-                        'statement' => $x['statement']?->toArray(),
-                    ],
-                    'exception' => [
-                        'code' => $x['exception']->getErrors()[0]->getCode(),
-                        'message' => $x['exception']->getErrors()[0]->getMessage(),
-                        'classification' => $x['exception']->getErrors()[0]->getClassification(),
-                        'category' => $x['exception']->getErrors()[0]->getCategory(),
-                        'title' => $x['exception']->getErrors()[0]->getTitle(),
-                    ],
-                    'error' => [
-                        'code' => $x['exception']->getErrors()[0]->getCode(),
-                        'message' => $x['exception']->getErrors()[0]->getMessage(),
-                        'classification' => $x['exception']->getErrors()[0]->getClassification(),
-                        'category' => $x['exception']->getErrors()[0]->getCategory(),
-                        'title' => $x['exception']->getErrors()[0]->getTitle(),
-                    ],
-                    'alias' => $x['alias'],
-                ];
-
-                if (null !== $x['statement']) {
-                    $statement['statement'] = $t->recursiveToArray($x['statement']);
-                    if (is_object($x['statement']) && method_exists($x['statement'], 'getParameters')) {
-                        $params = $x['statement']->getParameters();
-                        $statement['parameters'] = is_array($params)
-                            ? $params
-                            : $t->recursiveToArray($params);
-                    }
-                }
-
-                return $statement;
-            },
+            static fn (array $x) => [
+                'status' => 'failure',
+                'time' => $x['time'],
+                'timestamp' => $x['timestamp'],
+                'result' => [
+                    'statement' => $x['statement']?->toArray(),
+                ],
+                'exception' => [
+                    'code' => $x['exception']->getErrors()[0]->getCode(),
+                    'message' => $x['exception']->getErrors()[0]->getMessage(),
+                    'classification' => $x['exception']->getErrors()[0]->getClassification(),
+                    'category' => $x['exception']->getErrors()[0]->getCategory(),
+                    'title' => $x['exception']->getErrors()[0]->getTitle(),
+                ],
+                'alias' => $x['alias'],
+            ],
             $this->subscriber->getProfiledFailures()
         );
 
@@ -133,18 +97,18 @@ public function getStatements(): array
 
     public function getSuccessfulStatements(): array
     {
-        return array_values(array_filter(
+        return array_filter(
             $this->data['statements'],
             static fn (array $x) => 'success' === $x['status']
-        ));
+        );
     }
 
     public function getFailedStatements(): array
     {
-        return array_values(array_filter(
+        return array_filter(
             $this->data['statements'],
             static fn (array $x) => 'failure' === $x['status']
-        ));
+        );
     }
 
     /** @api */
@@ -174,7 +138,7 @@ private function recursiveToArray(array|object $obj): mixed
     {
         if (is_array($obj)) {
             return array_map(
-                fn (mixed $x): mixed => is_array($x) || is_object($x) ? $this->recursiveToArray($x) : $x,
+                fn (mixed $x): mixed => $this->recursiveToArray($x),
                 $obj
             );
         }

src/Decorators/SymfonyTransaction.php

@@ -75,7 +75,7 @@ public function rollback(): void
         $this->handler->handleTransactionAction(
             TransactionState::ROLLED_BACK,
             $this->transactionId,
-            fn () => $this->tsx->rollback(),
+            fn () => $this->tsx->commit(),
             $this->alias,
             $this->scheme,
         );

tests/App/config/default.yml

@@ -11,7 +11,7 @@ services:
 framework:
   secret: test
   test: true
-  profiler: { enabled: true, collect: true, collect_serializer_data: true }
+  profiler: { enabled: true, collect: true }
   router:
     resource: '%kernel.project_dir%/tests/App/config/routes.yaml'
     type: 'yaml'
@@ -26,11 +26,11 @@ web_profiler:
   intercept_redirects: false
 
 parameters:
-  neo4j.dsn.badname: bolt://localhost:7687
+  neo4j.dsn.badname: bolt://localhost
   neo4j.dsn.secret: neo4j://neo4j:secret@localhost:7688
-  neo4j.dsn.test: bolt://neo4j:testtest@neo4j:7687
-  neo4j.dsn.auth: bolt://neo4j:testtest@neo4j:7687
-  neo4j.dsn.simple: bolt://test:test@localhost:7687
+  neo4j.dsn.test: neo4j://neo4j:testtest@neo4j
+  neo4j.dsn.auth: neo4j://neo4j
+  neo4j.dsn.simple: bolt://test:test@localhost
 
 neo4j:
   min_log_level: warning
@@ -73,7 +73,6 @@ neo4j:
 
     - alias: neo4j-test
       dsn: "%neo4j.dsn.test%"
-      profiling: true
 
     - alias: neo4j-auth
       dsn: "%neo4j.dsn.auth%"

tests/Functional/IntegrationTest.php

@@ -86,7 +86,7 @@ public function testDefaultDsn(): void
 
         $uri = $this->getPrivateProperty($driver, 'parsedUrl');
 
-        $this->assertContains($uri->getScheme(), ['neo4j', 'bolt']);
+        $this->assertSame($uri->getScheme(), 'neo4j');
     }
 
     public function testDsn(): void
@@ -96,7 +96,7 @@ public function testDsn(): void
 
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessageMatches(
-            "/Cannot connect to any server on alias: neo4j_undefined_configs with Uris: \('bolt:\/\/(localhost|localhostt)(:7687)?'\)/"
+            "/Cannot connect to any server on alias: neo4j_undefined_configs with Uris: \('bolt:\/\/(localhost|localhostt)'\)/"
         );
 
         /**