Remove the isPublic functionality.

vanilla · Mar 19, 2017 · 99b7787 · 99b7787
1 parent af87cb9
commit 99b7787
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/library/Garden/Web/ResourceRoute.php b/library/Garden/Web/ResourceRoute.php
@@ -192,8 +192,7 @@ private function findMethod($controller, $methodName) {
         $regex = '`^(get|post|patch|put|options|delete)(_|$)`i';
 
         // Getters and setters aren't found.
-        if (!(preg_match($regex, $methodName) || strcasecmp($methodName, 'index') === 0)
-            && !(method_exists($controller, 'isPublic') && $controller->isPublic($methodName))) {
+        if (!(preg_match($regex, $methodName) || strcasecmp($methodName, 'index') === 0)) {
             return null;
         }
 
@@ -361,16 +360,10 @@ private function getControllerMethodNames($method, $pathArgs) {
         if (isset($pathArgs[0])) {
             $name = lcfirst($this->filterName($pathArgs[0]));
             $result[] = ["{$method}_{$name}", 0];
-            if (!in_array($name, self::$specialMethods)) {
-                $result[] = [$name, 0];
-            }
         }
         if (isset($pathArgs[1])) {
             $name = lcfirst($this->filterName($pathArgs[1]));
             $result[] = ["{$method}_{$name}", 1];
-            if (!in_array($name, self::$specialMethods)) {
-                $result[] = [$name, 1];
-            }
         }
 
         $result[] = [$method, null];

diff --git a/tests/Library/Garden/Web/ResourceRouteTest.php b/tests/Library/Garden/Web/ResourceRouteTest.php
@@ -164,15 +164,6 @@ public function testIndexProtection() {
         $this->assertNull($route->match(new Request('/discussions/index_foo')));
     }
 
-    /**
-     * Controllers can publicize methods with isPublic().
-     */
-    public function testIsPublic() {
-        $route = $this->createRoute();
-
-        $this->assertNotNull($route->match(new Request('/discussions/i-am-public')));
-    }
-
     /**
      * A path parameter should be filled with the remaining path.
      *

diff --git a/tests/fixtures/src/DiscussionsController.php b/tests/fixtures/src/DiscussionsController.php
@@ -84,14 +84,6 @@ public function getSomething() {
     public function setSomething($val) {
     }
 
-    public function iAmPublic() {
-
-    }
-
-    public function isPublic($method) {
-        return strcasecmp($method, 'iAmPublic') === 0;
-    }
-
     public function post_noMap($query, $body, $data) {
 
     }