merged skunkworks into develop.

This commit is contained in:
Taylor Otwell
2012-01-16 13:59:24 -06:00
parent 610d8827c4
commit b5442c67fc
117 changed files with 7268 additions and 3999 deletions

View File

@@ -65,7 +65,7 @@ class Redis {
{
if (is_null($config = Config::get("database.redis.{$name}")))
{
throw new \DomainException("Redis database [$name] is not defined.");
throw new \Exception("Redis database [$name] is not defined.");
}
static::$databases[$name] = new static($config['host'], $config['port']);
@@ -98,7 +98,7 @@ class Redis {
switch (substr($response, 0, 1))
{
case '-':
throw new \RuntimeException('Redis error: '.substr(trim($response), 4));
throw new \Exception('Redis error: '.substr(trim($response), 4));
case '+':
case ':':
@@ -111,7 +111,7 @@ class Redis {
return $this->multibulk($response);
default:
throw new \UnexpectedValueException("Unknown Redis response: ".substr($response, 0, 1));
throw new \Exception("Unknown Redis response: ".substr($response, 0, 1));
}
}
@@ -128,7 +128,7 @@ class Redis {
if ($this->connection === false)
{
throw new \RuntimeException("Error making Redis connection: {$error} - {$message}");
throw new \Exception("Error making Redis connection: {$error} - {$message}");
}
return $this->connection;