Support for DSN select database and take care of errors while connecting (#43)

* Support for DSN select database and take care of errors while connecting.

This commit is related to php-cache/issues#62

* Applied fixes from StyleCI (#44)

Author: Nyholm

Changelog.md

@@ -4,6 +4,14 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+### Added
+
+* `ConnectException` that is thrown when you fail to connect to Redis
+
+### Fixed
+
+* If a DSN is provided to redis we make sure to select a database for you. 
+
 ## 0.3.4
 
 No changelog before this version

src/Exception/ConfigurationException.php

@@ -12,6 +12,8 @@
 namespace Cache\AdapterBundle\Exception;
 
 /**
+ * An exception thrown when you have invalid configuration.
+ *
  * @author Tobias Nyholm <[email protected]>
  */
 class ConfigurationException extends \Exception

src/Exception/ConnectException.php

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of php-cache organization.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>, Tobias Nyholm <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Cache\AdapterBundle\Exception;
+
+/**
+ * If you can connect to the cache storage you will get this exception thrown at you.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+class ConnectException extends \RuntimeException
+{
+}

src/Factory/RedisFactory.php

@@ -12,6 +12,7 @@
 namespace Cache\AdapterBundle\Factory;
 
 use Cache\Adapter\Redis\RedisCachePool;
+use Cache\AdapterBundle\Exception\ConnectException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -33,13 +34,25 @@ public function getAdapter(array $config)
 
         $dsn = $this->getDsn();
         if (empty($dsn)) {
-            $client->connect($config['host'], $config['port']);
+            if (false === $client->connect($config['host'], $config['port'])) {
+                throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $config['host'], $config['port']));
+            }
         } else {
             if (!empty($dsn->getPassword())) {
-                $client->auth($dsn->getPassword());
+                if (false === $client->auth($dsn->getPassword())) {
+                    throw new ConnectException('Could not connect authenticate connection to Redis database.');
+                }
+            }
+
+            if (false === $client->connect($dsn->getFirstHost(), $dsn->getFirstPort())) {
+                throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $dsn->getFirstHost(), $dsn->getFirstPort()));
             }
 
-            $client->connect($dsn->getFirstHost(), $dsn->getFirstPort());
+            if ($dsn->getDatabase() !== null) {
+                if (false === $client->select($dsn->getDatabase())) {
+                    throw new ConnectException(sprintf('Could not select Redis database with index "%s".', $dsn->getDatabase()));
+                }
+            }
         }
 
         return new RedisCachePool($client);