Enhance supported driver check for pdo queues

rybakit · Sep 8, 2014 · b73aa0f · b73aa0f
1 parent 7b7059e
commit b73aa0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/Pdo/GenericPdoQueue.php b/src/Pdo/GenericPdoQueue.php
@@ -48,9 +48,9 @@ public function pop()
         return $result;
     }
 
-    public function getSupportedDrivers()
+    protected function supportsDriver($driverName)
     {
-        return array_keys(static::$popSqls);
+        return isset(static::$popSqls[$driverName]);
     }
 
     protected function getPopSql()

diff --git a/src/Pdo/PdoQueue.php b/src/Pdo/PdoQueue.php
@@ -19,11 +19,10 @@ abstract class PdoQueue implements Queue
 
     public function __construct(\PDO $pdo, $tableName)
     {
-        $supportedDrivers = (array) $this->getSupportedDrivers();
-        $driver = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+        $driverName = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 
-        if (!in_array($driver, $supportedDrivers, true)) {
-            throw new \InvalidArgumentException(sprintf('PDO driver "%s" is unsupported by "%s".', $driver, get_class($this)));
+        if (!$this->supportsDriver($driverName)) {
+            throw new \InvalidArgumentException(sprintf('PDO driver "%s" is unsupported by "%s".', $driverName, get_class($this)));
         }
 
         $this->pdo = $pdo;
@@ -65,7 +64,9 @@ public function clear()
     }
 
     /**
-     * @return array
+     * @param string $driverName
+     *
+     * @return bool
      */
-    abstract public function getSupportedDrivers();
+    abstract protected function supportsDriver($driverName);
 }
diff --git a/src/Pdo/SqlitePdoQueue.php b/src/Pdo/SqlitePdoQueue.php
@@ -42,8 +42,8 @@ public function pop()
         throw new NoItemAvailableException($this);
     }
 
-    public function getSupportedDrivers()
+    protected function supportsDriver($driverName)
     {
-        return ['sqlite'];
+        return 'sqlite' === $driverName;
     }
 }