fix issue #143

Author: ikwattro

src/Client.php

@@ -132,7 +132,10 @@ public function stack($tag = null, $connectionAlias = null)
      */
     public function runStack(StackInterface $stack)
     {
-        $pipeline = $this->pipeline(null, null, $stack->getTag(), $stack->getConnectionAlias());
+        $connectionAlias = $stack instanceof Stack && $stack->hasWrites()
+            ? $this->connectionManager->getMasterConnection()->getAlias()
+            : $stack->getConnectionAlias();
+        $pipeline = $this->pipeline(null, null, $stack->getTag(), $connectionAlias);
 
         foreach ($stack->statements() as $statement) {
             $pipeline->push($statement->text(), $statement->parameters(), $statement->getTag());
@@ -151,7 +154,7 @@ public function runStack(StackInterface $stack)
                 throw $e;
             }
 
-            return;
+            return null;
         }
 
         return $results;

src/Stack.php

@@ -35,6 +35,11 @@ class Stack implements StackInterface
      */
     protected $preflights = [];
 
+    /**
+     * @var bool
+     */
+    protected $hasWrites = false;
+
     /**
      * @param null        $tag
      * @param null|string $connectionAlias
@@ -67,6 +72,18 @@ public function push($query, $parameters = null, $tag = null)
         $this->statements[] = Statement::create($query, $params, $tag);
     }
 
+    /**
+     * @param string $query
+     * @param null|array $parameters
+     * @param null|array $tag
+     */
+    public function pushWrite($query, $parameters = null, $tag = null)
+    {
+        $params = null !== $parameters ? $parameters : [];
+        $this->statements[] = Statement::create($query, $params, $tag);
+        $this->hasWrites = true;
+    }
+
     /**
      * @param $query
      * @param array|null $parameters
@@ -125,4 +142,12 @@ public function getConnectionAlias()
     {
         return $this->connectionAlias;
     }
+
+    /**
+     * @return bool
+     */
+    public function hasWrites()
+    {
+        return $this->hasWrites;
+    }
 }

tests/Integration/IntegrationTestCase.php

@@ -21,6 +21,16 @@ class IntegrationTestCase extends \PHPUnit_Framework_TestCase
     protected $client;
 
     public function setUp()
+    {
+        $connections = array_merge($this->getConnections(), $this->getAdditionalConnections());
+
+        $this->client = ClientBuilder::create()
+            ->addConnection('http', $connections['http'])
+            ->addConnection('bolt', $connections['bolt'])
+            ->build();
+    }
+
+    protected function getConnections()
     {
         $httpUri = 'http://localhost:7474';
         if (isset($_ENV['NEO4J_USER'])) {
@@ -44,10 +54,15 @@ public function setUp()
             );
         }
 
-        $this->client = ClientBuilder::create()
-            ->addConnection('http', $httpUri)
-            ->addConnection('bolt', $boltUrl)
-            ->build();
+        return [
+            'http' => $httpUri,
+            'bolt' => $boltUrl
+        ];
+    }
+
+    protected function getAdditionalConnections()
+    {
+        return [];
     }
 
     /**

tests/Issues/Issue143Test.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace GraphAware\Neo4j\Client\Tests\Issues;
+
+use GraphAware\Neo4j\Client\ClientBuilder;
+use GraphAware\Neo4j\Client\Tests\Integration\IntegrationTestCase;
+
+class Issue143Test extends IntegrationTestCase
+{
+    public function setUp()
+    {
+        $connections = array_merge($this->getConnections(), $this->getAdditionalConnections());
+
+        $this->client = ClientBuilder::create()
+            ->addConnection('a', $connections['non-exist'])
+            ->addConnection('http', $connections['http'])
+            ->addConnection('bolt', $connections['bolt'])
+            ->setMaster('bolt')
+            ->build();
+    }
+
+    protected function getAdditionalConnections()
+    {
+        return ['non-exist', 'bolt://error:7687'];
+    }
+
+
+    public function testStackUsesMasterForWritesWhenOneisSet()
+    {
+        for ($x = 0; $x < 1000; $x++) {
+            $stack = $this->client->stack();
+            $stack->pushWrite('CREATE (n)');
+            $this->client->runStack($stack);
+        }
+    }
+}