Permalink
Browse files

Removing trailing whitespace.

  • Loading branch information...
1 parent f61291c commit 88ef00d2d0ca4ef9a524555b368131702c04dbb7 @markstory markstory committed Nov 5, 2009
Showing with 12 additions and 12 deletions.
  1. +5 −5 cake/libs/router.php
  2. +7 −7 cake/tests/cases/libs/router.test.php
View
@@ -458,7 +458,7 @@ function parse($url) {
$route->compile();
if (($r = $route->parse($url)) !== false) {
$_this->__currentRoute[] =& $route;
-
+
$params = $route->params;
$names = $route->keys;
$defaults = $route->defaults;
@@ -856,7 +856,7 @@ function url($url = null, $full = false) {
$named = $args = array();
$skip = array_merge(
- array('bare', 'action', 'controller', 'plugin', 'prefix'),
+ array('bare', 'action', 'controller', 'plugin', 'prefix'),
$_this->__prefixes
);
@@ -1233,9 +1233,9 @@ function getArgs($args, $options = array()) {
}
/**
- * A single Route used by the Router to connect requests to
+ * A single Route used by the Router to connect requests to
* parameter maps.
- *
+ *
* Not normally created as a standalone. Use Router::connect() to create
* Routes for your application.
*
@@ -1334,7 +1334,7 @@ function compile() {
*
* @param string $route An empty string, or a route string "/"
* @param array $default NULL or an array describing the default route
- * @param array $params An array matching the named elements in the route to regular expressions
+ * @param array $params An array matching the named elements in the route to regular expressions
* which that element should match.
* @return void
* @access protected
@@ -647,7 +647,7 @@ function testUrlGenerationWithAdminPrefix() {
$result = Router::url(array('action' => 'edit', 1));
$expected = '/magazine/admin/subscriptions/edit/1';
$this->assertEqual($result, $expected);
-
+
$result = Router::url(array('admin' => true, 'controller' => 'users', 'action' => 'login'));
$expected = '/magazine/admin/users/login';
$this->assertEqual($result, $expected);
@@ -1550,7 +1550,7 @@ function testAutoPrefixRoutePersistence() {
/**
* test that setting a prefix override the current one
- *
+ *
* @return void
*/
function testPrefixOverride() {
@@ -1566,7 +1566,7 @@ function testPrefixOverride() {
$result = Router::url(array('controller' => 'images', 'action' => 'add', 'admin' => true));
$expected = '/admin/images/add';
$this->assertEqual($result, $expected);
-
+
Router::setRequestInfo(array(
array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/images/index')),
array('base' => '', 'here' => '/admin/images/index', 'webroot' => '/')
@@ -2000,7 +2000,7 @@ function testBasicRouteCompiling() {
$expected = '#^/*$#';
$this->assertEqual($result, $expected);
$this->assertEqual($route->keys, array());
-
+
$route =& new RouterRoute('/:controller/:action', array('controller' => 'posts'));
$result = $route->compile();
$expected = '#^(?:/([^\/]+))?(?:/([^\/]+))?[\/]*$#';
@@ -2032,8 +2032,8 @@ function testRouteCompilingWithParamPatterns() {
$this->assertEqual($route->keys, array('controller', 'action', 'id'));
$route =& new RouterRoute(
- '/:lang/:controller/:action/:id',
- array('controller' => 'testing4'),
+ '/:lang/:controller/:action/:id',
+ array('controller' => 'testing4'),
array('id' => $ID, 'lang' => '[a-z]{3}')
);
$result = $route->compile();
@@ -2069,7 +2069,7 @@ function testMatching() {
$route =& new RouterRoute('/blog/:action', array('controller' => 'posts'));
$result = $route->match(array('controller' => 'posts', 'action' => 'view'));
$this->assertEqual($result, '/blog/view');
-
+
$route =& new RouterRoute('/admin/subscriptions/:action/*', array(
'controller' => 'subscribe', 'admin' => true, 'prefix' => 'admin'
));

0 comments on commit 88ef00d

Please sign in to comment.