Fix example & incorrect import.

cakephp · Dec 9, 2012 · 6292fc7 · 6292fc7
1 parent 9c9cc7f
commit 6292fc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/Cake/Routing/Route/CakeRoute.php b/lib/Cake/Routing/Route/CakeRoute.php
@@ -11,8 +11,7 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
-App::uses('Set', 'Utility');
+App::uses('Hash', 'Utility');
 
 /**
  * A single Route used by the Router to connect requests to

diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -269,7 +269,7 @@ public static function resourceMap($resourceMap = null) {
  * - `named` is used to configure named parameters at the route level. This key uses the same options
  *   as Router::connectNamed()
  *
- * In addition to the 4 keys listed above, you can add additional conditions for matching routes.
+ * You can also add additional conditions for matching routes to the $defaults array.
  * The following conditions can be used:
  *
  * - `[type]` Only match requests for specific content types.
@@ -278,7 +278,7 @@ public static function resourceMap($resourceMap = null) {
  *
  * Example of using the `[method]` condition:
  *
- * `Router::connect('/tasks', array('controller' => 'tasks', 'action' => 'index'), array('[method]' => 'GET'));`
+ * `Router::connect('/tasks', array('controller' => 'tasks', 'action' => 'index', '[method]' => 'GET'));`
  *
  * The above route will only be matched for GET requests. POST requests will fail to match this route.
  *