Merge pull request laravel#1665 from driesvints/bugfix/fix-missing-method-on-controller

taylorotwell · taylorotwell · commit b4a73c15f104 · 2013-06-16T17:51:05.000-07:00
Fix missing method implementation on Controller class
diff --git a/src/Illuminate/Routing/Controllers/Controller.php b/src/Illuminate/Routing/Controllers/Controller.php
@@ -282,12 +282,12 @@ public function getControllerFilters()
 	/**
 	 * Handle calls to missing methods on the controller.
 	 *
-	 * @param  array   $parameters
+	 * @param  array  $parameters
 	 * @return mixed
 	 */
 	public function missingMethod($parameters)
 	{
-		throw new NotFoundHttpException;
+		throw new NotFoundHttpException("Controller method not found.");
 	}
 
 	/**
@@ -299,7 +299,7 @@ public function missingMethod($parameters)
 	 */
 	public function __call($method, $parameters)
 	{
-		throw new NotFoundHttpException;
+		return $this->missingMethod($parameters);
 	}
 
 }
diff --git a/tests/Routing/RoutingControllerTest.php b/tests/Routing/RoutingControllerTest.php
@@ -122,6 +122,43 @@ public function testAfterFiltersAreExecutedWhenUsingCallbackFilters()
 		unset($_SERVER['__controller.after']);
 	}
 
+
+	/**
+	 * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+	 */
+	public function testMissingMethod()
+	{
+		$controller = new BasicControllerStub;
+		$container = new Illuminate\Container\Container;
+		$container['filter.parser'] = $container->share(function() { return m::mock('StdClass'); });
+		$container['filter.parser']->shouldReceive('parse')->andReturn(array());
+		$router = m::mock('Illuminate\Routing\Router');
+		$router->shouldReceive('getRequest')->andReturn(m::mock('Symfony\Component\HttpFoundation\Request'));
+		$router->shouldReceive('getCurrentRoute')->andReturn(m::mock('Illuminate\Routing\Route'));
+		$router->shouldReceive('prepare')->never()->andReturnUsing(function($response, $request) { return new Response($response); });
+
+		// Call a method that doesn't exists.
+		$controller->callAction($container, $router, 'thisMethodDoesntExists', array('foo'));
+	}
+
+
+	public function testMissingMethodReplacement()
+	{
+		$controller = new MissingMethodControllerStub;
+		$container = new Illuminate\Container\Container;
+		$container['filter.parser'] = $container->share(function() { return m::mock('StdClass'); });
+		$container['filter.parser']->shouldReceive('parse')->andReturn(array());
+		$router = m::mock('Illuminate\Routing\Router');
+		$router->shouldReceive('getRequest')->andReturn(m::mock('Symfony\Component\HttpFoundation\Request'));
+		$router->shouldReceive('getCurrentRoute')->andReturn(m::mock('Illuminate\Routing\Route'));
+		$router->shouldReceive('prepare')->once()->andReturnUsing(function($response, $request) { return new Response($response); });
+
+		// Call a method that doesn't exists.
+		$response = $controller->callAction($container, $router, 'thisMethodDoesntExists', array('foo'));
+		$this->assertEquals('Missing method!', $response->getContent());
+	}
+
+
 }
 
 class BasicControllerStub extends Illuminate\Routing\Controllers\Controller {
@@ -140,4 +177,11 @@ protected function setupLayout()
 	{
 		$this->layout = 'Layout';
 	}
+}
+
+class MissingMethodControllerStub extends Illuminate\Routing\Controllers\Controller {
+	public function missingMethod($parameters)
+	{
+	    return 'Missing method!';
+	} 
 }

Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,12 @@ public function getControllerFilters()`
`282`	`282`	`/**`
`283`	`283`	`* Handle calls to missing methods on the controller.`
`284`	`284`	`*`
`285`		`- * @param array $parameters`
	`285`	`+ * @param array $parameters`
`286`	`286`	`* @return mixed`
`287`	`287`	`*/`
`288`	`288`	`public function missingMethod($parameters)`
`289`	`289`	`{`
`290`		`- throw new NotFoundHttpException;`
	`290`	`+ throw new NotFoundHttpException("Controller method not found.");`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`@@ -299,7 +299,7 @@ public function missingMethod($parameters)`
`299`	`299`	`*/`
`300`	`300`	`public function __call($method, $parameters)`
`301`	`301`	`{`
`302`		`- throw new NotFoundHttpException;`
	`302`	`+ return $this->missingMethod($parameters);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`}`