From 41ae19b5bcf40f5dd00a536bb5c54f41882ee9c9 Mon Sep 17 00:00:00 2001 From: Graham Weldon Date: Mon, 15 Oct 2012 11:44:31 +1100 Subject: [PATCH] Removed spaces at the end of lines. --- app/Config/acl.php | 36 +++++++++---------- app/Config/bootstrap.php | 2 +- app/Config/core.php | 4 +-- app/Config/routes.php | 2 +- .../TestSuite/Fixture/CakeTestFixture.php | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/Config/acl.php b/app/Config/acl.php index 21f8ddaa7..3df822ab4 100644 --- a/app/Config/acl.php +++ b/app/Config/acl.php @@ -22,18 +22,18 @@ /** * Example * ------- - * + * * Assumptions: * - * 1. In your application you created a User model with the following properties: + * 1. In your application you created a User model with the following properties: * username, group_id, password, email, firstname, lastname and so on. - * 2. You configured AuthComponent to authorize actions via - * $this->Auth->authorize = array('Actions' => array('actionPath' => 'controllers/'),...) - * + * 2. You configured AuthComponent to authorize actions via + * $this->Auth->authorize = array('Actions' => array('actionPath' => 'controllers/'),...) + * * Now, when a user (i.e. jeff) authenticates successfully and requests a controller action (i.e. /invoices/delete) - * that is not allowed by default (e.g. via $this->Auth->allow('edit') in the Invoices controller) then AuthComponent - * will ask the configured ACL interface if access is granted. Under the assumptions 1. and 2. this will be - * done via a call to Acl->check() with + * that is not allowed by default (e.g. via $this->Auth->allow('edit') in the Invoices controller) then AuthComponent + * will ask the configured ACL interface if access is granted. Under the assumptions 1. and 2. this will be + * done via a call to Acl->check() with * * array('User' => array('username' => 'jeff', 'group_id' => 4, ...)) * @@ -42,7 +42,7 @@ * '/controllers/invoices/delete' * * as ACO. - * + * * If the configured map looks like * * $config['map'] = array( @@ -50,17 +50,17 @@ * 'Role' => 'User/group_id', * ); * - * then PhpAcl will lookup if we defined a role like User/jeff. If that role is not found, PhpAcl will try to - * find a definition for Role/4. If the definition isn't found then a default role (Role/default) will be used to + * then PhpAcl will lookup if we defined a role like User/jeff. If that role is not found, PhpAcl will try to + * find a definition for Role/4. If the definition isn't found then a default role (Role/default) will be used to * check rules for the given ACO. The search can be expanded by defining aliases in the alias configuration. * E.g. if you want to use a more readable name than Role/4 in your definitions you can define an alias like * * $config['alias'] = array( * 'Role/4' => 'Role/editor', * ); - * + * * In the roles configuration you can define roles on the lhs and inherited roles on the rhs: - * + * * $config['roles'] = array( * 'Role/admin' => null, * 'Role/accountant' => null, @@ -68,7 +68,7 @@ * 'Role/manager' => 'Role/editor, Role/accountant', * 'User/jeff' => 'Role/manager', * ); - * + * * In this example manager inherits all rules from editor and accountant. Role/admin doesn't inherit from any role. * Lets define some rules: * @@ -87,10 +87,10 @@ * ), * ); * - * Ok, so as jeff inherits from Role/manager he's matched every rule that references User/jeff, Role/manager, - * Role/editor, Role/accountant and Role/default. However, for jeff, rules for User/jeff are more specific than + * Ok, so as jeff inherits from Role/manager he's matched every rule that references User/jeff, Role/manager, + * Role/editor, Role/accountant and Role/default. However, for jeff, rules for User/jeff are more specific than * rules for Role/manager, rules for Role/manager are more specific than rules for Role/editor and so on. - * This is important when allow and deny rules match for a role. E.g. Role/accountant is allowed + * This is important when allow and deny rules match for a role. E.g. Role/accountant is allowed * controllers/invoices/* but at the same time controllers/invoices/delete is denied. But there is a more * specific rule defined for Role/manager which is allowed controllers/invoices/delete. However, the most specific * rule denies access to the delete action explicitly for User/jeff, so he'll be denied access to the resource. @@ -101,7 +101,7 @@ /** * The role map defines how to resolve the user record from your application - * to the roles you defined in the roles configuration. + * to the roles you defined in the roles configuration. */ $config['map'] = array( 'User' => 'User/username', diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php index bcc50f6c4..dd7a596da 100644 --- a/app/Config/bootstrap.php +++ b/app/Config/bootstrap.php @@ -2,7 +2,7 @@ /** * This file is loaded automatically by the app/webroot/index.php file after core.php * - * This file should load/create any application wide configuration settings, such as + * This file should load/create any application wide configuration settings, such as * Caching, Logging, loading additional configuration files. * * You should also use this file to include any files that provide global functions/constants diff --git a/app/Config/core.php b/app/Config/core.php index 84983b622..d31e5f32d 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -226,7 +226,7 @@ Configure::write('Acl.database', 'default'); /** - * Uncomment this line and correct your server timezone to fix + * Uncomment this line and correct your server timezone to fix * any date & time related errors. */ //date_default_timezone_set('UTC'); @@ -238,7 +238,7 @@ * By default File is used, but for improved performance you should use APC. * * Note: 'default' and other application caches should be configured in app/Config/bootstrap.php. - * Please check the comments in boostrap.php for more info on the cache engines available + * Please check the comments in boostrap.php for more info on the cache engines available * and their setttings. */ $engine = 'File'; diff --git a/app/Config/routes.php b/app/Config/routes.php index 32151d27c..c68cc3e4a 100644 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -32,7 +32,7 @@ Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); /** - * Load all plugin routes. See the CakePlugin documentation on + * Load all plugin routes. See the CakePlugin documentation on * how to customize the loading of plugin routes. */ CakePlugin::routes(); diff --git a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php index 67b8782c2..92fd16a30 100644 --- a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php +++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php @@ -293,7 +293,7 @@ class CakeTestFixture { } /** - * Truncates the current fixture. Can be overwritten by classes extending + * Truncates the current fixture. Can be overwritten by classes extending * CakeFixture to trigger other events before / after truncate. * * @param DboSource $db A reference to a db instance