Permalink
Browse files

Fix typos

  • Loading branch information...
1 parent 6d821e8 commit 433dd09ec4b2fdea95e523cca5e5e092a659c647 @ataylor32 ataylor32 committed Mar 5, 2013
Showing with 67 additions and 67 deletions.
  1. +1 −1 app/Config/bootstrap.php
  2. +1 −1 app/Config/core.php
  3. +3 −3 lib/Cake/Cache/CacheEngine.php
  4. +1 −1 lib/Cake/Cache/Engine/ApcEngine.php
  5. +1 −1 lib/Cake/Cache/Engine/FileEngine.php
  6. +1 −1 lib/Cake/Cache/Engine/MemcacheEngine.php
  7. +1 −1 lib/Cake/Cache/Engine/WincacheEngine.php
  8. +1 −1 lib/Cake/Console/Command/Task/ModelTask.php
  9. +1 −1 lib/Cake/Console/Command/Task/ProjectTask.php
  10. +1 −1 lib/Cake/Console/Shell.php
  11. +1 −1 lib/Cake/Console/Templates/skel/Config/bootstrap.php
  12. +1 −1 lib/Cake/Console/Templates/skel/Config/core.php
  13. +1 −1 lib/Cake/Controller/Component/Acl/PhpAcl.php
  14. +1 −1 lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
  15. +2 −2 lib/Cake/Log/CakeLog.php
  16. +1 −1 lib/Cake/Model/Behavior/TranslateBehavior.php
  17. +1 −1 lib/Cake/Model/Datasource/CakeSession.php
  18. +2 −2 lib/Cake/Model/Datasource/Database/Postgres.php
  19. +2 −2 lib/Cake/Model/Datasource/Database/Sqlserver.php
  20. +1 −1 lib/Cake/Model/Datasource/DboSource.php
  21. +6 −6 lib/Cake/Model/ModelValidator.php
  22. +3 −3 lib/Cake/Model/Validator/CakeValidationRule.php
  23. +3 −3 lib/Cake/Model/Validator/CakeValidationSet.php
  24. +7 −7 lib/Cake/Network/CakeResponse.php
  25. +1 −1 lib/Cake/Network/CakeSocket.php
  26. +3 −3 lib/Cake/Routing/Dispatcher.php
  27. +4 −4 lib/Cake/Routing/DispatcherFilter.php
  28. +1 −1 lib/Cake/Routing/Filter/CacheDispatcher.php
  29. +1 −1 lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
  30. +3 −3 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
  31. +3 −3 lib/Cake/Utility/Hash.php
  32. +1 −1 lib/Cake/Utility/Sanitize.php
  33. +1 −1 lib/Cake/Utility/Security.php
  34. +1 −1 lib/Cake/Utility/String.php
  35. +1 −1 lib/Cake/Utility/Validation.php
  36. +1 −1 lib/Cake/View/Helper/CacheHelper.php
  37. +1 −1 lib/Cake/View/HelperCollection.php
  38. +1 −1 lib/Cake/View/View.php
View
@@ -73,7 +73,7 @@
*/
/**
- * 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
View
@@ -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
@@ -30,7 +30,7 @@
/**
* 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 @@ public function init($settings = array()) {
*
* 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 @@ public function gc($expires = null) {
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.
*
@@ -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
*/
@@ -95,7 +95,7 @@ public function init($settings = array()) {
/**
* 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) {
@@ -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
*/
@@ -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
*/
@@ -568,7 +568,7 @@ public function findBelongsTo(Model $model, $associations) {
}
/**
- * 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
@@ -313,7 +313,7 @@ public function cachePrefix($dir) {
* 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) {
@@ -825,7 +825,7 @@ protected function _pluginPath($pluginName) {
* 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) {
@@ -73,7 +73,7 @@
*/
/**
- * 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
@@ -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
@@ -321,7 +321,7 @@ public function resolve($aco) {
return array_map('strtolower', $aco);
}
- // strip multiple occurences of '/'
+ // strip multiple occurrences of '/'
$aco = preg_replace('#/+#', '/', $aco);
// make case insensitive
$aco = ltrim(strtolower($aco), '/');
@@ -31,7 +31,7 @@
* 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
View
@@ -56,7 +56,7 @@
* }}}
*
* 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 @@ public static function drop($streamName) {
}
/**
- * Checks wether $streamName is enabled
+ * Checks whether $streamName is enabled
*
* @param string $streamName to check
* @return bool
@@ -219,7 +219,7 @@ protected function _checkConditions(Model $Model, $query) {
* @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);
@@ -428,7 +428,7 @@ public static function destroy() {
}
/**
- * Clears the session, the session id, and renew's the session.
+ * Clears the session, the session id, and renews the session.
*
* @return void
*/
@@ -310,8 +310,8 @@ public function getSequence($table, $field = 'id') {
* 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) {
@@ -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
@@ -2942,7 +2942,7 @@ public function insertMulti($table, $fields, $values) {
* 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) {
@@ -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 @@ protected function _triggerBeforeValidate($options = array()) {
}
/**
- * 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 @@ public function offsetSet($field, $rules) {
}
/**
- * 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 @@ public function count() {
}
/**
- * 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 @@ public function count() {
* ));
* }}}
*
- * @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 @@ public function add($field, $name, $rule = null) {
* ->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
*/
@@ -202,7 +202,7 @@ public function skip() {
}
/**
- * 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 @@ protected function _getPropertiesArray() {
/**
* 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 @@ public function process($field, &$data, &$methods) {
}
/**
- * 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
@@ -149,7 +149,7 @@ public function validate($data, $isUpdate = false) {
}
/**
- * 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 @@ public function removeRule($name) {
* }}}
*
* @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 @@ protected function _translateArgs($args) {
}
/**
- * 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
@@ -852,9 +852,9 @@ public function maxAge($seconds = null) {
/**
* 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 @@ public function notModified() {
* 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,23 +983,23 @@ public function vary($cacheVariances = null) {
/**
* 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
* the Client the decision of using or not the cached page.
*
* 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) {
@@ -194,7 +194,7 @@ protected function _connectionErrorHandler($code, $message) {
/**
* 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) {
Oops, something went wrong.

0 comments on commit 433dd09

Please sign in to comment.