From fb3a0df0ddaf7bf65a041c07dd33979196994d51 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 26 Aug 2011 00:31:18 -0500
Subject: [PATCH] change is_callable checks to instanceof Closure.

---
 laravel/arr.php             | 2 +-
 laravel/cache/driver.php    | 4 ++--
 laravel/config.php          | 2 +-
 laravel/lang.php            | 2 +-
 laravel/routing/handler.php | 2 +-
 laravel/session/driver.php  | 2 +-
 laravel/view.php            | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/laravel/arr.php b/laravel/arr.php
index 63fd99b7..1bd9030e 100644
--- a/laravel/arr.php
+++ b/laravel/arr.php
@@ -27,7 +27,7 @@ class Arr {
 		{
 			if ( ! is_array($array) or ! array_key_exists($segment, $array))
 			{
-				return is_callable($default) ? call_user_func($default) : $default;
+				return ($default instanceof \Closure) ? call_user_func($default) : $default;
 			}
 
 			$array = $array[$segment];
diff --git a/laravel/cache/driver.php b/laravel/cache/driver.php
index 67a1dcb4..267a2eda 100644
--- a/laravel/cache/driver.php
+++ b/laravel/cache/driver.php
@@ -38,7 +38,7 @@ abstract class Driver {
 	{
 		if ( ! is_null($item = $this->retrieve($key))) return $item;
 
-		return (is_callable($default)) ? call_user_func($default) : $default;
+		return ($default instanceof \Closure) ? call_user_func($default) : $default;
 	}
 
 	/**
@@ -82,7 +82,7 @@ abstract class Driver {
 	{
 		if ( ! is_null($item = $this->get($key, null))) return $item;
 
-		$default = is_callable($default) ? call_user_func($default) : $default;
+		$default = ($default instanceof \Closure) ? call_user_func($default) : $default;
 
 		$this->put($key, $default, $minutes);
 
diff --git a/laravel/config.php b/laravel/config.php
index 35a8deef..fa3d992a 100644
--- a/laravel/config.php
+++ b/laravel/config.php
@@ -58,7 +58,7 @@ class Config {
 
 		if ( ! static::load($file))
 		{
-			return is_callable($default) ? call_user_func($default) : $default;
+			return ($default instanceof \Closure) ? call_user_func($default) : $default;
 		}
 
 		if (is_null($key)) return static::$items[$file];
diff --git a/laravel/lang.php b/laravel/lang.php
index ceeb2fa4..305bbfd7 100644
--- a/laravel/lang.php
+++ b/laravel/lang.php
@@ -88,7 +88,7 @@ class Lang {
 
 		if ( ! $this->load($file))
 		{
-			return is_callable($default) ? call_user_func($default) : $default;
+			return ($default instanceof \Closure) ? call_user_func($default) : $default;
 		}
 
 		$line = Arr::get(static::$lines[$this->language.$file], $line, $default);
diff --git a/laravel/routing/handler.php b/laravel/routing/handler.php
index ef7a232e..677b7a66 100644
--- a/laravel/routing/handler.php
+++ b/laravel/routing/handler.php
@@ -83,7 +83,7 @@ class Handler {
 	{
 		if (isset($route->callback['do'])) return $route->callback['do'];
 
-		foreach ($route->callback as $value) { if (is_callable($value)) return $value; }
+		foreach ($route->callback as $value) { if ($value instanceof Closure) return $value; }
 	}
 
 	/**
diff --git a/laravel/session/driver.php b/laravel/session/driver.php
index 857402d1..82db3426 100644
--- a/laravel/session/driver.php
+++ b/laravel/session/driver.php
@@ -104,7 +104,7 @@ abstract class Driver {
 			if (array_key_exists($possibility, $this->session['data'])) return $this->session['data'][$possibility];
 		}
 
-		return is_callable($default) ? call_user_func($default) : $default;
+		return ($default instanceof \Closure) ? call_user_func($default) : $default;
 	}
 
 	/**
diff --git a/laravel/view.php b/laravel/view.php
index d48c0e4c..a2190a8e 100644
--- a/laravel/view.php
+++ b/laravel/view.php
@@ -91,7 +91,7 @@ class View implements Renderable {
 		{
 			foreach ((array) $composers[$this->view] as $key => $value)
 			{
-				if (is_callable($value)) return call_user_func($value, $this);
+				if ($value instanceof \Closure) return call_user_func($value, $this);
 			}
 		}
 	}