Added bolt support (#9)

Typo

Fixed minimum requirement

Author: xavismeh

DependencyInjection/Configuration.php

@@ -85,9 +85,9 @@ public function getConfigTreeBuilder()
                 ->prototype('array')
                 ->addDefaultsIfNotSet()
                 ->children()
-                    ->enumNode('schema')->values(['http', 'bolt'])->defaultValue('http')->end()
+                    ->enumNode('schema')->values(['http', 'bolt'])->defaultValue('bolt')->end()
                     ->scalarNode('host')->defaultValue('localhost')->end()
-                    ->integerNode('port')->defaultValue(7474)->end()
+                    ->integerNode('port')->end()
                     ->scalarNode('username')->defaultValue('neo4j')->end()
                     ->scalarNode('password')->defaultValue('neo4j')->end()
                 ->end()

DependencyInjection/Neo4jExtension.php

@@ -4,7 +4,9 @@
 
 namespace Neo4j\Neo4jBundle\DependencyInjection;
 
+use GraphAware\Bolt\Driver as BoltDriver;
 use GraphAware\Neo4j\Client\Connection\Connection;
+use GraphAware\Neo4j\Client\HttpDriver\Driver as HttpDriver;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -48,6 +50,22 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container): Configuration
+    {
+        return new Configuration($container->getParameter('kernel.debug'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAlias(): string
+    {
+        return 'neo4j';
+    }
+
     /**
      * @param array            $config
      * @param ContainerBuilder $container
@@ -167,20 +185,23 @@ private function getUrl(array $config): string
             $config['username'],
             $config['password'],
             $config['host'],
-            $config['port']
+            $this->getPort($config)
         );
     }
 
     /**
-     * {@inheritdoc}
+     * Return the correct default port if not manually set.
+     *
+     * @param array $config
+     *
+     * @return int
      */
-    public function getConfiguration(array $config, ContainerBuilder $container): Configuration
+    private function getPort(array $config)
     {
-        return new Configuration($container->getParameter('kernel.debug'));
-    }
+        if (isset($config['port'])) {
+            return $config['port'];
+        }
 
-    public function getAlias(): string
-    {
-        return 'neo4j';
+        return 'http' == $config['schema'] ? HttpDriver::DEFAULT_HTTP_PORT : BoltDriver::DEFAULT_TCP_PORT;
     }
 }

README.md

@@ -67,11 +67,11 @@ neo4j:
     enabled: true
   connections:
     default:
-      schema: http #default
-      host: localhost #default
-      port: 7474 #default
-      username: neo4j #default
-      password: neo4j #default
+      schema: bolt # default (must be either "http" or "bolt")
+      host: localhost # default
+      port: 7474 # optional, will be set to the proper driver's default port if not provided
+      username: neo4j # default
+      password: neo4j # default
     second_connection:
       username: foo
       password: bar

composer.json

@@ -8,13 +8,18 @@
         {
             "name": "Tobias Nyholm",
             "email": "[email protected]"
+        },
+        {
+            "name": "Xavier Coureau",
+            "email": "[email protected]"
         }
     ],
     "require": {
         "php": "^7.0",
         "graphaware/neo4j-php-ogm": "^1.0",
-        "graphaware/neo4j-php-client": "^4.6",
-        "symfony/framework-bundle": "^3.0"
+        "graphaware/neo4j-php-client": "^4.6.4",
+        "symfony/framework-bundle": "^3.0",
+        "graphaware/neo4j-bolt": "^1.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.4",