#68: Drop ext driver

marlongehringer · Mar 26, 2018 · 463d006 · 463d006
1 parent 25940b9
commit 463d006
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 810 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "require": {
         "php": "~7.0.0",
         "php-amqplib/php-amqplib": "~2.6.3",
-        "lizards-and-pumpkins/catalog": "~3.1.0"
+        "lizards-and-pumpkins/catalog": "^3.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",

diff --git a/src/AmqpFactory.php b/src/AmqpFactory.php
@@ -6,7 +6,7 @@
 
 use LizardsAndPumpkins\Messaging\MessageQueueFactory;
 use LizardsAndPumpkins\Messaging\Queue;
-use LizardsAndPumpkins\Messaging\Queue\Amqp\Driver\DriverFactoryLocator;
+use LizardsAndPumpkins\Messaging\Queue\Amqp\Driver\AmqpLib\AmqpLibFactory;
 use LizardsAndPumpkins\Util\Factory\FactoryWithCallback;
 use LizardsAndPumpkins\Util\Factory\FactoryWithCallbackTrait;
 use LizardsAndPumpkins\Util\Factory\MasterFactory;
@@ -17,12 +17,7 @@ class AmqpFactory implements MessageQueueFactory, FactoryWithCallback
 
     public function factoryRegistrationCallback(MasterFactory $masterFactory)
     {
-        $masterFactory->register($this->createDriverFactoryLocator()->getDriverFactory());
-    }
-
-    public function createDriverFactoryLocator() : DriverFactoryLocator
-    {
-        return new DriverFactoryLocator();
+        $masterFactory->register(new AmqpLibFactory());
     }
 
     public function createAmqpQueue(string $name) : AmqpQueue

diff --git a/src/Driver/AmqpExt/AmpqExtQueueFactory.php b/src/Driver/AmqpExt/AmpqExtQueueFactory.php
diff --git a/src/Driver/AmqpExt/AmqpExtFactory.php b/src/Driver/AmqpExt/AmqpExtFactory.php
diff --git a/src/Driver/AmqpExt/AmqpExtReader.php b/src/Driver/AmqpExt/AmqpExtReader.php
diff --git a/src/Driver/AmqpExt/AmqpExtWriter.php b/src/Driver/AmqpExt/AmqpExtWriter.php
diff --git a/src/Driver/DriverFactoryLocator.php b/src/Driver/DriverFactoryLocator.php
diff --git a/tests/Integration/Suite/Driver/AmqpDriverTestIntegration.php b/tests/Integration/Suite/Driver/AmqpDriverTestIntegration.php
@@ -80,7 +80,9 @@ protected function tearDown()
     public static function tearDownAfterClass()
     {
         if (! self::$skipTearDownAfterClass) {
-            $reader = static::createMasterFactoryWithAmqpDriver()->createAmqpReader(static::getQueueName());
+            /** @var MasterFactory|AmqpDriverFactory $masterFactoryWithAmqpDriver */
+            $masterFactoryWithAmqpDriver = static::createMasterFactoryWithAmqpDriver();
+            $reader = $masterFactoryWithAmqpDriver->createAmqpReader(static::getQueueName());
             $reader->deleteQueue();
         }
     }
@@ -183,11 +185,13 @@ public function testConsumesMessagesWithMultipleReaders()
 
     public function testCanReadMessagesWrittenViaAnotherConnection()
     {
+        /** @var MasterFactory|AmqpDriverFactory $masterFactoryWriteConnection */
         $masterFactoryWriteConnection = static::createMasterFactoryWithAmqpDriver();
         $writer = $masterFactoryWriteConnection->createAmqpWriter(static::getQueueName());
         $writer->addMessage('foo');
         $this->closeConnection($masterFactoryWriteConnection);
 
+        /** @var MasterFactory|AmqpDriverFactory $masterFactoryReadConnection */
         $masterFactoryReadConnection = static::createMasterFactoryWithAmqpDriver();
         $reader = $masterFactoryReadConnection->createAmqpReader(static::getQueueName());
         $this->assertNextConsumedMessageSame('foo', $reader);

diff --git a/tests/Integration/Suite/Driver/AmqpExtTest.php b/tests/Integration/Suite/Driver/AmqpExtTest.php