Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ataylor32 committed Jan 17, 2015
1 parent 73ad725 commit 9368c62
Show file tree
Hide file tree
Showing 51 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion src/Auth/DigestAuthenticate.php
Expand Up @@ -54,7 +54,7 @@
* `$digestPass = DigestAuthenticate::password($username, env('SERVER_NAME'), $password);`
*
* If you wish to use digest authentication alongside other authentication methods,
* its recommended that you store the digest authentication separately. For
* it's recommended that you store the digest authentication separately. For
* example `User.digest_pass` could be used for a digest password, while
* `User.password` would store the password hash for use with other methods like
* Basic or Form.
Expand Down
4 changes: 2 additions & 2 deletions src/Cache/CacheEngine.php
Expand Up @@ -26,8 +26,8 @@ abstract class CacheEngine
use InstanceConfigTrait;

/**
* The default cache configuration is overriden in most cache adapters. These are
* the keys that are common to all adapters. If overriden, this property is not used.
* The default cache configuration is overridden in most cache adapters. These are
* the keys that are common to all adapters. If overridden, this property is not used.
*
* - `duration` Specify how long items in this cache configuration last.
* - `groups` List of groups or 'tags' associated to every key stored in this config.
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/FileEngine.php
Expand Up @@ -39,7 +39,7 @@ class FileEngine extends CacheEngine
protected $_File = null;

/**
* The default config used unless overriden by runtime configuration
* The default config used unless overridden by runtime configuration
*
* - `duration` Specify how long items in this cache configuration last.
* - `groups` List of groups or 'tags' associated to every key stored in this config.
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/MemcachedEngine.php
Expand Up @@ -40,7 +40,7 @@ class MemcachedEngine extends CacheEngine
protected $_Memcached = null;

/**
* The default config used unless overriden by runtime configuration
* The default config used unless overridden by runtime configuration
*
* - `compress` Whether to compress data
* - `duration` Specify how long items in this cache configuration last.
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/RedisEngine.php
Expand Up @@ -32,7 +32,7 @@ class RedisEngine extends CacheEngine
protected $_Redis = null;

/**
* The default config used unless overriden by runtime configuration
* The default config used unless overridden by runtime configuration
*
* - `database` database number to use for connection.
* - `duration` Specify how long items in this cache configuration last.
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/XcacheEngine.php
Expand Up @@ -25,7 +25,7 @@ class XcacheEngine extends CacheEngine
{

/**
* The default config used unless overriden by runtime configuration
* The default config used unless overridden by runtime configuration
*
* - `duration` Specify how long items in this cache configuration last.
* - `groups` List of groups or 'tags' associated to every key stored in this config.
Expand Down
2 changes: 1 addition & 1 deletion src/Collection/CollectionInterface.php
Expand Up @@ -309,7 +309,7 @@ public function sortBy($callback, $dir = SORT_DESC, $type = SORT_NUMERIC);

/**
* Splits a collection into sets, grouped by the result of running each value
* through the callback. If $callback is is a string instead of a callable,
* through the callback. If $callback is a string instead of a callable,
* groups by the property named by $callback on each of the values.
*
* When $callback is a string it should be a property name to extract or
Expand Down
2 changes: 1 addition & 1 deletion src/Console/ConsoleOptionParser.php
Expand Up @@ -323,7 +323,7 @@ public function epilog($text = null)
* - `default` - The default value for this option. Defaults are added into the parsed params when the
* attached option is not provided or has no value. Using default and boolean together will not work.
* are added into the parsed parameters when the option is undefined. Defaults to null.
* - `boolean` - The option uses no value, its just a boolean switch. Defaults to false.
* - `boolean` - The option uses no value, it's just a boolean switch. Defaults to false.
* If an option is defined as boolean, it will always be added to the parsed params. If no present
* it will be false, if present it will be true.
* - `choices` A list of valid choices for this option. If left empty all values are valid..
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Component/AuthComponent.php
Expand Up @@ -317,10 +317,10 @@ protected function _isAllowed(Controller $controller)
}

/**
* Handles unauthenticated access attempt. First the `unathenticated()` method
* Handles unauthenticated access attempt. First the `unauthenticated()` method
* of the last authenticator in the chain will be called. The authenticator can
* handle sending response or redirection as appropriate and return `true` to
* indicate no furthur action is necessary. If authenticator returns null this
* indicate no further action is necessary. If authenticator returns null this
* method redirects user to login action. If it's an ajax request and config
* `ajaxLogin` is specified that element is rendered else a 403 http status code
* is returned.
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Component/PaginatorComponent.php
Expand Up @@ -355,7 +355,7 @@ public function validateSort(Table $object, array $options)
}

/**
* Check the limit parameter and ensure its within the maxLimit bounds.
* Check the limit parameter and ensure it's within the maxLimit bounds.
*
* @param array $options An array of options with a limit key to be checked.
* @return array An array of options for pagination
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Component/RequestHandlerComponent.php
Expand Up @@ -218,7 +218,7 @@ protected function _setExtension($request, $response)
* `controller/action` is requested with `Accept-Type: application/xml` in the headers
* the view path will become `app/View/Controller/xml/action.ctp`. Layout and template
* types will only switch to mime-types recognized by Cake\Network\Response. If you need to declare
* additional mime-types, you can do so using Cake\Network\Response::type() in your controllers beforeFilter()
* additional mime-types, you can do so using Cake\Network\Response::type() in your controller's beforeFilter()
* method.
* - If a helper with the same name as the extension exists, it is added to the controller.
* - If the extension is of a type that RequestHandler understands, it will set that
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Controller.php
Expand Up @@ -359,7 +359,7 @@ public function __get($name)
* - $this->request - To the $request parameter
* - $this->plugin - To the $request->params['plugin']
* - $this->autoRender - To false if $request->params['return'] == 1
* - $this->passedArgs - The the combined results of params['named'] and params['pass]
* - $this->passedArgs - The combined results of params['named'] and params['pass]
* - View::$passedArgs - $this->passedArgs
* - View::$plugin - $this->plugin
* - View::$view - To the $request->params['action']
Expand Down Expand Up @@ -420,7 +420,7 @@ protected function _mergeControllerVars()
}

/**
* Returns a list of all events that will fire in the controller during it's lifecycle.
* Returns a list of all events that will fire in the controller during its lifecycle.
* You can override this function to add you own listener callbacks
*
* @return array
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/ErrorController.php
Expand Up @@ -28,7 +28,7 @@ class ErrorController extends Controller
* Constructor
*
* @param \Cake\Network\Request|null $request Request instance.
* @param \Cake\Network\Response|null $response Reponse instance.
* @param \Cake\Network\Response|null $response Response instance.
*/
public function __construct($request = null, $response = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Expression/CaseExpression.php
Expand Up @@ -52,7 +52,7 @@ class CaseExpression implements ExpressionInterface
* Constructs the case expression
*
* @param array|ExpressionInterface $conditions The conditions to test. Must be a ExpressionInterface
* instance,or an array of ExpressionInterface instances.
* instance, or an array of ExpressionInterface instances.
* @param array|ExpressionInterface $values associative array of values to be associated with the conditions
* passed in $conditions. If there are more $values than $conditions, the last $value is used as the `ELSE` value
* @param array $types associative array of types to be associated with the values
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Expression/QueryExpression.php
Expand Up @@ -285,7 +285,7 @@ public function in($field, $values, $type = null)
* Adds a new case expression to the expression object
*
* @param array|ExpressionInterface $conditions The conditions to test. Must be a ExpressionInterface
* instance,or an array of ExpressionInterface instances.
* instance, or an array of ExpressionInterface instances.
* @param array|ExpressionInterface $values associative array of values to be associated with the conditions
* passed in $conditions. If there are more $values than $conditions, the last $value is used as the `ELSE` value
* @param array $types associative array of types to be associated with the values
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Query.php
Expand Up @@ -26,7 +26,7 @@
* This class represents a Relational database SQL Query. A query can be of
* different types like select, update, insert and delete. Exposes the methods
* for dynamically constructing each query part, execute it and transform it
* to a specific SQL disalect.
* to a specific SQL dialect.
*/
class Query implements ExpressionInterface, IteratorAggregate
{
Expand Down Expand Up @@ -220,7 +220,7 @@ public function sql(ValueBinder $generator = null)
* ```
*
* @param callable $visitor a function or callable to be executed for each part
* @param array $parts the query clasuses to traverse
* @param array $parts the query clauses to traverse
* @return $this
*/
public function traverse(callable $visitor, array $parts = [])
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Schema/SqliteSchema.php
Expand Up @@ -374,7 +374,7 @@ public function truncateTableSql(Table $table)
}

/**
* Returns whether there is any table in this connection to SQLite contianing
* Returns whether there is any table in this connection to SQLite containing
* sequences
*
* @return void
Expand Down
2 changes: 1 addition & 1 deletion src/Datasource/EntityInterface.php
Expand Up @@ -161,7 +161,7 @@ public function isNew($new = null);
*
* @param string|array $field The field to get errors for.
* @param string|array|null $errors The errors to be set for $field
* @param bool $overwrite Whether or not to overwite pre-existing errors for $field
* @param bool $overwrite Whether or not to overwrite pre-existing errors for $field
* @return array|\Cake\Datasource\EntityInterface
*/
public function errors($field = null, $errors = null, $overwrite = false);
Expand Down
2 changes: 1 addition & 1 deletion src/Datasource/EntityTrait.php
Expand Up @@ -637,7 +637,7 @@ public function isNew($new = null)
*
* @param string|array|null $field The field to get errors for, or the array of errors to set.
* @param string|array|null $errors The errors to be set for $field
* @param bool $overwrite Whether or not to overwite pre-existing errors for $field
* @param bool $overwrite Whether or not to overwrite pre-existing errors for $field
* @return array|$this
*/
public function errors($field = null, $errors = null, $overwrite = false)
Expand Down
2 changes: 1 addition & 1 deletion src/Datasource/RepositoryInterface.php
Expand Up @@ -127,7 +127,7 @@ public function save(EntityInterface $entity, $options = []);
* based on the 'dependent' option used when defining the association.
*
* @param \Cake\Datasource\EntityInterface $entity The entity to remove.
* @param array|\ArrayAccess $options The options fo the delete.
* @param array|\ArrayAccess $options The options for the delete.
* @return bool success
*/
public function delete(EntityInterface $entity, $options = []);
Expand Down
2 changes: 1 addition & 1 deletion src/I18n/Time.php
Expand Up @@ -46,7 +46,7 @@ class Time extends Carbon implements JsonSerializable
/**
* The format to use when formatting a time using `Cake\I18n\Time::nice()`
*
* The format should be eiter the formatting constants from IntlDateFormatter as
* The format should be either the formatting constants from IntlDateFormatter as
* described in (http://www.php.net/manual/en/class.intldateformatter.php) or a pattern
* as specified in (http://www.icu-project.org/apiref/icu4c/classSimpleDateFormat.html#details)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Http/Auth/Oauth.php
Expand Up @@ -142,7 +142,7 @@ protected function _hmacSha1($request, $credentials)
* - Values are sorted by name and then value.
* - Request values are concatenated and urlencoded.
* - The request URL (without querystring) is normalized.
* - The HTTP method, URL and request parameters are concatenated and returnned.
* - The HTTP method, URL and request parameters are concatenated and returned.
*
* @param \Cake\Network\Http\Request $request The request object.
* @param array $oauthValues Oauth values.
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Session/CacheSession.php
Expand Up @@ -41,7 +41,7 @@ class CacheSession implements SessionHandlerInterface
* It requires the key 'config' which is the name of the Cache config to use for
* storing the session
*
* @throws \InvalidArgumentException if the 'config' jey is not provided
* @throws \InvalidArgumentException if the 'config' key is not provided
*/
public function __construct(array $config = [])
{
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Association.php
Expand Up @@ -588,7 +588,7 @@ public function updateAll($fields, $conditions)
* @param mixed $conditions Conditions to be used, accepts anything Query::where()
* can take.
* @return bool Success Returns true if one or more rows are affected.
* @see \Cake\ORM\Table::delteAll()
* @see \Cake\ORM\Table::deleteAll()
*/
public function deleteAll($conditions)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/EagerLoadable.php
Expand Up @@ -86,7 +86,7 @@ class EagerLoadable
protected $_forMatching;

/**
* Constructor. The $config parameted accepts the following array
* Constructor. The $config parameter accepts the following array
* keys:
*
* - associations
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/EagerLoader.php
Expand Up @@ -525,7 +525,7 @@ public function loadExternal($query, $statement)
* - canBeJoined: Whether or not the association will be loaded using a JOIN
* - entityClass: The entity that should be used for hydrating the results
* - nestKey: A dotted path that can be used to correctly insert the data into the results.
* - mathcing: Whether or not it is an association loaded through `matching()`.
* - matching: Whether or not it is an association loaded through `matching()`.
*
* @param \Cake\ORM\Table $table The table containing the association that
* will be normalized
Expand Down
4 changes: 2 additions & 2 deletions src/ORM/RulesChecker.php
Expand Up @@ -23,15 +23,15 @@
* Contains logic for storing and checking rules on entities
*
* RulesCheckers are used by Table classes to ensure that the
* current entity state satifies the application logic and business rules.
* current entity state satisfies the application logic and business rules.
*
* RulesCheckers afford different rules to be applied in the create and update
* scenario.
*
* ### Adding rules
*
* Rules must be callable objects that return true/false depending on whether or
* not the rule has been satisified. You can use RulesChecker::add(), RulesChecker::addCreate(),
* not the rule has been satisfied. You can use RulesChecker::add(), RulesChecker::addCreate(),
* RulesChecker::addUpdate() and RulesChecker::addDelete to add rules to a checker.
*
* ### Running checks
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Table.php
Expand Up @@ -922,7 +922,7 @@ public function findList(Query $query, array $options)
* recursively nested inside the parent row values using the `children` property
*
* You can customize what fields are used for nesting results, by default the
* primary key and the `parent_id` fields are used. If you you wish to change
* primary key and the `parent_id` fields are used. If you wish to change
* these defaults you need to provide the keys `idField` or `parentField` in
* `$options`:
*
Expand Down
2 changes: 1 addition & 1 deletion src/Routing/DispatcherFilter.php
Expand Up @@ -20,7 +20,7 @@
use InvalidArgumentException;

/**
* This abstract class represents a filter to be applied to a dispatcher cycle. It acts as as
* This abstract class represents a filter to be applied to a dispatcher cycle. It acts as an
* event listener with the ability to alter the request or response as needed before it is handled
* by a controller or after the response body has already been built.
*
Expand Down
2 changes: 1 addition & 1 deletion src/Routing/Route/Route.php
Expand Up @@ -465,7 +465,7 @@ public function match(array $url, array $context = [])
// keys that exist in the defaults and have different values is a match failure.
$defaultExists = array_key_exists($key, $defaults);

// If the key is a routed key, its not different yet.
// If the key is a routed key, it's not different yet.
if (array_key_exists($key, $keyNames)) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Validation/Validator.php
Expand Up @@ -375,7 +375,7 @@ public function requirePresence($field, $mode = true, $message = null)
* @param string $field the name of the field
* @param bool|string|callable $when Indicates when the field is allowed to be empty
* Valid values are true (always), 'create', 'update'. If a callable is passed then
* the field will allowed to be empty only when the callaback returns true.
* the field will allowed to be empty only when the callback returns true.
* @return $this
*/
public function allowEmpty($field, $when = true)
Expand Down Expand Up @@ -418,7 +418,7 @@ public function allowEmpty($field, $when = true)
* @param bool|string|callable $when Indicates when the field is not allowed
* to be empty. Valid values are true (always), 'create', 'update'. If a
* callable is passed then the field will allowed be empty only when
* the callaback returns false.
* the callback returns false.
* @return $this
*/
public function notEmpty($field, $message = null, $when = false)
Expand Down
4 changes: 2 additions & 2 deletions src/View/Helper/FormHelper.php
Expand Up @@ -1103,7 +1103,7 @@ protected function _parseOptions($fieldName, $options)
/**
* Returns the input type that was guessed for the provided fieldName,
* based on the internal type it is associated too, its name and the
* variales that can be found in the view template
* variables that can be found in the view template
*
* @param string $fieldName the name of the field to guess a type for
* @param array $options the options passed to the input method
Expand Down Expand Up @@ -1797,7 +1797,7 @@ public function select($fieldName, $options = [], array $attributes = [])
return $this->multiCheckbox($fieldName, $options, $attributes);
}

// Secure the field if there are options, or its a multi select.
// Secure the field if there are options, or it's a multi select.
// Single selects with no options don't submit, but multiselects do.
if (
$attributes['secure'] &&
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/UrlHelper.php
Expand Up @@ -27,7 +27,7 @@ class UrlHelper extends Helper
{

/**
* Returns a URL based on provided provided parameters.
* Returns a URL based on provided parameters.
*
* @param string|array $url Either a relative string url like `/products/view/23` or
* an array of URL parameters. Using an array for URLs will allow you to leverage
Expand Down
2 changes: 1 addition & 1 deletion src/View/ViewVarsTrait.php
Expand Up @@ -125,7 +125,7 @@ public function set($name, $value = null)
}

/**
* Get/Set valid view options in the object's _validViewOptions property. The proptery is
* Get/Set valid view options in the object's _validViewOptions property. The property is
* created as an empty array if it is not set. If called without any parameters it will
* return the current list of valid view options. See `createView()`.
*
Expand Down
4 changes: 2 additions & 2 deletions tests/Fixture/FixturizedTestCase.php
Expand Up @@ -11,7 +11,7 @@ class FixturizedTestCase extends TestCase
{

/**
* Fixtures to use in this thes
* Fixtures to use in this test
* @var array
*/
public $fixtures = ['core.categories'];
Expand Down Expand Up @@ -57,7 +57,7 @@ public function testSkipIfFalse()
}

/**
* test that a fixtures are unoaded even if the test throws exceptions
* test that a fixtures are unloaded even if the test throws exceptions
*
* @return void
* @throws \Exception
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixture/PostsFixture.php
Expand Up @@ -17,7 +17,7 @@
use Cake\TestSuite\Fixture\TestFixture;

/**
* Clas PostFixture
* Class PostFixture
*
*/
class PostsFixture extends TestFixture
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Auth/FormAuthenticateTest.php
Expand Up @@ -34,7 +34,7 @@ class FormAuthenticateTest extends TestCase
{

/**
* Fixtrues
* Fixtures
*
* @var array
*/
Expand Down

0 comments on commit 9368c62

Please sign in to comment.