Merge branch 'master' of github.com:fliglio/borg into 2.3.x

src/main/Fliglio/Borg/Amqp/AmqpCollectiveDriver.php

@@ -2,13 +2,10 @@
 
 namespace Fliglio\Borg\Amqp;
 
-use PhpAmqpLib\Connection\AMQPStreamConnection;
-use PhpAmqpLib\Message\AMQPMessage;
-
 use Fliglio\Borg\Driver\CollectiveDriver;
-use Fliglio\Borg\Chan;
-
 use Fliglio\Http\RequestReader;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Message\AMQPMessage;
 
 class AmqpCollectiveDriver implements CollectiveDriver {
 

src/main/Fliglio/Borg/AmqpCollectiveFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+
+namespace Fliglio\Borg;
+
+
+use Fliglio\Borg\Amqp\AmqpCollectiveDriver;
+use Fliglio\Borg\Mapper\DefaultMapper;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+class AmqpCollectiveFactory {
+
+	private $rabbitConnection;
+	private $routingNamespace;
+
+	public function __construct(AMQPStreamConnection $rabbitConnection, $routingNamespace) {
+		$this->rabbitConnection = $rabbitConnection;
+		$this->routingNamespace = $routingNamespace;
+	}
+
+	public function create() {
+		$driver  = new AmqpCollectiveDriver($this->rabbitConnection);
+		$mapper  = new DefaultMapper($driver);
+		$routing = new RoutingConfiguration($this->routingNamespace);
+
+		return new Collective($driver, $mapper, $routing);
+	}
+}
+

src/main/Fliglio/Borg/Collective.php

@@ -42,6 +42,7 @@ public function getMasterRoutingKey() {
 	public function assimilate($i) {
 		$i->setCollective($this);
 		$this->drones[get_class($i)] = $i;
+		return $this;
 	}
 
 	public function mkchan($type = null) {

src/test/Fliglio/Borg/TestConfiguration.php

@@ -18,18 +18,16 @@ class TestConfiguration extends DefaultConfiguration {
 
 	public function getRoutes() {
 		$rConn = new AMQPStreamConnection('localhost', 5672, "guest", "guest", "/");
-		$driver = new AmqpCollectiveDriver($rConn);
-
+
 		$resource = new TestResource();
 		$fun = new FunResource;
 		$shake = new ShakespeareResource;
-
-		$mapper = new DefaultMapper($driver);
-		$routing = new RoutingConfiguration("borg-demo");
-		$coll = new Collective($driver, $mapper, $routing);
-		$coll->assimilate($resource);
-		$coll->assimilate($fun);
-		$coll->assimilate($shake);
+
+		$coll = (new AmqpCollectiveFactory($rConn, "borg-demo"))
+			->create()
+			->assimilate($resource)
+			->assimilate($fun)
+			->assimilate($shake);
 
 
 

src/test/component/ComponentTest.php

@@ -12,6 +12,7 @@ public function setup() {
 		$this->add = sprintf("http://%s:%s", getenv('LOCALDEV_PORT_80_TCP_ADDR'), 80);
 	}
 
+
 	public function testRoundTrip() {
 		// given
 		$expected = 'hello world';