add elastica exception

ruflin · Aug 7, 2014 · 93ef291 · 93ef291
1 parent ccdea91
commit 93ef291
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/lib/Elastica/Connection/ConnectionPool.php b/lib/Elastica/Connection/ConnectionPool.php
@@ -38,7 +38,7 @@ class ConnectionPool
     /**
      * @param array $connections
      * @param \Elastica\Connection\Strategy\StrategyInterface $strategy
-     * @param type $callback
+     * @param callback $callback
      */
     public function __construct(array $connections, StrategyInterface $strategy, $callback = null)
     {
@@ -89,6 +89,7 @@ public function getConnections()
 
     /**
      * @return \Elastica\Connection
+     * @throws \Elastica\Exception\ClientException
      */
     public function getConnection()
     {
@@ -97,7 +98,7 @@ public function getConnection()
 
     /**
      * @param \Elastica\Connection $connection
-     * @param Exception $e
+     * @param \Exception $e
      * @param Client $client
      */
     public function onFail(Connection $connection, Exception $e, Client $client)

diff --git a/lib/Elastica/Connection/Strategy/CallbackStrategy.php b/lib/Elastica/Connection/Strategy/CallbackStrategy.php
@@ -2,6 +2,8 @@
 
 namespace Elastica\Connection\Strategy;
 
+use Elastica\Exception\InvalidException;
+
 /**
  * Description of CallbackStrategy
  *
@@ -17,12 +19,12 @@ class CallbackStrategy implements StrategyInterface
 
     /**
      * @param Closure $callback
-     * @throws \InvalidArgumentException
+     * @throws \Elastica\Exception\InvalidException
      */
     public function __construct($callback)
     {
         if (!self::isValid($callback)) {
-            throw new \InvalidArgumentException(sprintf('Callback should be a Closure, %s given!', gettype($callback)));
+            throw new InvalidException(sprintf('Callback should be a Closure, %s given!', gettype($callback)));
         }
 
         $this->_callback = $callback;

diff --git a/lib/Elastica/Connection/Strategy/RoundRobin.php b/lib/Elastica/Connection/Strategy/RoundRobin.php
@@ -13,6 +13,7 @@ class RoundRobin extends Simple
     /**
      * @param array|\Elastica\Connection[] $connections
      * @return \Elastica\Connection
+     * @throws \Elastica\Exception\ClientException
      */
     public function getConnection($connections)
     {

diff --git a/lib/Elastica/Connection/Strategy/Simple.php b/lib/Elastica/Connection/Strategy/Simple.php
@@ -3,6 +3,7 @@
 namespace Elastica\Connection\Strategy;
 
 use Elastica\Connection\Strategy\StrategyInterface;
+use Elastica\Exception\ClientException;
 
 /**
  * Description of SimpleStrategy
@@ -15,6 +16,7 @@ class Simple implements StrategyInterface
     /**
      * @param array|\Elastica\Connection[] $connections
      * @return \Elastica\Connection
+     * @throws \Elastica\Exception\ClientException
      */
     public function getConnection($connections)
     {

diff --git a/lib/Elastica/Connection/Strategy/StrategyFactory.php b/lib/Elastica/Connection/Strategy/StrategyFactory.php
@@ -2,6 +2,8 @@
 
 namespace Elastica\Connection\Strategy;
 
+use Elastica\Exception\InvalidException;
+
 /**
  * Description of StrategyFactory
  *
@@ -12,7 +14,7 @@ class StrategyFactory
     /**
      * @param mixed|Closure|String|StrategyInterface $strategyName
      * @return \Elastica\Connection\Strategy\StrategyInterface
-     * @throws \InvalidArgumentException
+     * @throws \Elastica\Exception\InvalidException
      */
     public static function create($strategyName)
     {
@@ -31,7 +33,7 @@ public static function create($strategyName)
         }
 
         if (!$strategy instanceof StrategyInterface) {
-            throw new \InvalidArgumentException('Can\'t load strategy class');
+            throw new InvalidException('Can\'t load strategy class');
         }
 
         return $strategy;