:w Refactor ConvertManager, change constructor, replace array convert…

…ers into Collection converters

README.md

@@ -27,7 +27,7 @@ If you want to convert values not using Convert Manager you can do it directly b
 Unit Converter is really simple to use and easy to extend. In a bellow example I show how to use this tool. 
 
 ```php
-$convertManager = new ConvertManager([ new LengthConverter(), new WeightConverter() ]);
+$convertManager = new ConvertManager(new ArrayCollection([ new LengthConverter(), new WeightConverter() ]));
 $convertedValue = $convertManager->convert('10cm to ?in');
 ```
 

composer.json

@@ -17,7 +17,8 @@
   },
   "require": {
     "php": "~7.1",
-    "ext-bcmath": "*"
+    "ext-bcmath": "*",
+    "doctrine/collections": "^1.5"
   },
   "require-dev": {
     "phpunit/phpunit": "~7.4"

src/ConvertManager.php

@@ -2,6 +2,7 @@
 
 namespace UnitConverter;
 
+use Doctrine\Common\Collections\Collection;
 use UnitConverter\Converter\Converter;
 use UnitConverter\Exception\NotSupportedConversionException;
 use UnitConverter\Exception\NotSupportedUnitException;
@@ -22,10 +23,10 @@ class ConvertManager
     private $queryResolver;
 
     /**
-     * @param Converter[] $converters
+     * @param Converter[]|Collection $converters
      * @param QueryResolver $queryResolver
      */
-    public function __construct(array $converters, QueryResolver $queryResolver)
+    public function __construct(Collection $converters, QueryResolver $queryResolver)
     {
         $this->converters = $converters;
         $this->queryResolver = $queryResolver;
@@ -43,7 +44,6 @@ public function __construct(array $converters, QueryResolver $queryResolver)
     public function convert(string $rawQuery) : Value
     {
         $query = $this->queryResolver->resolve($rawQuery);
-
         $converter = $this->getSupportedConverter($query);
 
         return $converter->convertFromQuery($query);
@@ -58,15 +58,17 @@ public function convert(string $rawQuery) : Value
      */
     protected function getSupportedConverter(Query $query) : Converter
     {
-        $valueUnit = $query->getValue()->getUnit();
-        $targetUnit = $query->getTargetUnit();
+        $supportedConverters = $this->converters->filter(function (Converter $converter) use ($query) {
+            return true === $converter->isSupported($query->getValue()->getUnit(), $query->getTargetUnit());
+        });
 
-        foreach ($this->converters as $converter) {
-            if (true === $converter->isSupported($valueUnit, $targetUnit)) {
-                return $converter;
-            }
+        if (true === $supportedConverters->isEmpty()) {
+            throw new NotSupportedConversionException(
+                $query->getValue()->getUnit(),
+                $query->getTargetUnit()
+            );
         }
 
-        throw new NotSupportedConversionException($valueUnit, $targetUnit);
+        return $supportedConverters->first();
     }
 }

tests/ConvertManagerTest.php

@@ -2,6 +2,8 @@
 
 namespace UnitConverter;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use PHPUnit\Framework\TestCase;
 use UnitConverter\Converter\LengthConverter;
 use UnitConverter\Converter\WeightConverter;
@@ -20,10 +22,12 @@ class ConvertManagerTest extends TestCase
      */
     public function testConvertReturnConvertedValue(string $rawQuery)
     {
-        $convertManager = new ConvertManager([
+        $converters = new ArrayCollection([
             new LengthConverter(),
             new WeightConverter()
-        ], new QueryResolver());
+        ]);
+
+        $convertManager = new ConvertManager($converters, new QueryResolver());
 
         $convertedValue = $convertManager->convert($rawQuery);