Let getRoutable only fetch public methods

lucasmichot · lucasmichot · commit 48875515bcb0 · 2014-08-12T23:51:14.000+02:00
diff --git a/src/Illuminate/Routing/ControllerInspector.php b/src/Illuminate/Routing/ControllerInspector.php
@@ -30,9 +30,9 @@ public function getRoutable($controller, $prefix)
 		// To get the routable methods, we will simply spin through all methods on the
 		// controller instance checking to see if it belongs to the given class and
 		// is a publicly routable method. If so, we will add it to this listings.
-		foreach ($reflection->getMethods() as $method)
+		foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method)
 		{
-			if ($this->isRoutable($method, $reflection->name))
+			if ($this->isRoutable($method))
 			{
 				$data = $this->getMethodData($method, $prefix);
 
@@ -69,7 +69,7 @@ public function isRoutable(ReflectionMethod $method)
 	{
 		if ($method->class == 'Illuminate\Routing\Controller') return false;
 
-		return $method->isPublic() && starts_with($method->name, $this->verbs);
+		return starts_with($method->name, $this->verbs);
 	}
 
 	/**
diff --git a/tests/Routing/RoutingControllerInspectorTest.php b/tests/Routing/RoutingControllerInspectorTest.php
@@ -32,11 +32,13 @@ public function testMethodsAreCorrectWhenControllerIsNamespaced()
 
 class RoutingControllerInspectorBaseStub {
 	public function getBreeze() {}
+	private function patchTest() {}
 }
 
 class RoutingControllerInspectorStub extends RoutingControllerInspectorBaseStub {
 	public function getIndex() {}
 	public function getFooBar() {}
 	public function postBaz() {}
 	protected function getBoom() {}
+	private function putTest() {}
 }

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public function getRoutable($controller, $prefix)`
`30`	`30`	`// To get the routable methods, we will simply spin through all methods on the`
`31`	`31`	`// controller instance checking to see if it belongs to the given class and`
`32`	`32`	`// is a publicly routable method. If so, we will add it to this listings.`
`33`		`- foreach ($reflection->getMethods() as $method)`
	`33`	`+ foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method)`
`34`	`34`	`{`
`35`		`- if ($this->isRoutable($method, $reflection->name))`
	`35`	`+ if ($this->isRoutable($method))`
`36`	`36`	`{`
`37`	`37`	`$data = $this->getMethodData($method, $prefix);`
`38`	`38`
`@@ -69,7 +69,7 @@ public function isRoutable(ReflectionMethod $method)`
`69`	`69`	`{`
`70`	`70`	`if ($method->class == 'Illuminate\Routing\Controller') return false;`
`71`	`71`
`72`		`- return $method->isPublic() && starts_with($method->name, $this->verbs);`
	`72`	`+ return starts_with($method->name, $this->verbs);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,13 @@ public function testMethodsAreCorrectWhenControllerIsNamespaced()`
`32`	`32`
`33`	`33`	`class RoutingControllerInspectorBaseStub {`
`34`	`34`	`public function getBreeze() {}`
	`35`	`+ private function patchTest() {}`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`class RoutingControllerInspectorStub extends RoutingControllerInspectorBaseStub {`
`38`	`39`	`public function getIndex() {}`
`39`	`40`	`public function getFooBar() {}`
`40`	`41`	`public function postBaz() {}`
`41`	`42`	`protected function getBoom() {}`
	`43`	`+ private function putTest() {}`
`42`	`44`	`}`