Merge pull request #11 from Spomky-Labs/develop

Compression Method Name updated
Spomky-Labs · Jan 30, 2015 · 55f5c17 · 55f5c17
2 parents 10b26cf + fb6b837
commit 55f5c17
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Compression/CompressionManager.php b/lib/Compression/CompressionManager.php
@@ -21,21 +21,17 @@ class CompressionManager implements CompressionManagerInterface
      */
     public function addCompressionAlgorithm(CompressionInterface $compression_algorithm)
     {
-        $this->compression_algorithms[] = $compression_algorithm;
+        $this->compression_algorithms[$compression_algorithm->getMethodName()] = $compression_algorithm;
 
         return $this;
     }
 
     /**
      * @param  string $name
-     * @return mixed
+     * @return CompressionInterface|null
      */
     public function getCompressionAlgorithm($name)
     {
-        foreach ($this->compression_algorithms as $algorithm) {
-            if ($algorithm->isMethodSupported($name)) {
-                return $algorithm;
-            }
-        }
+        return array_key_exists($name, $this->compression_algorithms)?$this->compression_algorithms[$name]:null;
     }
 }
diff --git a/lib/Compression/Deflate.php b/lib/Compression/Deflate.php
@@ -36,12 +36,11 @@ public function getCompressionLevel()
     }
 
     /**
-     * @param  string $method
-     * @return bool
+     * @return string
      */
-    public function isMethodSupported($method)
+    public function getMethodName()
     {
-        return 'DEF' === $method;
+        return 'DEF';
     }
 
     /**

diff --git a/lib/Compression/GZip.php b/lib/Compression/GZip.php
@@ -36,12 +36,11 @@ public function getCompressionLevel()
     }
 
     /**
-     * @param  string $method
-     * @return bool
+     * @return string
      */
-    public function isMethodSupported($method)
+    public function getMethodName()
     {
-        return 'GZ' === $method;
+        return 'GZ';
     }
 
     /**

diff --git a/lib/Compression/ZLib.php b/lib/Compression/ZLib.php
@@ -36,12 +36,11 @@ public function getCompressionLevel()
     }
 
     /**
-     * @param  string $method
-     * @return bool
+     * @return string
      */
-    public function isMethodSupported($method)
+    public function getMethodName()
     {
-        return 'ZLIB' === $method;
+        return 'ZLIB';
     }
 
     /**