Removal of useless try / catch

Author: tersmitten

Model/Datasource/RedisSource.php

@@ -141,23 +141,18 @@ public function connect() {
  * @return bool True if connecting to the DataSource succeeds, else false
  */
 	protected function _connect() {
-		// TODO: Remove useless try / catch?
-		try {
-			if ($this->config['unix_socket']) {
-				return $this->_connection->connect($this->config['unix_socket']);
-			} elseif (!$this->config['persistent']) {
-				return $this->_connection->connect(
-					$this->config['host'], $this->config['port'], $this->config['timeout']
-				);
-			} else {
-				$persistentId = crc32(serialize($this->config));
-
-				return $this->_connection->pconnect(
-					$this->config['host'], $this->config['port'], $this->config['timeout'], $persistentId
-				);
-			}
-		} catch (RedisException $e) {
-			return false;
+		if ($this->config['unix_socket']) {
+			return $this->_connection->connect($this->config['unix_socket']);
+		} elseif (!$this->config['persistent']) {
+			return $this->_connection->connect(
+				$this->config['host'], $this->config['port'], $this->config['timeout']
+			);
+		} else {
+			$persistentId = crc32(serialize($this->config));
+
+			return $this->_connection->pconnect(
+				$this->config['host'], $this->config['port'], $this->config['timeout'], $persistentId
+			);
 		}
 	}
 

Test/Case/Model/Datasource/RedisSourceTest.php

@@ -152,32 +152,6 @@ public function testIsConnected() {
 		$this->assertFalse($result);
 	}
 
-/**
- * testConnectException method
- *
- * @return void
- */
-	public function testConnectException() {
-		// Get mock, without the constructor being called
-		$Source = $this->getMockBuilder('TestRedisSource')->disableOriginalConstructor()->getMock();
-
-		$unixSocket = '/foo/bar';
-
-		$Source->config = array('unix_socket' => $unixSocket);
-		$Source->_connection = $this->getMock('Redis', array('connect'));
-
-		// Set expectations for connect calls
-		$Source->_connection->expects($this->once())->method('connect')
-			->with($this->equalTo($unixSocket))->will($this->throwException(new RedisException));
-
-		// Now call _connect
-		$reflectedClass = new ReflectionClass('TestRedisSource');
-		$connect = $reflectedClass->getMethod('_connect');
-		$result = $connect->invoke($Source);
-
-		$this->assertFalse($result);
-	}
-
 /**
  * testConnectUnixSocket method
  *