Merge pull request #5 from cdn77/drop-consistence

Drop consistence
cdn77 · Aug 19, 2020 · e4777f4 · e4777f4
2 parents 5348302 + 1a3302f
commit e4777f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "require": {
         "php": "^7.2",
         "bunny/bunny": "^0.4.1",
-        "consistence/consistence": "^2.0",
+        "myclabs/php-enum": "^1.7",
         "react/promise": "^2.0",
         "symfony/config": "^4.3|^5.0",
         "symfony/console": "^4.3|^5.0",

diff --git a/src/RabbitMQ/DeliveryMode.php b/src/RabbitMQ/DeliveryMode.php
@@ -4,8 +4,9 @@
 
 namespace Cdn77\RabbitMQBundle\RabbitMQ;
 
-use Consistence\Enum\Enum;
+use MyCLabs\Enum\Enum;
 
+/** @extends Enum<int> */
 final class DeliveryMode extends Enum
 {
     public const TRANSIENT = 1;

diff --git a/src/RabbitMQ/Exchange.php b/src/RabbitMQ/Exchange.php
@@ -55,7 +55,7 @@ public static function fromConfiguration(string $name, array $configuration) : s
     {
         return new self(
             $name,
-            ExchangeType::get($configuration[Configuration::KEY_EXCHANGE_TYPE] ?? ExchangeType::DIRECT),
+            new ExchangeType($configuration[Configuration::KEY_EXCHANGE_TYPE] ?? ExchangeType::DIRECT),
             $configuration[Configuration::KEY_EXCHANGE_DURABLE] ?? false,
             $configuration[Configuration::KEY_EXCHANGE_AUTO_DELETE] ?? false,
             $configuration[Configuration::KEY_EXCHANGE_INTERNAL] ?? false,

diff --git a/src/RabbitMQ/ExchangeType.php b/src/RabbitMQ/ExchangeType.php
@@ -4,8 +4,9 @@
 
 namespace Cdn77\RabbitMQBundle\RabbitMQ;
 
-use Consistence\Enum\Enum;
+use MyCLabs\Enum\Enum;
 
+/** @extends Enum<string> */
 final class ExchangeType extends Enum
 {
     public const DIRECT = 'direct';

diff --git a/tests/ConsumerRunnerTest.php b/tests/ConsumerRunnerTest.php
@@ -43,7 +43,7 @@ public function tearDown() : void
      */
     public function testMaxMessagesLimit(int $maxMessages) : void
     {
-        $exchange = new Exchange('test', ExchangeType::get(ExchangeType::DIRECT));
+        $exchange = new Exchange('test', new ExchangeType(ExchangeType::DIRECT));
         $queue = new Queue('testQueue');
         $routingKey = 'a_routing_key';
         $topology = new Topology(