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 4bbfabe6e..99198539f 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'); @@ -236,7 +236,7 @@ * If running via cli - apc is disabled by default. ensure it's available and enabled in this case * * 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/Cache/CacheEngine.php b/lib/Cake/Cache/CacheEngine.php index 6994701f4..9daf4d7c0 100644 --- a/lib/Cake/Cache/CacheEngine.php +++ b/lib/Cake/Cache/CacheEngine.php @@ -65,7 +65,7 @@ abstract class CacheEngine { * Garbage collection * * Permanently remove all expired and deleted data - * + * * @param integer $expires [optional] An expires timestamp, invalidataing all data before. * @return void */ diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php index 9388fafb9..da68c398c 100644 --- a/lib/Cake/Cache/Engine/FileEngine.php +++ b/lib/Cake/Cache/Engine/FileEngine.php @@ -93,7 +93,7 @@ class FileEngine extends CacheEngine { /** * Garbage collection. Permanently remove all expired and deleted data - * + * * @param integer $expires [optional] An expires timestamp, invalidataing all data before. * @return boolean True if garbage collection was successful, false on failure */ diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php index ffe993ce0..69b4cdd39 100644 --- a/lib/Cake/Console/Command/Task/TemplateTask.php +++ b/lib/Cake/Console/Command/Task/TemplateTask.php @@ -56,7 +56,7 @@ class TemplateTask extends AppShell { * * Bake themes are directories not named `skel` inside a `Console/Templates` path. * They are listed in this order: app -> plugin -> default - * + * * @return array Array of bake themes that are installed. */ protected function _findThemes() { diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php index f14c51874..2b9892fc0 100644 --- a/lib/Cake/Console/Command/TestShell.php +++ b/lib/Cake/Console/Command/TestShell.php @@ -335,8 +335,8 @@ class TestShell extends Shell { * Find the test case for the passed file. The file could itself be a test. * * @param string $file - * @param string $category - * @param boolean $throwOnMissingFile + * @param string $category + * @param boolean $throwOnMissingFile * @access protected * @return array(type, case) * @throws Exception diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index c53e2fd02..7720e9ed6 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/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'); diff --git a/lib/Cake/Controller/Component.php b/lib/Cake/Controller/Component.php index 876174e8c..42815e534 100644 --- a/lib/Cake/Controller/Component.php +++ b/lib/Cake/Controller/Component.php @@ -120,7 +120,7 @@ class Component extends Object { } /** - * Called before the Controller::beforeRender(), and before + * Called before the Controller::beforeRender(), and before * the view class is loaded, and before Controller::render() * * @param Controller $controller Controller with components to beforeRender diff --git a/lib/Cake/Controller/Component/Acl/IniAcl.php b/lib/Cake/Controller/Component/Acl/IniAcl.php index 8810668cc..d915443fb 100644 --- a/lib/Cake/Controller/Component/Acl/IniAcl.php +++ b/lib/Cake/Controller/Component/Acl/IniAcl.php @@ -143,7 +143,7 @@ class IniAcl extends Object implements AclInterface { } /** - * Parses an INI file and returns an array that reflects the + * Parses an INI file and returns an array that reflects the * INI file's section structure. Double-quote friendly. * * @param string $filename File diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php index d63217857..bd9c7302e 100644 --- a/lib/Cake/Controller/Component/Acl/PhpAcl.php +++ b/lib/Cake/Controller/Component/Acl/PhpAcl.php @@ -18,7 +18,7 @@ */ /** - * PhpAcl implements an access control system using a plain PHP configuration file. + * PhpAcl implements an access control system using a plain PHP configuration file. * An example file can be found in app/Config/acl.php * * @package Cake.Controller.Component.Acl @@ -46,7 +46,7 @@ class PhpAcl extends Object implements AclInterface { /** * Aco Object - * + * * @var PhpAco */ public $Aco = null; @@ -65,8 +65,8 @@ class PhpAcl extends Object implements AclInterface { /** * Initialize method - * - * @param AclComponent $Component Component instance + * + * @param AclComponent $Component Component instance * @return void */ public function initialize(Component $Component) { @@ -199,7 +199,7 @@ class PhpAco { /** * map modifiers for ACO paths to their respective PCRE pattern - * + * * @var array */ public static $modifiers = array( @@ -263,7 +263,7 @@ class PhpAco { /** * allow/deny ARO access to ARO * - * @return void + * @return void */ public function access($aro, $aco, $action, $type = 'deny') { $aco = $this->resolve($aco); @@ -315,7 +315,7 @@ class PhpAco { * * @param array $allow ACO allow rules * @param array $deny ACO deny rules - * @return void + * @return void */ public function build(array $allow, array $deny = array()) { $this->_tree = array(); @@ -347,7 +347,7 @@ class PhpAco { class PhpAro { /** - * role to resolve to when a provided ARO is not listed in + * role to resolve to when a provided ARO is not listed in * the internal tree * * @var string @@ -357,12 +357,12 @@ class PhpAro { /** * map external identifiers. E.g. if * - * array('User' => array('username' => 'jeff', 'role' => 'editor')) + * array('User' => array('username' => 'jeff', 'role' => 'editor')) * - * is passed as an ARO to one of the methods of AclComponent, PhpAcl + * is passed as an ARO to one of the methods of AclComponent, PhpAcl * will check if it can be resolved to an User or a Role defined in the - * configuration file. - * + * configuration file. + * * @var array * @see app/Config/acl.php */ @@ -373,7 +373,7 @@ class PhpAro { /** * aliases to map - * + * * @var array */ public $aliases = array(); @@ -398,9 +398,9 @@ class PhpAro { * From the perspective of the given ARO, walk down the tree and * collect all inherited AROs levelwise such that AROs from different * branches with equal distance to the requested ARO will be collected at the same - * index. The resulting array will contain a prioritized list of (list of) roles ordered from + * index. The resulting array will contain a prioritized list of (list of) roles ordered from * the most distant AROs to the requested one itself. - * + * * @param string|array $aro An ARO identifier * @return array prioritized AROs */ @@ -425,7 +425,7 @@ class PhpAro { /** * resolve an ARO identifier to an internal ARO string using - * the internal mapping information. + * the internal mapping information. * * @param string|array $aro ARO identifier (User.jeff, array('User' => ...), etc) * @return string internal aro string (e.g. User/jeff, Role/default) @@ -527,7 +527,7 @@ class PhpAro { * build an ARO tree structure for internal processing * * @param array $aros array of AROs as key and their inherited AROs as values - * @return void + * @return void */ public function build(array $aros) { $this->_tree = array(); diff --git a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php index bdea7d8aa..5e0fb0ee5 100644 --- a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php @@ -68,7 +68,7 @@ class DigestAuthenticate extends BaseAuthenticate { * - `realm` The realm authentication is for, Defaults to the servername. * - `nonce` A nonce used for authentication. Defaults to `uniqid()`. * - `qop` Defaults to auth, no other values are supported at this time. - * - `opaque` A string that must be returned unchanged by clients. + * - `opaque` A string that must be returned unchanged by clients. * Defaults to `md5($settings['realm'])` * * @var array diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php index f314c42fa..1d962bc28 100644 --- a/lib/Cake/Controller/Component/CookieComponent.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -155,7 +155,7 @@ class CookieComponent extends Component { /** * A reference to the Controller's CakeResponse object - * + * * @var CakeResponse */ protected $_response = null; diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php index 3b5eb8669..907b43a8f 100644 --- a/lib/Cake/Controller/Component/SecurityComponent.php +++ b/lib/Cake/Controller/Component/SecurityComponent.php @@ -23,7 +23,7 @@ App::uses('Hash', 'Utility'); App::uses('Security', 'Utility'); /** - * The Security Component creates an easy way to integrate tighter security in + * The Security Component creates an easy way to integrate tighter security in * your application. It provides methods for various tasks like: * * - Restricting which HTTP methods your application accepts. diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php index ed42bff24..0bcdb7fa6 100644 --- a/lib/Cake/Controller/Component/SessionComponent.php +++ b/lib/Cake/Controller/Component/SessionComponent.php @@ -21,8 +21,8 @@ App::uses('Component', 'Controller'); App::uses('CakeSession', 'Model/Datasource'); /** - * The CakePHP SessionComponent provides a way to persist client data between - * page requests. It acts as a wrapper for the `$_SESSION` as well as providing + * The CakePHP SessionComponent provides a way to persist client data between + * page requests. It acts as a wrapper for the `$_SESSION` as well as providing * convenience methods for several `$_SESSION` related functions. * * @package Cake.Controller.Component diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php index 5242c9f98..814f36b32 100644 --- a/lib/Cake/Core/CakePlugin.php +++ b/lib/Cake/Core/CakePlugin.php @@ -18,7 +18,7 @@ */ /** - * CakePlugin is responsible for loading and unloading plugins. It also can + * CakePlugin is responsible for loading and unloading plugins. It also can * retrieve plugin paths and load their bootstrap and routes files. * * @package Cake.Core diff --git a/lib/Cake/Event/CakeEvent.php b/lib/Cake/Event/CakeEvent.php index 52de3cf23..c70d4f816 100644 --- a/lib/Cake/Event/CakeEvent.php +++ b/lib/Cake/Event/CakeEvent.php @@ -27,7 +27,7 @@ class CakeEvent { /** * Name of the event - * + * * @var string $name */ protected $_name = null; diff --git a/lib/Cake/Event/CakeEventManager.php b/lib/Cake/Event/CakeEventManager.php index 252364d4c..aacd537c9 100644 --- a/lib/Cake/Event/CakeEventManager.php +++ b/lib/Cake/Event/CakeEventManager.php @@ -50,7 +50,7 @@ class CakeEventManager { protected $_listeners = array(); /** - * Internal flag to distinguish a common manager from the sigleton + * Internal flag to distinguish a common manager from the sigleton * * @var boolean */ @@ -64,7 +64,7 @@ class CakeEventManager { * * If called with a first params, it will be set as the globally available instance * - * @param CakeEventManager $manager + * @param CakeEventManager $manager * @return CakeEventManager the global event manager */ public static function instance($manager = null) { @@ -80,7 +80,7 @@ class CakeEventManager { } /** - * Adds a new listener to an event. Listeners + * Adds a new listener to an event. Listeners * * @param callback|CakeEventListener $callable PHP valid callback type or instance of CakeEventListener to be called * when the event named with $eventKey is triggered. If a CakeEventListener instances is passed, then the `implementedEvents` diff --git a/lib/Cake/Model/Behavior/ContainableBehavior.php b/lib/Cake/Model/Behavior/ContainableBehavior.php index bb33eaf46..98c067468 100644 --- a/lib/Cake/Model/Behavior/ContainableBehavior.php +++ b/lib/Cake/Model/Behavior/ContainableBehavior.php @@ -20,8 +20,8 @@ */ /** - * Behavior to allow for dynamic and atomic manipulation of a Model's associations - * used for a find call. Most useful for limiting the amount of associations and + * Behavior to allow for dynamic and atomic manipulation of a Model's associations + * used for a find call. Most useful for limiting the amount of associations and * data returned. * * @package Cake.Model.Behavior diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php index edbcfa5eb..4edd0ac77 100644 --- a/lib/Cake/Model/ConnectionManager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -24,7 +24,7 @@ App::uses('DataSource', 'Model/Datasource'); /** * Manages loaded instances of DataSource objects * - * Provides an interface for loading and enumerating connections defined in + * Provides an interface for loading and enumerating connections defined in * app/Config/database.php * * @package Cake.Model diff --git a/lib/Cake/Model/Datasource/DataSource.php b/lib/Cake/Model/Datasource/DataSource.php index 06f526403..af65276ce 100644 --- a/lib/Cake/Model/Datasource/DataSource.php +++ b/lib/Cake/Model/Datasource/DataSource.php @@ -420,7 +420,7 @@ class DataSource extends Object { /** * Closes a connection. Override in subclasses - * + * * @return boolean * @access public */ diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index 46d565400..035f120ea 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -637,7 +637,7 @@ class Sqlserver extends DboSource { /** * Generate a database-native column schema string * - * @param array $column An array structured like the + * @param array $column An array structured like the * following: array('name'=>'value', 'type'=>'value'[, options]), * where options can be 'default', 'length', or 'key'. * @return string diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php index b812dac97..9bf4d434e 100644 --- a/lib/Cake/Network/Email/CakeEmail.php +++ b/lib/Cake/Network/Email/CakeEmail.php @@ -1035,7 +1035,7 @@ class CakeEmail { /** * Send an email using the specified content, template and layout - * + * * @param string|array $content String with message or array with messages * @return array * @throws SocketException @@ -1337,7 +1337,7 @@ class CakeEmail { /** * Attach non-embedded files by adding file contents inside boundaries. * - * @param string $boundary Boundary to use. If null, will default to $this->_boundary + * @param string $boundary Boundary to use. If null, will default to $this->_boundary * @return array An array of lines to add to the message */ protected function _attachFiles($boundary = null) { @@ -1380,7 +1380,7 @@ class CakeEmail { /** * Attach inline/embedded files to the message. * - * @param string $boundary Boundary to use. If null, will default to $this->_boundary + * @param string $boundary Boundary to use. If null, will default to $this->_boundary * @return array An array of lines to add to the message */ protected function _attachInlineFiles($boundary = null) { diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php index a091fbd6e..6f506d845 100644 --- a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php @@ -102,7 +102,7 @@ class FileEngineTest extends CakeTestCase { /** * Test read/write on the same cache key. Ensures file handles are re-wound. - * + * * @return void */ public function testConsecutiveReadWrite() { diff --git a/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/lib/Cake/Test/Case/Console/Command/TestShellTest.php index 5d08c584d..ddae489e2 100644 --- a/lib/Cake/Test/Case/Console/Command/TestShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/TestShellTest.php @@ -64,7 +64,7 @@ class TestShellTest extends CakeTestCase { /** * testMapCoreFileToCategory - * + * * @return void */ public function testMapCoreFileToCategory() { @@ -84,7 +84,7 @@ class TestShellTest extends CakeTestCase { * testMapCoreFileToCase * * basics.php is a slightly special case - it's the only file in the core with a test that isn't Capitalized - * + * * @return void */ public function testMapCoreFileToCase() { @@ -102,7 +102,7 @@ class TestShellTest extends CakeTestCase { /** * testMapAppFileToCategory - * + * * @return void */ public function testMapAppFileToCategory() { @@ -132,7 +132,7 @@ class TestShellTest extends CakeTestCase { /** * testMapPluginFileToCategory - * + * * @return void */ public function testMapPluginFileToCategory() { @@ -162,7 +162,7 @@ class TestShellTest extends CakeTestCase { /** * testMapCoreTestToCategory - * + * * @return void */ public function testMapCoreTestToCategory() { @@ -182,7 +182,7 @@ class TestShellTest extends CakeTestCase { * testMapCoreTestToCase * * basics.php is a slightly special case - it's the only file in the core with a test that isn't Capitalized - * + * * @return void */ public function testMapCoreTestToCase() { @@ -200,7 +200,7 @@ class TestShellTest extends CakeTestCase { /** * testMapAppTestToCategory - * + * * @return void */ public function testMapAppTestToCategory() { @@ -230,7 +230,7 @@ class TestShellTest extends CakeTestCase { /** * testMapPluginTestToCategory - * + * * @return void */ public function testMapPluginTestToCategory() { diff --git a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php index 04a358ab4..01f1ff7d4 100644 --- a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php +++ b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php @@ -53,7 +53,7 @@ class CakeEventTestListener { /** * Auxiliary function to help in stopPropagation testing * - * @param CakeEvent $event + * @param CakeEvent $event * @return void */ public function stopListener($event) { diff --git a/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php index 3bb9bd0d7..a0de0aba2 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php @@ -29,7 +29,7 @@ class TestSource extends DataSource { /** * _schema - * @var type + * @var type */ protected $_schema = array( 'id' => array( diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php index 556554872..6afdc0b35 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php @@ -227,7 +227,7 @@ class CakeTestFixtureTest extends CakeTestCase { } /** - * test that init() correctly sets the fixture table when the connection + * test that init() correctly sets the fixture table when the connection * or model have prefixes defined. * * @return void diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php index a30fd5a86..9a25b4939 100644 --- a/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php +++ b/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php @@ -22,7 +22,7 @@ class CakeTestSuiteTest extends CakeTestCase { /** * testAddTestDirectory - * + * * @return void */ public function testAddTestDirectory() { @@ -39,7 +39,7 @@ class CakeTestSuiteTest extends CakeTestCase { /** * testAddTestDirectoryRecursive - * + * * @return void */ public function testAddTestDirectoryRecursive() { @@ -57,7 +57,7 @@ class CakeTestSuiteTest extends CakeTestCase { /** * testAddTestDirectoryRecursiveWithHidden - * + * * @return void */ public function testAddTestDirectoryRecursiveWithHidden() { @@ -81,7 +81,7 @@ class CakeTestSuiteTest extends CakeTestCase { /** * testAddTestDirectoryRecursiveWithNonPhp - * + * * @return void */ public function testAddTestDirectoryRecursiveWithNonPhp() { diff --git a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php index 82f2ba9e1..dbe3ef82c 100644 --- a/lib/Cake/TestSuite/Fixture/CakeTestFixture.php +++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php @@ -16,7 +16,7 @@ App::uses('CakeSchema', 'Model'); /** - * CakeTestFixture is responsible for building and destroying tables to be used + * CakeTestFixture is responsible for building and destroying tables to be used * during testing. * * @package Cake.TestSuite.Fixture diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php index 6fe93995a..edf2dfbf3 100644 --- a/lib/Cake/Utility/File.php +++ b/lib/Cake/Utility/File.php @@ -546,7 +546,7 @@ class File { } /** - * Get the mime type of the file. Uses the finfo extension if + * Get the mime type of the file. Uses the finfo extension if * its available, otherwise falls back to mime_content_type * * @return false|string The mimetype of the file, or false if reading fails. diff --git a/lib/Cake/View/Helper/SessionHelper.php b/lib/Cake/View/Helper/SessionHelper.php index 259c4df81..2bb983c47 100644 --- a/lib/Cake/View/Helper/SessionHelper.php +++ b/lib/Cake/View/Helper/SessionHelper.php @@ -100,7 +100,7 @@ class SessionHelper extends AppHelper { * echo $this->Session->flash('flash', array('element' => 'my_custom_element')); * }}} * - * If you want to use an element from a plugin for rendering your flash message you can do that using the + * If you want to use an element from a plugin for rendering your flash message you can do that using the * plugin param: * * {{{ diff --git a/lib/Cake/View/JsonView.php b/lib/Cake/View/JsonView.php index 3cf669c43..785f75437 100644 --- a/lib/Cake/View/JsonView.php +++ b/lib/Cake/View/JsonView.php @@ -25,7 +25,7 @@ App::uses('View', 'View'); * * `$this->set(array('posts' => $posts, '_serialize' => 'posts'));` * - * When the view is rendered, the `$posts` view variable will be serialized + * When the view is rendered, the `$posts` view variable will be serialized * into JSON. * * You can also define `'_serialize'` as an array. This will create a top level object containing @@ -35,7 +35,7 @@ App::uses('View', 'View'); * $this->set(compact('posts', 'users', 'stuff')); * $this->set('_serialize', array('posts', 'users')); * }}} - * + * * The above would generate a JSON object that looks like: * * `{"posts": [...], "users": [...]}` @@ -49,9 +49,9 @@ App::uses('View', 'View'); class JsonView extends View { /** - * JSON views are always located in the 'json' sub directory for a + * JSON views are always located in the 'json' sub directory for a * controllers views. - * + * * @var string */ public $subDir = 'json'; @@ -72,8 +72,8 @@ class JsonView extends View { * Render a JSON view. * * Uses the special '_serialize' parameter to convert a set of - * view variables into a JSON response. Makes generating simple - * JSON responses very easy. You can omit the '_serialize' parameter, + * view variables into a JSON response. Makes generating simple + * JSON responses very easy. You can omit the '_serialize' parameter, * and use a normal view + layout as well. * * @param string $view The view being rendered. diff --git a/lib/Cake/View/ViewBlock.php b/lib/Cake/View/ViewBlock.php index 5636d74d5..98b16d7fe 100644 --- a/lib/Cake/View/ViewBlock.php +++ b/lib/Cake/View/ViewBlock.php @@ -73,7 +73,7 @@ class ViewBlock { } /** - * Append to an existing or new block. Appending to a new + * Append to an existing or new block. Appending to a new * block will create the block. * * Calling append() without a value will create a new capturing