Skip to content

Commit

Permalink
Fix numerous typos
Browse files Browse the repository at this point in the history
  • Loading branch information
Cory Thompson committed Jan 22, 2017
1 parent 783cfd1 commit 902c991
Show file tree
Hide file tree
Showing 84 changed files with 166 additions and 166 deletions.
2 changes: 1 addition & 1 deletion src/Database/Connection.php
Expand Up @@ -662,7 +662,7 @@ public function quoteIdentifier($identifier)
*
* Changing this setting will not modify existing schema collections objects.
*
* @param bool|string $cache Either boolean false to disable meta dataing caching, or
* @param bool|string $cache Either boolean false to disable metadata caching, or
* true to use `_cake_model_` or the name of the cache config to use.
* @return void
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Database/Statement/StatementDecorator.php
Expand Up @@ -279,14 +279,14 @@ public function bind($params, $types)
return;
}

$annonymousParams = is_int(key($params)) ? true : false;
$anonymousParams = is_int(key($params)) ? true : false;
$offset = 1;
foreach ($params as $index => $value) {
$type = null;
if (isset($types[$index])) {
$type = $types[$index];
}
if ($annonymousParams) {
if ($anonymousParams) {
$index += $offset;
}
$this->bindValue($index, $value, $type);
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/DecimalType.php
Expand Up @@ -164,7 +164,7 @@ public function useLocaleParser($enable = true)
}

/**
* Converts a string into a float point after parseing it using the locale
* Converts a string into a float point after parsing it using the locale
* aware parser.
*
* @param string $value The value to parse and convert to an float.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/FloatType.php
Expand Up @@ -159,7 +159,7 @@ public function useLocaleParser($enable = true)
}

/**
* Converts a string into a float point after parseing it using the locale
* Converts a string into a float point after parsing it using the locale
* aware parser.
*
* @param string $value The value to parse and convert to an float.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/StringType.php
Expand Up @@ -101,7 +101,7 @@ public function marshal($value)
/**
* {@inheritDoc}
*
* @return boolean False as databse results are returned already as strings
* @return boolean False as database results are returned already as strings
*/
public function requiresToPhpCast()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Event/Decorator/ConditionDecorator.php
Expand Up @@ -57,7 +57,7 @@ public function canTrigger(Event $event)
* Evaluates the filter conditions
*
* @param string $condition Condition type
* @param \Cake\Event\Event $event Event objekt
* @param \Cake\Event\Event $event Event object
* @return bool
*/
protected function _evaluateCondition($condition, Event $event)
Expand Down
2 changes: 1 addition & 1 deletion src/Http/CallbackStream.php
Expand Up @@ -25,7 +25,7 @@
*
* Ideally we can amend/update diactoros, but we need to figure
* that out with the diactoros project. Until then we'll use this shim
* to provide backwards compatiblity with existing CakePHP apps.
* to provide backwards compatibility with existing CakePHP apps.
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Http/ResponseEmitter.php
Expand Up @@ -130,7 +130,7 @@ protected function emitBodyRange(array $range, ResponseInterface $response, $max
* Emit the status line.
*
* Emits the status line using the protocol version and status code from
* the response; if a reason phrase is availble, it, too, is emitted.
* the response; if a reason phrase is available, it, too, is emitted.
*
* @param \Psr\Http\Message\ResponseInterface $response The response to emit
* @return void
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Http/Adapter/Stream.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Adapter\Stream', 'Cake\Network\Http\Adapter\Stream');
2 changes: 1 addition & 1 deletion src/Network/Http/Auth/Basic.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Auth\Basic', 'Cake\Network\Http\Auth\Basic');
2 changes: 1 addition & 1 deletion src/Network/Http/Auth/Digest.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Auth\Digest', 'Cake\Network\Http\Auth\Digest');
2 changes: 1 addition & 1 deletion src/Network/Http/Auth/Oauth.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Auth\Oauth', 'Cake\Network\Http\Auth\Oauth');
2 changes: 1 addition & 1 deletion src/Network/Http/Client.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client', 'Cake\Network\Http\Client');
2 changes: 1 addition & 1 deletion src/Network/Http/CookieCollection.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\CookieCollection', 'Cake\Network\Http\CookieCollection');
2 changes: 1 addition & 1 deletion src/Network/Http/FormData.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\FormData', 'Cake\Network\Http\FormData');
2 changes: 1 addition & 1 deletion src/Network/Http/Message.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Message', 'Cake\Network\Http\Message');
2 changes: 1 addition & 1 deletion src/Network/Http/Request.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Request', 'Cake\Network\Http\Request');
2 changes: 1 addition & 1 deletion src/Network/Http/Response.php
@@ -1,3 +1,3 @@
<?php
// @deprecated Backwards compatibility with earler 3.x versions.
// @deprecated Backwards compatibility with earlier 3.x versions.
class_alias('Cake\Http\Client\Response', 'Cake\Network\Http\Response');
2 changes: 1 addition & 1 deletion src/ORM/Association.php
Expand Up @@ -634,7 +634,7 @@ protected function _appendNotMatching($query, $options)
* @param bool $joined Whether or not the row is a result of a direct join
* with this association
* @param string $targetProperty The property name in the source results where the association
* data shuld be nested in. Will use the default one if not provided.
* data should be nested in. Will use the default one if not provided.
* @return array
*/
public function transformRow($row, $nestKey, $joined, $targetProperty = null)
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Association/BelongsToMany.php
Expand Up @@ -903,7 +903,7 @@ protected function junctionConditions()
$matching[$field] = $value;
}
// Assume that operators contain junction conditions.
// Trying to munge complex conditions could result in incorrect queries.
// Trying to manage complex conditions could result in incorrect queries.
if ($isString && in_array(strtoupper($field), ['OR', 'NOT', 'AND', 'XOR'])) {
$matching[$field] = $value;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Behavior/TimestampBehavior.php
Expand Up @@ -82,7 +82,7 @@ public function initialize(array $config)
*
* @param \Cake\Event\Event $event Event instance.
* @param \Cake\Datasource\EntityInterface $entity Entity instance.
* @throws \UnexpectedValueException if a field's when value is misdefined
* @throws \UnexpectedValueException if a field's value is incorrectly defined
* @return true (irrespective of the behavior logic, the save will not be prevented)
* @throws \UnexpectedValueException When the value for an event is not 'always', 'new' or 'existing'
*/
Expand Down
6 changes: 3 additions & 3 deletions src/ORM/Behavior/TreeBehavior.php
Expand Up @@ -156,7 +156,7 @@ public function beforeSave(Event $event, EntityInterface $entity)
/**
* After save listener.
*
* Manages updating level of descendents of currently saved entity.
* Manages updating level of descendants of currently saved entity.
*
* @param \Cake\Event\Event $event The afterSave event that was fired
* @param \Cake\Datasource\EntityInterface $entity the entity that is going to be saved
Expand All @@ -172,9 +172,9 @@ public function afterSave(Event $event, EntityInterface $entity)
}

/**
* Set level for descendents.
* Set level for descendants.
*
* @param \Cake\Datasource\EntityInterface $entity The entity whose descendents need to be updated.
* @param \Cake\Datasource\EntityInterface $entity The entity whose descendants need to be updated.
* @return void
*/
protected function _setChildrenLevel($entity)
Expand Down
2 changes: 1 addition & 1 deletion src/Shell/CompletionShell.php
Expand Up @@ -119,7 +119,7 @@ public function getOptionParser()
)->addSubcommand('commands', [
'help' => 'Output a list of available commands',
'parser' => [
'description' => 'List all availables',
'description' => 'List all available',
]
])->addSubcommand('subcommands', [
'help' => 'Output a list of available subcommands',
Expand Down
2 changes: 1 addition & 1 deletion src/TestSuite/EmailAssertTrait.php
Expand Up @@ -46,7 +46,7 @@ public function send($content = null)
/**
* Creates an email instance overriding its transport for testing purposes.
*
* @param bool $new Tells if new instance should forcebly be created.
* @param bool $new Tells if new instance should forcibly be created.
* @return \Cake\Mailer\Email
*/
public function email($new = false)
Expand Down
10 changes: 5 additions & 5 deletions src/TestSuite/IntegrationTestCase.php
Expand Up @@ -146,7 +146,7 @@ abstract class IntegrationTestCase extends TestCase
*
* @var null|string
*/
protected $_cookieEncriptionKey = null;
protected $_cookieEncryptionKey = null;

/**
* Auto-detect if the HTTP middleware stack should be used.
Expand Down Expand Up @@ -296,8 +296,8 @@ public function cookie($name, $value)
*/
protected function _getCookieEncryptionKey()
{
if (isset($this->_cookieEncriptionKey)) {
return $this->_cookieEncriptionKey;
if (isset($this->_cookieEncryptionKey)) {
return $this->_cookieEncryptionKey;
}

return Security::salt();
Expand All @@ -319,7 +319,7 @@ protected function _getCookieEncryptionKey()
*/
public function cookieEncrypted($name, $value, $encrypt = 'aes', $key = null)
{
$this->_cookieEncriptionKey = $key;
$this->_cookieEncryptionKey = $key;
$this->_cookie[$name] = $this->_encrypt($value, $encrypt);
}

Expand Down Expand Up @@ -1022,7 +1022,7 @@ public function assertCookieEncrypted($expected, $name, $encrypt = 'aes', $key =
$this->fail('No response set, cannot assert cookies.');
}
$result = $this->_response->cookie($name);
$this->_cookieEncriptionKey = $key;
$this->_cookieEncryptionKey = $key;
$result['value'] = $this->_decrypt($result['value'], $encrypt);
$this->assertEquals($expected, $result['value'], 'Cookie data differs. ' . $message);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/Xml.php
Expand Up @@ -323,7 +323,7 @@ protected static function _fromArray($dom, $node, &$data, $format)
/**
* Helper to _fromArray(). It will create childs of arrays
*
* @param array $data Array with informations to create childs
* @param array $data Array with information to create childs
* @return void
*/
protected static function _createChild($data)
Expand Down
2 changes: 1 addition & 1 deletion src/View/Form/ContextInterface.php
Expand Up @@ -51,7 +51,7 @@ public function isCreate();
*
* - `default`: Default value to return if no value found in request
* data or context record.
* - `schemaDefault`: Boolen indicating whether default value from
* - `schemaDefault`: Boolean indicating whether default value from
* context's schema should be used if it's not explicitly provided.
*
* @param string $field A dot separated path to the field a value
Expand Down
4 changes: 2 additions & 2 deletions src/View/Form/EntityContext.php
Expand Up @@ -212,7 +212,7 @@ public function isCreate()
* @param array $options Options:
* - `default`: Default value to return if no value found in request
* data or entity.
* - `schemaDefault`: Boolen indicating whether default value from table
* - `schemaDefault`: Boolean indicating whether default value from table
* schema should be used if it's not explicitly provided.
* @return mixed The value of the field or null on a miss.
*/
Expand Down Expand Up @@ -309,7 +309,7 @@ protected function _extractMultiple($values, $path)
* will be returned.
*
* @param array|null $path Each one of the parts in a path for a field name
* or null to get the entity passed in contructor context.
* or null to get the entity passed in constructor context.
* @return \Cake\Datasource\EntityInterface|\Traversable|array|bool
* @throws \RuntimeException When properties cannot be read.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/PaginatorHelper.php
Expand Up @@ -1075,7 +1075,7 @@ public function last($last = 'last >>', array $options = [])
* ### Options:
*
* - `model` The model to use defaults to PaginatorHelper::defaultModel()
* - `block` The block name to append the output to, or false/absenst to return as a string
* - `block` The block name to append the output to, or false/absent to return as a string
*
* @param array $options Array of options
* @return string|null Meta links
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixture/AssertHtmlTestCase.php
Expand Up @@ -4,7 +4,7 @@
use Cake\TestSuite\TestCase;

/**
* This class helps in indirectly testing the functionalities of TestCase::assertHtml
* This class helps in indirectly testing the functionality of TestCase::assertHtml
*/
class AssertHtmlTestCase extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixture/AssertIntegrationTestCase.php
Expand Up @@ -5,7 +5,7 @@
use Cake\TestSuite\IntegrationTestCase;

/**
* This class helps in indirectly testing the functionalities of IntegrationTestCase
* This class helps in indirectly testing the functionality of IntegrationTestCase
*/
class AssertIntegrationTestCase extends IntegrationTestCase
{
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Cache/Engine/ApcEngineTest.php
Expand Up @@ -240,7 +240,7 @@ public function testGroupsReadWrite()
}

/**
* Tests that deleteing from a groups-enabled config is possible
* Tests that deleting from a groups-enabled config is possible
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Cache/Engine/MemcachedEngineTest.php
Expand Up @@ -874,7 +874,7 @@ public function testGroupReadWrite()
}

/**
* Tests that deleteing from a groups-enabled config is possible
* Tests that deleting from a groups-enabled config is possible
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Cache/Engine/RedisEngineTest.php
Expand Up @@ -419,7 +419,7 @@ public function testGroupReadWrite()
}

/**
* Tests that deleteing from a groups-enabled config is possible
* Tests that deleting from a groups-enabled config is possible
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Cache/Engine/WincacheEngineTest.php
Expand Up @@ -236,7 +236,7 @@ public function testGroupsReadWrite()
}

/**
* Tests that deleteing from a groups-enabled config is possible
* Tests that deleting from a groups-enabled config is possible
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Cache/Engine/XcacheEngineTest.php
Expand Up @@ -272,7 +272,7 @@ public function testGroupsReadWrite()
}

/**
* Tests that deleteing from a groups-enabled config is possible
* Tests that deleting from a groups-enabled config is possible
*
* @return void
*/
Expand Down
18 changes: 9 additions & 9 deletions tests/TestCase/Collection/CollectionTest.php
Expand Up @@ -77,7 +77,7 @@ public function testIteratorIsWrapped()
*
* @return void
*/
public function testEeach()
public function testEach()
{
$items = ['a' => 1, 'b' => 2, 'c' => 3];
$collection = new Collection($items);
Expand Down Expand Up @@ -1674,8 +1674,8 @@ public function testUnfoldedExtract()
public function testSerializeSimpleCollection()
{
$collection = new Collection([1, 2, 3]);
$selialized = serialize($collection);
$unserialized = unserialize($selialized);
$serialized = serialize($collection);
$unserialized = unserialize($serialized);
$this->assertEquals($collection->toList(), $unserialized->toList());
$this->assertEquals($collection->toArray(), $unserialized->toArray());
}
Expand All @@ -1689,8 +1689,8 @@ public function testSerializeWithAppendIterators()
{
$collection = new Collection([1, 2, 3]);
$collection = $collection->append(['a' => 4, 'b' => 5, 'c' => 6]);
$selialized = serialize($collection);
$unserialized = unserialize($selialized);
$serialized = serialize($collection);
$unserialized = unserialize($serialized);
$this->assertEquals($collection->toList(), $unserialized->toList());
$this->assertEquals($collection->toArray(), $unserialized->toArray());
}
Expand All @@ -1711,8 +1711,8 @@ public function testSerializeWithNestedIterators()
return $e % 2;
});

$selialized = serialize($collection);
$unserialized = unserialize($selialized);
$serialized = serialize($collection);
$unserialized = unserialize($serialized);
$this->assertEquals($collection->toList(), $unserialized->toList());
$this->assertEquals($collection->toArray(), $unserialized->toArray());
}
Expand All @@ -1726,8 +1726,8 @@ public function testSerializeWithZipIterator()
{
$collection = new Collection([4, 5]);
$collection = $collection->zip([1, 2]);
$selialized = serialize($collection);
$unserialized = unserialize($selialized);
$serialized = serialize($collection);
$unserialized = unserialize($serialized);
$this->assertEquals($collection->toList(), $unserialized->toList());
}

Expand Down

0 comments on commit 902c991

Please sign in to comment.