Fix the forgetMiddleware call (to not use get_class)

manavo · manavo · commit 6b126dc74672 · 2014-09-26T22:25:59.000+01:00
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -716,7 +716,7 @@ public function forgetMiddleware($class)
 	{
 		$this->middlewares = array_filter($this->middlewares, function($m) use ($class)
 		{
-			return get_class($m['class']) != $class;
+			return $m['class'] != $class;
 		});
 	}
 
diff --git a/tests/Foundation/FoundationApplicationTest.php b/tests/Foundation/FoundationApplicationTest.php
@@ -38,6 +38,14 @@ public function testServiceProvidersAreCorrectlyRegistered()
 	}
 
 
+	public function testForgetMiddleware()
+	{
+		$app = new ApplicationGetMiddlewaresStub;
+		$app->middleware('Illuminate\Http\FrameGuard');
+		$app->forgetMiddleware('Illuminate\Http\FrameGuard');
+		$this->assertEquals(0, count($app->getMiddlewares()));
+	}
+
 	public function testDeferredServicesMarkedAsBound()
 	{
 		$app = new Application;
@@ -136,6 +144,14 @@ protected function setExceptionHandler(Closure $handler) { return $handler; }
 
 }
 
+class ApplicationGetMiddlewaresStub extends Illuminate\Foundation\Application
+{
+	public function getMiddlewares()
+	{
+		return $this->middlewares;
+	}
+}
+
 class ApplicationDeferredSharedServiceProviderStub extends Illuminate\Support\ServiceProvider {
 	protected $defer = true;
 	public function register()

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ public function forgetMiddleware($class)`
`716`	`716`	`{`
`717`	`717`	`$this->middlewares = array_filter($this->middlewares, function($m) use ($class)`
`718`	`718`	`{`
`719`		`- return get_class($m['class']) != $class;`
	`719`	`+ return $m['class'] != $class;`
`720`	`720`	`});`
`721`	`721`	`}`
`722`	`722`