chore: improved plugin priority handling

Author: andrepimpao

src/Api.php

@@ -17,8 +17,6 @@
 use ProgrammatorDev\Api\Event\ResponseContentsEvent;
 use ProgrammatorDev\Api\Exception\ConfigException;
 use ProgrammatorDev\Api\Helper\StringHelperTrait;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;

src/Builder/ClientBuilder.php

@@ -30,9 +30,6 @@ public function __construct(
 
     public function getClient(): HttpMethodsClient
     {
-        // sort plugins by priority (key) in descending order
-        \krsort($this->plugins);
-
         $pluginClientFactory = new PluginClientFactory();
         $client = $pluginClientFactory->createClient($this->client, $this->plugins);
 
@@ -84,6 +81,9 @@ public function addPlugin(Plugin $plugin, int $priority): self
 
         $this->plugins[$priority] = $plugin;
 
+        // sort plugins by priority (key) in descending order
+        \krsort($this->plugins);
+
         return $this;
     }
 

tests/Integration/ApiTest.php

@@ -9,12 +9,10 @@
 use ProgrammatorDev\Api\Builder\CacheBuilder;
 use ProgrammatorDev\Api\Builder\ClientBuilder;
 use ProgrammatorDev\Api\Builder\LoggerBuilder;
-use ProgrammatorDev\Api\Event\PostRequestEvent;
 use ProgrammatorDev\Api\Event\ResponseContentsEvent;
 use ProgrammatorDev\Api\Exception\ConfigException;
 use ProgrammatorDev\Api\Test\AbstractTestCase;
 use ProgrammatorDev\Api\Test\MockResponse;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;

tests/Unit/Builder/ClientBuilderTest.php

@@ -56,9 +56,20 @@ public function testAddPlugin()
         $clientBuilder = new ClientBuilder();
 
         $clientBuilder->addPlugin($plugin, 1);
+        $clientBuilder->addPlugin($plugin, 3);
         $clientBuilder->addPlugin($plugin, 2);
 
-        $this->assertCount(2, $clientBuilder->getPlugins());
+        $this->assertCount(3, $clientBuilder->getPlugins());
+        // plugins array keys are used as priority [priority => plugin]
+        // so check if order of keys (priority) is sorted
+        $this->assertSame(
+            [
+                0 => 3,
+                1 => 2,
+                2 => 1
+            ],
+            array_keys($clientBuilder->getPlugins())
+        );
     }
 
     public function testAddPluginWithSamePriority()
@@ -72,28 +83,4 @@ public function testAddPluginWithSamePriority()
         $clientBuilder->addPlugin($plugin, 1);
         $clientBuilder->addPlugin($plugin, 1);
     }
-
-    public function testPluginPriorityOrder()
-    {
-        $plugin = $this->createMock(Plugin::class);
-        $clientBuilder = new ClientBuilder();
-
-        $clientBuilder->addPlugin($plugin, 1);
-        $clientBuilder->addPlugin($plugin, 3);
-        $clientBuilder->addPlugin($plugin, 2);
-
-        // calling this method triggers plugin sorting
-        $clientBuilder->getClient();
-
-        // plugins array keys are used as priority [priority => plugin]
-        // so check if order of keys (priority) is sorted
-        $this->assertSame(
-            [
-                0 => 3,
-                1 => 2,
-                2 => 1
-            ],
-            array_keys($clientBuilder->getPlugins())
-        );
-    }
 }