From 433dd09ec4b2fdea95e523cca5e5e092a659c647 Mon Sep 17 00:00:00 2001 From: Adam Taylor Date: Tue, 5 Mar 2013 00:05:14 -0700 Subject: [PATCH] Fix typos --- app/Config/bootstrap.php | 2 +- app/Config/core.php | 2 +- lib/Cake/Cache/CacheEngine.php | 6 +++--- lib/Cake/Cache/Engine/ApcEngine.php | 2 +- lib/Cake/Cache/Engine/FileEngine.php | 2 +- lib/Cake/Cache/Engine/MemcacheEngine.php | 2 +- lib/Cake/Cache/Engine/WincacheEngine.php | 2 +- lib/Cake/Console/Command/Task/ModelTask.php | 2 +- lib/Cake/Console/Command/Task/ProjectTask.php | 2 +- lib/Cake/Console/Shell.php | 2 +- .../Console/Templates/skel/Config/bootstrap.php | 2 +- lib/Cake/Console/Templates/skel/Config/core.php | 2 +- lib/Cake/Controller/Component/Acl/PhpAcl.php | 2 +- .../Component/Auth/BlowfishAuthenticate.php | 2 +- lib/Cake/Log/CakeLog.php | 4 ++-- lib/Cake/Model/Behavior/TranslateBehavior.php | 2 +- lib/Cake/Model/Datasource/CakeSession.php | 2 +- lib/Cake/Model/Datasource/Database/Postgres.php | 4 ++-- lib/Cake/Model/Datasource/Database/Sqlserver.php | 4 ++-- lib/Cake/Model/Datasource/DboSource.php | 2 +- lib/Cake/Model/ModelValidator.php | 12 ++++++------ lib/Cake/Model/Validator/CakeValidationRule.php | 6 +++--- lib/Cake/Model/Validator/CakeValidationSet.php | 6 +++--- lib/Cake/Network/CakeResponse.php | 14 +++++++------- lib/Cake/Network/CakeSocket.php | 2 +- lib/Cake/Routing/Dispatcher.php | 6 +++--- lib/Cake/Routing/DispatcherFilter.php | 8 ++++---- lib/Cake/Routing/Filter/CacheDispatcher.php | 2 +- .../Case/Console/Command/Task/DbConfigTaskTest.php | 2 +- .../Case/Console/Command/Task/ModelTaskTest.php | 6 +++--- lib/Cake/Utility/Hash.php | 6 +++--- lib/Cake/Utility/Sanitize.php | 2 +- lib/Cake/Utility/Security.php | 2 +- lib/Cake/Utility/String.php | 2 +- lib/Cake/Utility/Validation.php | 2 +- lib/Cake/View/Helper/CacheHelper.php | 2 +- lib/Cake/View/HelperCollection.php | 2 +- lib/Cake/View/View.php | 2 +- 38 files changed, 67 insertions(+), 67 deletions(-) diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php index b32ae9a95..9b8463cb3 100644 --- a/app/Config/bootstrap.php +++ b/app/Config/bootstrap.php @@ -73,7 +73,7 @@ Cache::config('default', array('engine' => 'File')); */ /** - * You can attach event listeners to the request lifecyle as Dispatcher Filter . By Default CakePHP bundles two filters: + * You can attach event listeners to the request lifecycle as Dispatcher Filter . By Default CakePHP bundles two filters: * * - AssetDispatcher filter will serve your asset files (css, images, js, etc) from your themes and plugins * - CacheDispatcher filter will read the Cache.check configure variable and try to serve cached content generated from controllers diff --git a/app/Config/core.php b/app/Config/core.php index ab18ae5c9..c705ece8a 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -172,7 +172,7 @@ * value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX * - `Session.defaults` - The default configuration set to use as a basis for your session. * There are four builtins: php, cake, cache, database. - * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables, + * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of callables, * that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler` * to the ini array. * - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and diff --git a/lib/Cake/Cache/CacheEngine.php b/lib/Cake/Cache/CacheEngine.php index 579981863..113d01661 100644 --- a/lib/Cake/Cache/CacheEngine.php +++ b/lib/Cake/Cache/CacheEngine.php @@ -30,7 +30,7 @@ abstract class CacheEngine { /** * Contains the compiled string with all groups - * prefixes to be prepeded to every key in this cache engine + * prefixes to be prepended to every key in this cache engine * * @var string */ @@ -67,7 +67,7 @@ abstract class CacheEngine { * * Permanently remove all expired and deleted data * - * @param integer $expires [optional] An expires timestamp, invalidataing all data before. + * @param integer $expires [optional] An expires timestamp, invalidating all data before. * @return void */ public function gc($expires = null) { @@ -126,7 +126,7 @@ abstract class CacheEngine { abstract public function clear($check); /** - * Clears all values belonging to a group. Is upt to the implementing engine + * Clears all values belonging to a group. Is up to the implementing engine * to decide whether actually delete the keys or just simulate it to achieve * the same result. * diff --git a/lib/Cake/Cache/Engine/ApcEngine.php b/lib/Cake/Cache/Engine/ApcEngine.php index b59856947..74d3510a2 100644 --- a/lib/Cake/Cache/Engine/ApcEngine.php +++ b/lib/Cake/Cache/Engine/ApcEngine.php @@ -28,7 +28,7 @@ class ApcEngine extends CacheEngine { /** * Contains the compiled group names - * (prefixed witht the global configuration prefix) + * (prefixed with the global configuration prefix) * * @var array */ diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php index 39bc6ea82..2385f32d4 100644 --- a/lib/Cake/Cache/Engine/FileEngine.php +++ b/lib/Cake/Cache/Engine/FileEngine.php @@ -95,7 +95,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. + * @param integer $expires [optional] An expires timestamp, invalidating all data before. * @return boolean True if garbage collection was successful, false on failure */ public function gc($expires = null) { diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php index 788ff208d..9d956d8ce 100644 --- a/lib/Cake/Cache/Engine/MemcacheEngine.php +++ b/lib/Cake/Cache/Engine/MemcacheEngine.php @@ -30,7 +30,7 @@ class MemcacheEngine extends CacheEngine { /** * Contains the compiled group names - * (prefixed witht the global configuration prefix) + * (prefixed with the global configuration prefix) * * @var array */ diff --git a/lib/Cake/Cache/Engine/WincacheEngine.php b/lib/Cake/Cache/Engine/WincacheEngine.php index 817418e24..3fc49dc69 100644 --- a/lib/Cake/Cache/Engine/WincacheEngine.php +++ b/lib/Cake/Cache/Engine/WincacheEngine.php @@ -29,7 +29,7 @@ class WincacheEngine extends CacheEngine { /** * Contains the compiled group names - * (prefixed witht the global configuration prefix) + * (prefixed with the global configuration prefix) * * @var array */ diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 01a0ff95a..7589b228f 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -568,7 +568,7 @@ class ModelTask extends BakeTask { } /** - * Find the hasOne and HasMany relations and add them to associations list + * Find the hasOne and hasMany relations and add them to associations list * * @param Model $model Model instance being generated * @param array $associations Array of in progress associations diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php index 4fc03b4f9..e8bf783fa 100644 --- a/lib/Cake/Console/Command/Task/ProjectTask.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -313,7 +313,7 @@ class ProjectTask extends AppShell { * Generates and writes CAKE_CORE_INCLUDE_PATH * * @param string $path Project path - * @param boolean $hardCode Wether or not define calls should be hardcoded. + * @param boolean $hardCode Whether or not define calls should be hardcoded. * @return boolean Success */ public function corePath($path, $hardCode = true) { diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php index f2d316489..175b879ee 100644 --- a/lib/Cake/Console/Shell.php +++ b/lib/Cake/Console/Shell.php @@ -825,7 +825,7 @@ class Shell extends Object { * If you don't wish to see in your stdout or stderr everything that is logged * through CakeLog, call this function with first param as false * - * @param boolean $enable wheter to enable CakeLog output or not + * @param boolean $enable whether to enable CakeLog output or not * @return void */ protected function _useLogger($enable = true) { diff --git a/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/lib/Cake/Console/Templates/skel/Config/bootstrap.php index b32ae9a95..9b8463cb3 100644 --- a/lib/Cake/Console/Templates/skel/Config/bootstrap.php +++ b/lib/Cake/Console/Templates/skel/Config/bootstrap.php @@ -73,7 +73,7 @@ Cache::config('default', array('engine' => 'File')); */ /** - * You can attach event listeners to the request lifecyle as Dispatcher Filter . By Default CakePHP bundles two filters: + * You can attach event listeners to the request lifecycle as Dispatcher Filter . By Default CakePHP bundles two filters: * * - AssetDispatcher filter will serve your asset files (css, images, js, etc) from your themes and plugins * - CacheDispatcher filter will read the Cache.check configure variable and try to serve cached content generated from controllers diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index ab18ae5c9..c705ece8a 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -172,7 +172,7 @@ * value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX * - `Session.defaults` - The default configuration set to use as a basis for your session. * There are four builtins: php, cake, cache, database. - * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables, + * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of callables, * that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler` * to the ini array. * - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php index 0212561c5..a26ae9ecc 100644 --- a/lib/Cake/Controller/Component/Acl/PhpAcl.php +++ b/lib/Cake/Controller/Component/Acl/PhpAcl.php @@ -321,7 +321,7 @@ class PhpAco { return array_map('strtolower', $aco); } - // strip multiple occurences of '/' + // strip multiple occurrences of '/' $aco = preg_replace('#/+#', '/', $aco); // make case insensitive $aco = ltrim(strtolower($aco), '/'); diff --git a/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php b/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php index f54862e59..533946f73 100644 --- a/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php @@ -31,7 +31,7 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth'); * When configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions * are used. See FormAuthenticate::$settings for more information. * - * For inital password hashing/creation see Security::hash(). Other than how the password is initally hashed, + * For initial password hashing/creation see Security::hash(). Other than how the password is initially hashed, * BlowfishAuthenticate works exactly the same way as FormAuthenticate. * * @package Cake.Controller.Component.Auth diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php index e025fc8da..71f997dc1 100644 --- a/lib/Cake/Log/CakeLog.php +++ b/lib/Cake/Log/CakeLog.php @@ -56,7 +56,7 @@ App::uses('LogEngineCollection', 'Log'); * }}} * * If you require custom logging levels, you can use CakeLog::levels() to - * append additoinal logging levels. + * append additional logging levels. * * ### Logging scopes * @@ -301,7 +301,7 @@ class CakeLog { } /** - * Checks wether $streamName is enabled + * Checks whether $streamName is enabled * * @param string $streamName to check * @return bool diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 4096e8999..afcc8d8e6 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -219,7 +219,7 @@ class TranslateBehavior extends ModelBehavior { * @param string $field The field name being joined. * @param string $aliasField The aliased field name being joined. * @param string|array $locale The locale(s) having joins added. - * @return array The modfied query + * @return array The modified query */ protected function _addJoin(Model $Model, $query, $field, $aliasField, $locale) { $db = ConnectionManager::getDataSource($Model->useDbConfig); diff --git a/lib/Cake/Model/Datasource/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php index 1d4700136..a79f4d897 100644 --- a/lib/Cake/Model/Datasource/CakeSession.php +++ b/lib/Cake/Model/Datasource/CakeSession.php @@ -428,7 +428,7 @@ class CakeSession { } /** - * Clears the session, the session id, and renew's the session. + * Clears the session, the session id, and renews the session. * * @return void */ diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index 747ad8b85..d8905a5a0 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -310,8 +310,8 @@ class Postgres extends DboSource { * for resetting sequences after using insertMulti(). * * @param string $table The name of the table to update. - * @param string $column The column to use when reseting the sequence value, the - * sequence name will be fetched using Postgres::getSequence(); + * @param string $column The column to use when resetting the sequence value, + * the sequence name will be fetched using Postgres::getSequence(); * @return boolean success. */ public function resetSequence($table, $column) { diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index bd81ee4a0..92f133674 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -21,11 +21,11 @@ App::uses('DboSource', 'Model/Datasource'); /** - * Dbo layer for Mircosoft's offical SQLServer driver + * Dbo layer for Microsoft's official SQLServer driver * * A Dbo layer for MS SQL Server 2005 and higher. Requires the * `pdo_sqlsrv` extension to be enabled. - * + * * @link http://www.php.net/manual/en/ref.pdo-sqlsrv.php * * @package Cake.Model.Datasource.Database diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index 10c0fbb44..48282118d 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -2942,7 +2942,7 @@ class DboSource extends DataSource { * This method should be implemented by datasources that require sequences to be used. * * @param string $table The name of the table to update. - * @param string $column The column to use when reseting the sequence value. + * @param string $column The column to use when resetting the sequence value. * @return boolean|void success. */ public function resetSequence($table, $column) { diff --git a/lib/Cake/Model/ModelValidator.php b/lib/Cake/Model/ModelValidator.php index 25097adcc..61ab2a0a4 100644 --- a/lib/Cake/Model/ModelValidator.php +++ b/lib/Cake/Model/ModelValidator.php @@ -49,7 +49,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { protected $_model = array(); /** - * The validators $validate property, used for checking wheter validation + * The validators $validate property, used for checking whether validation * rules definition changed in the model and should be refreshed in this class * * @var array @@ -463,7 +463,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { } /** - * Returns wheter a rule set is defined for a field or not + * Returns whether a rule set is defined for a field or not * * @param string $field name of the field to check * @return boolean @@ -502,7 +502,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { } /** - * Unsets the rulset for a field + * Unsets the rule set for a field * * @param string $field name of the field to unset * @return void @@ -533,7 +533,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { } /** - * Adds a new rule to a field's rule set. If second argumet is an array or instance of + * Adds a new rule to a field's rule set. If second argument is an array or instance of * CakeValidationSet then rules list for the field will be replaced with second argument and * third argument will be ignored. * @@ -550,7 +550,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { * )); * }}} * - * @param string $field The name of the field from wich the rule will be removed + * @param string $field The name of the field from which the rule will be removed * @param string|array|CakeValidationSet $name name of the rule to be added or list of rules for the field * @param array|CakeValidationRule $rule or list of rules to be added to the field's rule set * @return ModelValidator this instance @@ -590,7 +590,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable { * ->remove('user_id') * }}} * - * @param string $field The name of the field from wich the rule will be removed + * @param string $field The name of the field from which the rule will be removed * @param string $rule the name of the rule to be removed * @return ModelValidator this instance */ diff --git a/lib/Cake/Model/Validator/CakeValidationRule.php b/lib/Cake/Model/Validator/CakeValidationRule.php index eb098fa2b..873741a98 100644 --- a/lib/Cake/Model/Validator/CakeValidationRule.php +++ b/lib/Cake/Model/Validator/CakeValidationRule.php @@ -202,7 +202,7 @@ class CakeValidationRule { } /** - * Returns whethere this rule should break validation process for associated field + * Returns whether this rule should break validation process for associated field * after it fails * * @return boolean @@ -242,7 +242,7 @@ class CakeValidationRule { /** * Sets the recordExists configuration value for this rule, - * ir refers to wheter the model record it is validating exists + * ir refers to whether the model record it is validating exists * exists in the collection or not (create or update operation) * * If called with no parameters it will return whether this rule @@ -289,7 +289,7 @@ class CakeValidationRule { } /** - * Resets interal state for this rule, by default it will become valid + * Resets internal state for this rule, by default it will become valid * and it will set isUpdate() to false * * @return void diff --git a/lib/Cake/Model/Validator/CakeValidationSet.php b/lib/Cake/Model/Validator/CakeValidationSet.php index f1090505b..34022fa8f 100644 --- a/lib/Cake/Model/Validator/CakeValidationSet.php +++ b/lib/Cake/Model/Validator/CakeValidationSet.php @@ -149,7 +149,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable { } /** - * Resets interal state for all validation rules in this set + * Resets internal state for all validation rules in this set * * @return void */ @@ -235,7 +235,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable { * }}} * * @param array $rules The rules to be set - * @param bolean $mergeVars [optional] If true, merges vars instead of replace. Defaults to true. + * @param boolean $mergeVars [optional] If true, merges vars instead of replace. Defaults to true. * @return ModelField */ public function setRules($rules = array(), $mergeVars = true) { @@ -307,7 +307,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable { } /** - * Returns wheter an index exists in the rule set + * Returns whether an index exists in the rule set * * @param string $index name of the rule * @return boolean diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index d54069713..281865ee3 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -852,9 +852,9 @@ class CakeResponse { /** * Sets the Cache-Control must-revalidate directive. * must-revalidate indicates that the response should not be served - * stale by a cache under any cirumstance without first revalidating + * stale by a cache under any circumstance without first revalidating * with the origin. - * If called with no parameters, this function will return wheter must-revalidate is present. + * If called with no parameters, this function will return whether must-revalidate is present. * * @param integer $seconds if null, the method will return the current * must-revalidate value @@ -967,7 +967,7 @@ class CakeResponse { * value is returned * * @param string|array $cacheVariances a single Vary string or a array - * containig the list for variances. + * containing the list for variances. * @return array */ public function vary($cacheVariances = null) { @@ -983,13 +983,13 @@ class CakeResponse { /** * Sets the response Etag, Etags are a strong indicative that a response - * can be cached by a HTTP client. A bad way of generaing Etags is + * can be cached by a HTTP client. A bad way of generating Etags is * creating a hash of the response output, instead generate a unique * hash of the unique components that identifies a request, such as a * modification time, a resource Id, and anything else you consider it * makes it unique. * - * Second parameter is used to instuct clients that the content has + * Second parameter is used to instruct clients that the content has * changed, but sematicallly, it can be used as the same thing. Think * for instance of a page with a hit counter, two different page views * are equivalent, but they differ by a few bytes. This leaves off to @@ -997,9 +997,9 @@ class CakeResponse { * * If no parameters are passed, current Etag header is returned. * - * @param string $hash the unique has that identifies this resposnse + * @param string $hash the unique has that identifies this response * @param boolean $weak whether the response is semantically the same as - * other with th same hash or not + * other with the same hash or not * @return string */ public function etag($tag = null, $weak = false) { diff --git a/lib/Cake/Network/CakeSocket.php b/lib/Cake/Network/CakeSocket.php index 808523a5c..0c9c088a1 100644 --- a/lib/Cake/Network/CakeSocket.php +++ b/lib/Cake/Network/CakeSocket.php @@ -194,7 +194,7 @@ class CakeSocket { /** * Get the connection context. * - * @return null|array Null when there is no connnection, an array when there is. + * @return null|array Null when there is no connection, an array when there is. */ public function context() { if (!$this->connection) { diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php index 7e482115b..33073ae09 100644 --- a/lib/Cake/Routing/Dispatcher.php +++ b/lib/Cake/Routing/Dispatcher.php @@ -61,7 +61,7 @@ class Dispatcher implements CakeEventListener { /** * Returns the CakeEventManager instance or creates one if none was - * creted. Attaches the default listeners and filters + * created. Attaches the default listeners and filters * * @return CakeEventManager */ @@ -75,7 +75,7 @@ class Dispatcher implements CakeEventListener { } /** - * Returns the list of events this object listents to. + * Returns the list of events this object listens to. * * @return array */ @@ -177,7 +177,7 @@ class Dispatcher implements CakeEventListener { * @param Controller $controller Controller to invoke * @param CakeRequest $request The request object to invoke the controller for. * @param CakeResponse $response The response object to receive the output - * @return CakeResponse te resulting response object + * @return CakeResponse the resulting response object */ protected function _invoke(Controller $controller, CakeRequest $request, CakeResponse $response) { $controller->constructClasses(); diff --git a/lib/Cake/Routing/DispatcherFilter.php b/lib/Cake/Routing/DispatcherFilter.php index c7eacbf0e..7d81f3a77 100644 --- a/lib/Cake/Routing/DispatcherFilter.php +++ b/lib/Cake/Routing/DispatcherFilter.php @@ -52,7 +52,7 @@ abstract class DispatcherFilter implements CakeEventListener { } /** - * Method called before the controller is instantiated and called to ser a request. + * Method called before the controller is instantiated and called to serve a request. * If used with default priority, it will be called after the Router has parsed the * url and set the routing params into the request object. * @@ -61,7 +61,7 @@ abstract class DispatcherFilter implements CakeEventListener { * not calling the after event in the dispatcher. * * If false is returned, the event will be stopped and no more listeners will be notified. - * Alternatively you can call `$event->stopPropagation()` to acheive the same result. + * Alternatively you can call `$event->stopPropagation()` to achieve the same result. * * @param CakeEvent $event container object having the `request`, `response` and `additionalParams` * keys in the data property. @@ -72,11 +72,11 @@ abstract class DispatcherFilter implements CakeEventListener { /** * Method called after the controller served a request and generated a response. - * It is posible to alter the response object at this point as it is not sent to the + * It is possible to alter the response object at this point as it is not sent to the * client yet. * * If false is returned, the event will be stopped and no more listeners will be notified. - * Alternatively you can call `$event->stopPropagation()` to acheive the same result. + * Alternatively you can call `$event->stopPropagation()` to achieve the same result. * * @param CakeEvent $event container object having the `request` and `response` * keys in the data property. diff --git a/lib/Cake/Routing/Filter/CacheDispatcher.php b/lib/Cake/Routing/Filter/CacheDispatcher.php index 7c27d39d4..47ce1daa3 100644 --- a/lib/Cake/Routing/Filter/CacheDispatcher.php +++ b/lib/Cake/Routing/Filter/CacheDispatcher.php @@ -16,7 +16,7 @@ App::uses('DispatcherFilter', 'Routing'); /** - * This filter will check wheter the response was previously cached in the file system + * This filter will check whether the response was previously cached in the file system * and served it back to the client if appropriate. * * @package Cake.Routing.Filter diff --git a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php index 7cff52061..6311c9a1c 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php @@ -102,7 +102,7 @@ class DbConfigTaskTest extends CakeTestCase { $this->Task->expects($this->once())->method('_stop'); $this->Task->expects($this->at(0))->method('in')->will($this->returnValue('default')); //name $this->Task->expects($this->at(1))->method('in')->will($this->returnValue('mysql')); //db type - $this->Task->expects($this->at(2))->method('in')->will($this->returnValue('n')); //persistant + $this->Task->expects($this->at(2))->method('in')->will($this->returnValue('n')); //persistent $this->Task->expects($this->at(3))->method('in')->will($this->returnValue('localhost')); //server $this->Task->expects($this->at(4))->method('in')->will($this->returnValue('n')); //port $this->Task->expects($this->at(5))->method('in')->will($this->returnValue('root')); //user diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php index 25f175bba..0ec681fc3 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php @@ -190,7 +190,7 @@ class ModelTaskTest extends CakeTestCase { } /** - * test gettting a custom table name. + * test getting a custom table name. * * @return void */ @@ -959,7 +959,7 @@ STRINGEND; } /** - * test that odd tablenames arent inflected back from modelname + * test that odd tablenames aren't inflected back from modelname * * @return void */ @@ -1014,7 +1014,7 @@ STRINGEND; } /** - * test that odd tablenames arent inflected back from modelname + * test that odd tablenames aren't inflected back from modelname * * @return void */ diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php index d8495b4b6..71b4c6642 100644 --- a/lib/Cake/Utility/Hash.php +++ b/lib/Cake/Utility/Hash.php @@ -372,7 +372,7 @@ class Hash { } /** - * Returns a formated series of values extracted from `$data`, using + * Returns a formatted series of values extracted from `$data`, using * `$format` as the format and `$paths` as the values to extract. * * Usage: @@ -629,7 +629,7 @@ class Hash { * Counts the dimensions of an array. * Only considers the dimension of the first element in the array. * - * If you have an un-even or hetrogenous array, consider using Hash::maxDimensions() + * If you have an un-even or heterogenous array, consider using Hash::maxDimensions() * to get the dimensions of the array. * * @param array $array Array to count dimensions on @@ -807,7 +807,7 @@ class Hash { /** * Helper method for sort() - * Sqaushes an array to a single hash so it can be sorted. + * Squashes an array to a single hash so it can be sorted. * * @param array $data The data to squash. * @param string $key The key for the data. diff --git a/lib/Cake/Utility/Sanitize.php b/lib/Cake/Utility/Sanitize.php index d49e23af9..3dd764b17 100644 --- a/lib/Cake/Utility/Sanitize.php +++ b/lib/Cake/Utility/Sanitize.php @@ -91,7 +91,7 @@ class Sanitize { * - remove (boolean) if true strips all HTML tags before encoding * - charset (string) the charset used to encode the string * - quotes (int) see http://php.net/manual/en/function.htmlentities.php - * - double (boolean) doube encode html entities + * - double (boolean) double encode html entities * * @param string $string String from where to strip tags * @param array $options Array of options to use. diff --git a/lib/Cake/Utility/Security.php b/lib/Cake/Utility/Security.php index 167ac0e9b..390819f93 100644 --- a/lib/Cake/Utility/Security.php +++ b/lib/Cake/Utility/Security.php @@ -205,7 +205,7 @@ class Security { * @param string $text Encrypted string to decrypt, normal string to encrypt * @param string $key Key to use as the encryption key for encrypted data. * @param string $operation Operation to perform, encrypt or decrypt - * @return string Encrypted/Descrypted string + * @return string Encrypted/Decrypted string */ public static function rijndael($text, $key, $operation) { if (empty($key)) { diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index f505e3e50..a5b542b90 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -356,7 +356,7 @@ class String { * * - `format` The piece of html with that the phrase will be highlighted * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted - * - `regex` a custom regex rule that is ued to match words, default is '|$tag|iu' + * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu' * * @param string $text Text to search the phrase in * @param string $phrase The phrase that will be searched diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index 744f1d489..ab24d08be 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -111,7 +111,7 @@ class Validation { } /** - * Returns true if field is left blank -OR- only whitespace characters are present in it's value + * Returns true if field is left blank -OR- only whitespace characters are present in its value * Whitespace characters include Space, Tab, Carriage Return, Newline * * $check can be passed as an array: diff --git a/lib/Cake/View/Helper/CacheHelper.php b/lib/Cake/View/Helper/CacheHelper.php index f96d002a4..7f55b682d 100644 --- a/lib/Cake/View/Helper/CacheHelper.php +++ b/lib/Cake/View/Helper/CacheHelper.php @@ -108,7 +108,7 @@ class CacheHelper extends AppHelper { * * @param string $file File to cache * @param string $out output to cache - * @return string view ouput + * @return string view output * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/cache.html */ public function cache($file, $out) { diff --git a/lib/Cake/View/HelperCollection.php b/lib/Cake/View/HelperCollection.php index d47e32655..b1c3f246f 100644 --- a/lib/Cake/View/HelperCollection.php +++ b/lib/Cake/View/HelperCollection.php @@ -50,7 +50,7 @@ class HelperCollection extends ObjectCollection implements CakeEventListener { * if any * * @param string $helper The helper name to be loaded - * @return boolean wheter the helper could be loaded or not + * @return boolean whether the helper could be loaded or not * @throws MissingHelperException When a helper could not be found. * App helpers are searched, and then plugin helpers. */ diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index cb917c10c..f3de05497 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -755,7 +755,7 @@ class View extends Object { * update/replace a script element. * @param string $content The content of the script being added, optional. * @return void - * @deprecated Will be removed in 3.0. Supersceeded by blocks functionality. + * @deprecated Will be removed in 3.0. Superseded by blocks functionality. * @see View::start() */ public function addScript($name, $content = null) {