Merge remote-tracking branch 'origin/master' into Nyholm-datacollector

Author: xavismeh

Changelog.md

@@ -0,0 +1,9 @@
+# Change Log
+
+The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
+
+## UNRELEASED
+
+## 0.1.0
+
+First release

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,10 @@
 
 namespace Neo4j\Neo4jBundle\DependencyInjection;
 
+use GraphAware\Bolt\Driver as BoltDriver;
 use GraphAware\Neo4j\Client\Connection\Connection;
+use GraphAware\Neo4j\OGM\EntityManager;
+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;
@@ -32,7 +35,10 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->handleConnections($config, $container);
         $clientServiceIds = $this->handleClients($config, $container);
-        $this->handleEntityMangers($config, $container, $clientServiceIds);
+        if ($this->validateEntityManagers($config)) {
+            $loader->load('entity_manager.xml');
+            $this->handleEntityMangers($config, $container, $clientServiceIds);
+        }
 
         // add aliases for the default services
         $container->setAlias('neo4j.connection', 'neo4j.connection.default');
@@ -45,6 +51,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
@@ -92,11 +114,6 @@ private function handleClients(array &$config, ContainerBuilder $container): arr
      */
     private function handleEntityMangers(array &$config, ContainerBuilder $container, array $clientServiceIds): array
     {
-        if (empty($config['entity_managers'])) {
-            // Add default entity manager if none set.
-            $config['entity_managers']['default'] = ['client' => 'default'];
-        }
-
         $serviceIds = [];
         foreach ($config['entity_managers'] as $name => $data) {
             $serviceIds[] = $serviceId = sprintf('neo4j.entity_manager.%s', $name);
@@ -170,20 +187,49 @@ 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'];
+        }
+
+        return 'http' == $config['schema'] ? HttpDriver::DEFAULT_HTTP_PORT : BoltDriver::DEFAULT_TCP_PORT;
     }
 
-    public function getAlias(): string
+    /**
+     * Make sure the EntityManager is installed if we have configured it.
+     *
+     * @param array &$config
+     *
+     * @return bool true if "graphaware/neo4j-php-ogm" is installed
+     *
+     * @thorws \LogicException if EntityManagers os not installed but they are configured.
+     */
+    private function validateEntityManagers(array &$config): bool
     {
-        return 'neo4j';
+        $dependenciesInstalled = class_exists(EntityManager::class);
+        $entityManagersConfigured = !empty($config['entity_managers']);
+
+        if ($dependenciesInstalled && !$entityManagersConfigured) {
+            // Add default entity manager if none set.
+            $config['entity_managers']['default'] = ['client' => 'default'];
+        } elseif (!$dependenciesInstalled && $entityManagersConfigured) {
+            throw new \LogicException(
+                'You need to install "graphaware/neo4j-php-ogm" to be able to use the EntityManager'
+            );
+        }
+
+        return $dependenciesInstalled;
     }
 }

README.md

@@ -15,7 +15,7 @@ Via Composer
 $ composer require neo4j/neo4j-bundle
 ```
 
-At the moment we have a hard dependency on GraphAware OGM. You need to install that as well
+If you want to use the an `EntityManager` you need to install a [GraphAware OGM](https://github.com/graphaware/neo4j-php-ogm)
 
 ```bash
 $ composer require graphaware/neo4j-php-ogm:@beta
@@ -43,7 +43,7 @@ The bundle is a convenient way of registering services. We register `Connections
 
  * neo4j.connection
  * neo4j.client
- * neo4j.entity_manager
+ * neo4j.entity_manager*
 
 
 ### Minimal configuration
@@ -57,7 +57,7 @@ neo4j:
 With the minimal configuration we have services named:
  * neo4j.connection.default
  * neo4j.client.default
- * neo4j.entity_manager.default
+ * neo4j.entity_manager.default*
 
 ### Full configuration
 
@@ -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
@@ -92,9 +92,11 @@ With the configuration above we would have services named:
  * neo4j.client.default
  * neo4j.client.other_client
  * neo4j.client.other_foobar
- * neo4j.entity_manager.default
+ * neo4j.entity_manager.default*
 
 
+\* Note: EntityManagers will only be available if `graphaware/neo4j-php-ogm` is installed. 
+
 ## Testing
 
 ``` bash

Resources/config/entity_manager.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="neo4j.entity_manager.abstract" class="GraphAware\Neo4j\OGM\EntityManager" abstract="true">
+        </service>
+    </services>
+</container>

Resources/config/services.xml

@@ -15,7 +15,5 @@
             <factory service="neo4j.factory.client" method="create" />
 
         </service>
-        <service id="neo4j.entity_manager.abstract" class="GraphAware\Neo4j\OGM\EntityManager" abstract="true">
-        </service>
     </services>
 </container>

composer.json

@@ -8,19 +8,27 @@
         {
             "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",
         "symfony/symfony": "^3.0",
+        "graphaware/neo4j-php-ogm": "^1.0",
         "matthiasnoback/symfony-dependency-injection-test": "^1.0"
     },
+    "suggest": {
+        "graphaware/neo4j-php-ogm": "To have EntityManager support"
+    },
     "autoload": {
         "psr-4": {
             "Neo4j\\Neo4jBundle\\": ""