Bind closures when using macros to allow access to $this and static.

src/Illuminate/Support/Traits/MacroableTrait.php

@@ -1,5 +1,6 @@
 <?php namespace Illuminate\Support\Traits;
 
+use Closure;
 use BadMethodCallException;
 
 trait MacroableTrait {
@@ -47,7 +48,14 @@ public static function __callStatic($method, $parameters)
 	{
 		if (static::hasMacro($method))
 		{
-			return call_user_func_array(static::$macros[$method], $parameters);
+			if (static::$macros[$method] instanceof Closure)
+			{
+				return call_user_func_array(Closure::bind(static::$macros[$method], null, get_called_class()), $parameters);
+			}
+			else
+			{
+				return call_user_func_array(static::$macros[$method], $parameters);
+			}
 		}
 
 		throw new BadMethodCallException("Method {$method} does not exist.");
@@ -64,7 +72,19 @@ public static function __callStatic($method, $parameters)
 	 */
 	public function __call($method, $parameters)
 	{
-		return static::__callStatic($method, $parameters);
+		if (static::hasMacro($method))
+		{
+			if (static::$macros[$method] instanceof Closure)
+			{
+				return call_user_func_array(static::$macros[$method]->bindTo($this, get_class($this)), $parameters);
+			}
+			else
+			{
+				return call_user_func_array(static::$macros[$method], $parameters);
+			}
+		}
+
+		throw new BadMethodCallException("Method {$method} does not exist.");
 	}
 
 }

tests/Support/SupportMacroTraitTest.php

@@ -13,7 +13,6 @@ public function setUp()
 	private function createObjectForTrait()
 	{
 		$traitName = 'Illuminate\Support\Traits\MacroableTrait';
-
 		return $this->getObjectForTrait($traitName);
 	}
 
@@ -33,4 +32,27 @@ public function testRegisterMacroAndCallWithoutStatic()
 		$this->assertEquals('Taylor', $macroTrait->{__CLASS__}());
 	}
 
+
+	public function testWhenCallingMacroClosureIsBoundToObject()
+	{
+		TestMacroTrait::macro('tryInstance', function() { return $this->protectedVariable; } );
+		TestMacroTrait::macro('tryStatic', function() { return static::getProtectedStatic(); } );
+		$instance = new TestMacroTrait;
+
+		$result = $instance->tryInstance();
+		$this->assertEquals('instance', $result);
+
+		$result = TestMacroTrait::tryStatic();
+		$this->assertEquals('static', $result);
+	}
+
+}
+
+class TestMacroTrait {
+	use Illuminate\Support\Traits\MacroableTrait;
+	protected $protectedVariable = 'instance';
+	protected static function getProtectedStatic()
+	{
+		return 'static';
+	}
 }