Moved the event to it's own package plus we have our own options now

Author: WyriHaximus

composer.json

@@ -11,6 +11,7 @@
   ],
   "require": {
     "php": "^7.0",
+    "api-clients/events": "dev-master",
     "api-clients/hydrator": "dev-master",
     "api-clients/test-utilities": "dev-master",
     "api-clients/transport": "dev-master",

composer.lock

@@ -2,12 +2,11 @@
 
 namespace ApiClients\Foundation;
 
+use ApiClients\Foundation\Events\CommandLocatorEvent;
 use ApiClients\Foundation\Hydrator\Factory as HydratorFactory;
 use ApiClients\Foundation\Hydrator\Hydrator;
-use ApiClients\Foundation\Hydrator\Options as HydratorOptions;
 use ApiClients\Foundation\Transport\Client as TransportClient;
 use ApiClients\Foundation\Transport\Factory as TransportFactory;
-use ApiClients\Foundation\Transport\Options as TransportOptions;
 use Interop\Container\ContainerInterface;
 use League\Container\Container;
 use League\Container\ReflectionContainer;
@@ -83,21 +82,19 @@ private static function createTransport(
         LoopInterface $loop = null,
         array $options = []
     ): TransportClient {
-        $transport = TransportFactory::create($loop, $options);
-        $container->share(LoopInterface::class, $transport->getLoop());
-        return $transport;
+        return TransportFactory::create($container, $loop, $options);
     }
 
     private static function createHydrator(ContainerInterface $container, array $options = [])
     {
-        if (isset($options[TransportOptions::HYDRATOR]) && $options[TransportOptions::HYDRATOR] instanceof Hydrator) {
-            return $options[TransportOptions::HYDRATOR];
+        if (isset($options[Options::HYDRATOR]) && $options[Options::HYDRATOR] instanceof Hydrator) {
+            return $options[Options::HYDRATOR];
         }
 
-        if (!isset($options[TransportOptions::HYDRATOR_OPTIONS])) {
+        if (!isset($options[Options::HYDRATOR_OPTIONS])) {
             throw new \Exception('Missing Hydrator options');
         }
 
-        return HydratorFactory::create($options[TransportOptions::HYDRATOR_OPTIONS]);
+        return HydratorFactory::create($options[Options::HYDRATOR_OPTIONS]);
     }
 }

src/CommandLocatorEvent.php

@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Foundation;
+
+class Options
+{
+    const HYDRATOR          = 'hydrator';
+    const HYDRATOR_OPTIONS  = 'hydrator_options';
+    const TRANSPORT         = 'transport';
+    const TRANSPORT_OPTIONS = 'transport_options';
+}

src/Factory.php

@@ -3,13 +3,12 @@
 namespace ApiClients\Tests\Foundation;
 
 use ApiClients\Foundation\Client;
-use ApiClients\Foundation\CommandLocatorEvent;
+use ApiClients\Foundation\Events\CommandLocatorEvent;
 use ApiClients\Foundation\Factory;
-use ApiClients\Foundation\Transport\Options;
+use ApiClients\Foundation\Options;
 use ApiClients\Tools\TestUtilities\TestCase;
 use League\Container\Container;
 use League\Event\CallbackListener;
-use League\Event\Emitter;
 use League\Event\EmitterInterface;
 use League\Tactician\Exception\MissingHandlerException;
 use React\EventLoop\LoopInterface;
@@ -37,7 +36,7 @@ public function testCreate()
             CommandLocatorEvent::NAME,
             CallbackListener::fromCallable(
                 function (CommandLocatorEvent $event) use (&$called) {
-                    //$this->assertSame([], $event->getMap());
+                    $this->assertSame([], $event->getMap());
                     $called = true;
                 }
             )