From 902c9910279eff909295e413d43fc6a5d2dbd7bf Mon Sep 17 00:00:00 2001
From: Cory Thompson <coryjthompson@gmail.com>
Date: Sun, 22 Jan 2017 19:17:31 +1100
Subject: [PATCH] Fix numerous typos

---
 src/Database/Connection.php                    |  2 +-
 src/Database/Statement/StatementDecorator.php  |  4 ++--
 src/Database/Type/DecimalType.php              |  2 +-
 src/Database/Type/FloatType.php                |  2 +-
 src/Database/Type/StringType.php               |  2 +-
 src/Event/Decorator/ConditionDecorator.php     |  2 +-
 src/Http/CallbackStream.php                    |  2 +-
 src/Http/ResponseEmitter.php                   |  2 +-
 src/Network/Http/Adapter/Stream.php            |  2 +-
 src/Network/Http/Auth/Basic.php                |  2 +-
 src/Network/Http/Auth/Digest.php               |  2 +-
 src/Network/Http/Auth/Oauth.php                |  2 +-
 src/Network/Http/Client.php                    |  2 +-
 src/Network/Http/CookieCollection.php          |  2 +-
 src/Network/Http/FormData.php                  |  2 +-
 src/Network/Http/Message.php                   |  2 +-
 src/Network/Http/Request.php                   |  2 +-
 src/Network/Http/Response.php                  |  2 +-
 src/ORM/Association.php                        |  2 +-
 src/ORM/Association/BelongsToMany.php          |  2 +-
 src/ORM/Behavior/TimestampBehavior.php         |  2 +-
 src/ORM/Behavior/TreeBehavior.php              |  6 +++---
 src/Shell/CompletionShell.php                  |  2 +-
 src/TestSuite/EmailAssertTrait.php             |  2 +-
 src/TestSuite/IntegrationTestCase.php          | 10 +++++-----
 src/Utility/Xml.php                            |  2 +-
 src/View/Form/ContextInterface.php             |  2 +-
 src/View/Form/EntityContext.php                |  4 ++--
 src/View/Helper/PaginatorHelper.php            |  2 +-
 tests/Fixture/AssertHtmlTestCase.php           |  2 +-
 tests/Fixture/AssertIntegrationTestCase.php    |  2 +-
 tests/TestCase/Cache/Engine/ApcEngineTest.php  |  2 +-
 .../Cache/Engine/MemcachedEngineTest.php       |  2 +-
 .../TestCase/Cache/Engine/RedisEngineTest.php  |  2 +-
 .../Cache/Engine/WincacheEngineTest.php        |  2 +-
 .../TestCase/Cache/Engine/XcacheEngineTest.php |  2 +-
 tests/TestCase/Collection/CollectionTest.php   | 18 +++++++++---------
 .../Console/ConsoleErrorHandlerTest.php        |  8 ++++----
 .../Component/CookieComponentTest.php          | 14 +++++++-------
 .../Controller/ComponentRegistryTest.php       |  2 +-
 tests/TestCase/Controller/ControllerTest.php   |  2 +-
 .../Core/Configure/Engine/JsonConfigTest.php   |  2 +-
 tests/TestCase/Core/ConfigureTest.php          |  2 +-
 .../TestCase/Core/InstanceConfigTraitTest.php  |  4 ++--
 tests/TestCase/Database/ConnectionTest.php     | 12 ++++++------
 tests/TestCase/Database/Driver/MysqlTest.php   |  6 +++---
 .../TestCase/Database/Driver/PostgresTest.php  |  4 ++--
 .../Expression/TupleComparisonTest.php         |  4 ++--
 .../Database/ExpressionTypeCastingTest.php     |  2 +-
 tests/TestCase/Database/QueryTest.php          |  4 ++--
 .../Statement/StatementDecoratorTest.php       |  2 +-
 .../TestCase/Database/Type/BinaryTypeTest.php  |  2 +-
 tests/TestCase/Database/Type/BoolTypeTest.php  |  4 ++--
 .../TestCase/Database/Type/IntegerTypeTest.php |  2 +-
 tests/TestCase/Datasource/RulesCheckerTest.php |  6 +++---
 tests/TestCase/Error/ExceptionRendererTest.php |  2 +-
 tests/TestCase/Filesystem/FolderTest.php       |  6 +++---
 tests/TestCase/Log/LogTest.php                 |  2 +-
 .../ORM/Association/BelongsToManyTest.php      | 10 +++++-----
 .../TestCase/ORM/Association/BelongsToTest.php |  2 +-
 .../ORM/Behavior/CounterCacheBehaviorTest.php  |  2 +-
 .../TestCase/ORM/Behavior/TreeBehaviorTest.php |  4 ++--
 tests/TestCase/ORM/BindingKeyTest.php          |  2 +-
 tests/TestCase/ORM/CompositeKeysTest.php       | 14 +++++++-------
 tests/TestCase/ORM/EagerLoaderTest.php         |  2 +-
 tests/TestCase/ORM/EntityTest.php              | 16 ++++++++--------
 .../TestCase/ORM/Locator/TableLocatorTest.php  |  2 +-
 tests/TestCase/ORM/QueryRegressionTest.php     |  4 ++--
 tests/TestCase/ORM/QueryTest.php               |  6 +++---
 tests/TestCase/ORM/ResultSetTest.php           |  4 ++--
 .../ORM/RulesCheckerIntegrationTest.php        |  4 ++--
 tests/TestCase/ORM/TableRegistryTest.php       |  2 +-
 tests/TestCase/ORM/TableTest.php               |  2 +-
 tests/TestCase/Shell/CompletionShellTest.php   |  6 +++---
 tests/TestCase/Shell/Task/UnloadTaskTest.php   | 18 +++++++++---------
 .../TestSuite/IntegrationTestCaseTest.php      |  2 +-
 tests/TestCase/Validation/ValidatorTest.php    |  8 ++++----
 tests/TestCase/View/CellTest.php               |  4 ++--
 tests/TestCase/View/Helper/FormHelperTest.php  |  2 +-
 .../View/Helper/PaginatorHelperTest.php        |  2 +-
 tests/TestCase/View/ViewTest.php               |  8 ++++----
 .../View/Widget/WidgetRegistryTest.php         |  4 ++--
 .../Model/Behavior/DuplicateBehavior.php       |  2 +-
 .../TestApp/Template/Posts/extend_self.ctp     |  2 +-
 84 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/src/Database/Connection.php b/src/Database/Connection.php
index 8d26de8b032..2d9cc292dad 100644
--- a/src/Database/Connection.php
+++ b/src/Database/Connection.php
@@ -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
      */
diff --git a/src/Database/Statement/StatementDecorator.php b/src/Database/Statement/StatementDecorator.php
index 2d57e506071..01ead66ae86 100644
--- a/src/Database/Statement/StatementDecorator.php
+++ b/src/Database/Statement/StatementDecorator.php
@@ -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);
diff --git a/src/Database/Type/DecimalType.php b/src/Database/Type/DecimalType.php
index 647915bd2bd..07efdf505e8 100644
--- a/src/Database/Type/DecimalType.php
+++ b/src/Database/Type/DecimalType.php
@@ -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.
diff --git a/src/Database/Type/FloatType.php b/src/Database/Type/FloatType.php
index 4fa4cfca99e..a51b0963429 100644
--- a/src/Database/Type/FloatType.php
+++ b/src/Database/Type/FloatType.php
@@ -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.
diff --git a/src/Database/Type/StringType.php b/src/Database/Type/StringType.php
index 1a9ef882a86..2ece0d68a23 100644
--- a/src/Database/Type/StringType.php
+++ b/src/Database/Type/StringType.php
@@ -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()
     {
diff --git a/src/Event/Decorator/ConditionDecorator.php b/src/Event/Decorator/ConditionDecorator.php
index 3199e4176fa..b23c454a2bc 100644
--- a/src/Event/Decorator/ConditionDecorator.php
+++ b/src/Event/Decorator/ConditionDecorator.php
@@ -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)
diff --git a/src/Http/CallbackStream.php b/src/Http/CallbackStream.php
index cfd59ad52fa..47c9ac0377a 100644
--- a/src/Http/CallbackStream.php
+++ b/src/Http/CallbackStream.php
@@ -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
  */
diff --git a/src/Http/ResponseEmitter.php b/src/Http/ResponseEmitter.php
index 5b28361bda0..00804184ee9 100644
--- a/src/Http/ResponseEmitter.php
+++ b/src/Http/ResponseEmitter.php
@@ -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
diff --git a/src/Network/Http/Adapter/Stream.php b/src/Network/Http/Adapter/Stream.php
index adce34d16c8..71d97c6b268 100644
--- a/src/Network/Http/Adapter/Stream.php
+++ b/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');
diff --git a/src/Network/Http/Auth/Basic.php b/src/Network/Http/Auth/Basic.php
index 6a97f7de2c8..1777c96d7f3 100644
--- a/src/Network/Http/Auth/Basic.php
+++ b/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');
diff --git a/src/Network/Http/Auth/Digest.php b/src/Network/Http/Auth/Digest.php
index 2309728d40f..ef09c359590 100644
--- a/src/Network/Http/Auth/Digest.php
+++ b/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');
diff --git a/src/Network/Http/Auth/Oauth.php b/src/Network/Http/Auth/Oauth.php
index 0a242c24e5e..43f2aa82bda 100644
--- a/src/Network/Http/Auth/Oauth.php
+++ b/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');
diff --git a/src/Network/Http/Client.php b/src/Network/Http/Client.php
index 5b00aecc351..0ad35f2a85c 100644
--- a/src/Network/Http/Client.php
+++ b/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');
diff --git a/src/Network/Http/CookieCollection.php b/src/Network/Http/CookieCollection.php
index 677157987de..3c6bbf615d6 100644
--- a/src/Network/Http/CookieCollection.php
+++ b/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');
diff --git a/src/Network/Http/FormData.php b/src/Network/Http/FormData.php
index f7d0e63784a..fa2aa8a21d4 100644
--- a/src/Network/Http/FormData.php
+++ b/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');
diff --git a/src/Network/Http/Message.php b/src/Network/Http/Message.php
index 3ef51cbc231..86eaa656082 100644
--- a/src/Network/Http/Message.php
+++ b/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');
diff --git a/src/Network/Http/Request.php b/src/Network/Http/Request.php
index 05f17ebe262..eb2bdf112cb 100644
--- a/src/Network/Http/Request.php
+++ b/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');
diff --git a/src/Network/Http/Response.php b/src/Network/Http/Response.php
index ccc3f89342c..69cd0aaa5f6 100644
--- a/src/Network/Http/Response.php
+++ b/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');
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
index 8b046b84dcc..5440cb54ea1 100644
--- a/src/ORM/Association.php
+++ b/src/ORM/Association.php
@@ -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)
diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
index 81b8e116364..689b7471b97 100644
--- a/src/ORM/Association/BelongsToMany.php
+++ b/src/ORM/Association/BelongsToMany.php
@@ -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;
             }
diff --git a/src/ORM/Behavior/TimestampBehavior.php b/src/ORM/Behavior/TimestampBehavior.php
index de101b4ddf3..aa77b07d58e 100644
--- a/src/ORM/Behavior/TimestampBehavior.php
+++ b/src/ORM/Behavior/TimestampBehavior.php
@@ -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'
      */
diff --git a/src/ORM/Behavior/TreeBehavior.php b/src/ORM/Behavior/TreeBehavior.php
index 1620d7b24da..c4d5cd48a00 100644
--- a/src/ORM/Behavior/TreeBehavior.php
+++ b/src/ORM/Behavior/TreeBehavior.php
@@ -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
@@ -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)
diff --git a/src/Shell/CompletionShell.php b/src/Shell/CompletionShell.php
index 28c4c40d03f..a8fc06bd74b 100644
--- a/src/Shell/CompletionShell.php
+++ b/src/Shell/CompletionShell.php
@@ -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',
diff --git a/src/TestSuite/EmailAssertTrait.php b/src/TestSuite/EmailAssertTrait.php
index e22287efd33..ceb926daa11 100644
--- a/src/TestSuite/EmailAssertTrait.php
+++ b/src/TestSuite/EmailAssertTrait.php
@@ -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)
diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
index f58a4fffb8d..7d203935f60 100644
--- a/src/TestSuite/IntegrationTestCase.php
+++ b/src/TestSuite/IntegrationTestCase.php
@@ -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.
@@ -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();
@@ -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);
     }
 
@@ -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);
     }
diff --git a/src/Utility/Xml.php b/src/Utility/Xml.php
index b8270c2d535..594afb58df2 100644
--- a/src/Utility/Xml.php
+++ b/src/Utility/Xml.php
@@ -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)
diff --git a/src/View/Form/ContextInterface.php b/src/View/Form/ContextInterface.php
index 93b44c47f44..6b7d62b761c 100644
--- a/src/View/Form/ContextInterface.php
+++ b/src/View/Form/ContextInterface.php
@@ -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
diff --git a/src/View/Form/EntityContext.php b/src/View/Form/EntityContext.php
index c0ac721acc6..e36a1d6f710 100644
--- a/src/View/Form/EntityContext.php
+++ b/src/View/Form/EntityContext.php
@@ -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.
      */
@@ -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.
      */
diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
index a20a3a649ce..644e7528799 100644
--- a/src/View/Helper/PaginatorHelper.php
+++ b/src/View/Helper/PaginatorHelper.php
@@ -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
diff --git a/tests/Fixture/AssertHtmlTestCase.php b/tests/Fixture/AssertHtmlTestCase.php
index 090379f4df4..68dde3eaa47 100644
--- a/tests/Fixture/AssertHtmlTestCase.php
+++ b/tests/Fixture/AssertHtmlTestCase.php
@@ -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
 {
diff --git a/tests/Fixture/AssertIntegrationTestCase.php b/tests/Fixture/AssertIntegrationTestCase.php
index a8045c37364..18f732a0b74 100644
--- a/tests/Fixture/AssertIntegrationTestCase.php
+++ b/tests/Fixture/AssertIntegrationTestCase.php
@@ -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
 {
diff --git a/tests/TestCase/Cache/Engine/ApcEngineTest.php b/tests/TestCase/Cache/Engine/ApcEngineTest.php
index 339b41455b6..93f7946e1fa 100644
--- a/tests/TestCase/Cache/Engine/ApcEngineTest.php
+++ b/tests/TestCase/Cache/Engine/ApcEngineTest.php
@@ -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
      */
diff --git a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php
index cc44f3e6cb9..33d18e716c9 100644
--- a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php
+++ b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php
@@ -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
      */
diff --git a/tests/TestCase/Cache/Engine/RedisEngineTest.php b/tests/TestCase/Cache/Engine/RedisEngineTest.php
index 9fc4e7ea001..f87605bd116 100644
--- a/tests/TestCase/Cache/Engine/RedisEngineTest.php
+++ b/tests/TestCase/Cache/Engine/RedisEngineTest.php
@@ -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
      */
diff --git a/tests/TestCase/Cache/Engine/WincacheEngineTest.php b/tests/TestCase/Cache/Engine/WincacheEngineTest.php
index 7d5714a213c..0c3b6319866 100644
--- a/tests/TestCase/Cache/Engine/WincacheEngineTest.php
+++ b/tests/TestCase/Cache/Engine/WincacheEngineTest.php
@@ -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
      */
diff --git a/tests/TestCase/Cache/Engine/XcacheEngineTest.php b/tests/TestCase/Cache/Engine/XcacheEngineTest.php
index 859acd1d120..baa48f24f4c 100644
--- a/tests/TestCase/Cache/Engine/XcacheEngineTest.php
+++ b/tests/TestCase/Cache/Engine/XcacheEngineTest.php
@@ -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
      */
diff --git a/tests/TestCase/Collection/CollectionTest.php b/tests/TestCase/Collection/CollectionTest.php
index 05060eb5b82..72bff8f648c 100644
--- a/tests/TestCase/Collection/CollectionTest.php
+++ b/tests/TestCase/Collection/CollectionTest.php
@@ -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);
@@ -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());
     }
@@ -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());
     }
@@ -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());
     }
@@ -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());
     }
 
diff --git a/tests/TestCase/Console/ConsoleErrorHandlerTest.php b/tests/TestCase/Console/ConsoleErrorHandlerTest.php
index 92c29680be8..3c444c817dc 100644
--- a/tests/TestCase/Console/ConsoleErrorHandlerTest.php
+++ b/tests/TestCase/Console/ConsoleErrorHandlerTest.php
@@ -128,10 +128,10 @@ public function testNonCakeExceptions()
      */
     public function testError404Exception()
     {
-        $exception = new NotFoundException('dont use me in cli.');
+        $exception = new NotFoundException('don\'t use me in cli.');
 
         $this->stderr->expects($this->once())->method('write')
-            ->with($this->stringContains('dont use me in cli.'));
+            ->with($this->stringContains('don\'t use me in cli.'));
 
         $this->Error->handleException($exception);
     }
@@ -143,10 +143,10 @@ public function testError404Exception()
      */
     public function testError500Exception()
     {
-        $exception = new InternalErrorException('dont use me in cli.');
+        $exception = new InternalErrorException('don\'t use me in cli.');
 
         $this->stderr->expects($this->once())->method('write')
-            ->with($this->stringContains('dont use me in cli.'));
+            ->with($this->stringContains('don\'t use me in cli.'));
 
         $this->Error->handleException($exception);
     }
diff --git a/tests/TestCase/Controller/Component/CookieComponentTest.php b/tests/TestCase/Controller/Component/CookieComponentTest.php
index d2f25379719..e4c8792ace0 100644
--- a/tests/TestCase/Controller/Component/CookieComponentTest.php
+++ b/tests/TestCase/Controller/Component/CookieComponentTest.php
@@ -107,7 +107,7 @@ public function testConfigKeyArray()
      */
     protected function _setCookieData()
     {
-        $this->Cookie->write(['Encrytped_array' => ['name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!']]);
+        $this->Cookie->write(['Encrypted_array' => ['name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!']]);
         $this->Cookie->write(['Encrypted_multi_cookies.name' => 'CakePHP']);
         $this->Cookie->write(['Encrypted_multi_cookies.version' => '1.2.0.x']);
         $this->Cookie->write(['Encrypted_multi_cookies.tag' => 'CakePHP Rocks!']);
@@ -158,7 +158,7 @@ public function testReadInvalidCipher()
     public function testReadEncryptedCookieData()
     {
         $this->_setCookieData();
-        $data = $this->Cookie->read('Encrytped_array');
+        $data = $this->Cookie->read('Encrypted_array');
         $expected = ['name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!'];
         $this->assertEquals($expected, $data);
 
@@ -499,8 +499,8 @@ public function testDeleteCookieValue()
         $expected = ['version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!'];
         $this->assertEquals($expected, $data);
 
-        $this->Cookie->delete('Encrytped_array');
-        $data = $this->Cookie->read('Encrytped_array');
+        $this->Cookie->delete('Encrypted_array');
+        $data = $this->Cookie->read('Encrypted_array');
         $this->assertNull($data);
 
         $this->Cookie->delete('Plain_multi_cookies.name');
@@ -522,15 +522,15 @@ public function testReadingCookieArray()
     {
         $this->_setCookieData();
 
-        $data = $this->Cookie->read('Encrytped_array.name');
+        $data = $this->Cookie->read('Encrypted_array.name');
         $expected = 'CakePHP';
         $this->assertEquals($expected, $data);
 
-        $data = $this->Cookie->read('Encrytped_array.version');
+        $data = $this->Cookie->read('Encrypted_array.version');
         $expected = '1.2.0.x';
         $this->assertEquals($expected, $data);
 
-        $data = $this->Cookie->read('Encrytped_array.tag');
+        $data = $this->Cookie->read('Encrypted_array.tag');
         $expected = 'CakePHP Rocks!';
         $this->assertEquals($expected, $data);
 
diff --git a/tests/TestCase/Controller/ComponentRegistryTest.php b/tests/TestCase/Controller/ComponentRegistryTest.php
index c438d1cdc92..fc729826218 100644
--- a/tests/TestCase/Controller/ComponentRegistryTest.php
+++ b/tests/TestCase/Controller/ComponentRegistryTest.php
@@ -120,7 +120,7 @@ public function testLoadWithEnableFalse()
     }
 
     /**
-     * test missingcomponent exception
+     * test MissingComponent exception
      *
      * @expectedException \Cake\Controller\Exception\MissingComponentException
      * @return void
diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
index 9919ed18a20..282b333bdfd 100644
--- a/tests/TestCase/Controller/ControllerTest.php
+++ b/tests/TestCase/Controller/ControllerTest.php
@@ -93,7 +93,7 @@ class TestController extends ControllerTestAppController
      * beforeFilter handler
      *
      * @param \Cake\Event\Event $event
-     * @retun void
+     * @return void
      */
     public function beforeFilter(Event $event)
     {
diff --git a/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php b/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php
index d922d12a0ee..e5239da3944 100644
--- a/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php
+++ b/tests/TestCase/Core/Configure/Engine/JsonConfigTest.php
@@ -96,7 +96,7 @@ public function testReadWithNonExistentFile()
      * Test reading an empty file.
      *
      * @expectedException \Cake\Core\Exception\Exception
-     * @expcetedExceptionMessage Decoding JSON config file "empty.json" did not return any array
+     * @expectedExceptionMessage Decoding JSON config file "empty.json" did not return an array
      * @return void
      */
     public function testReadEmptyFile()
diff --git a/tests/TestCase/Core/ConfigureTest.php b/tests/TestCase/Core/ConfigureTest.php
index 558f4b06861..4d677422ac5 100644
--- a/tests/TestCase/Core/ConfigureTest.php
+++ b/tests/TestCase/Core/ConfigureTest.php
@@ -274,7 +274,7 @@ public function testCheckEmpty()
      * @expectedException \RuntimeException
      * @return void
      */
-    public function testLoadExceptionOnNonExistantFile()
+    public function testLoadExceptionOnNonExistentFile()
     {
         Configure::config('test', new PhpConfig());
         Configure::load('non_existing_configuration_file', 'test');
diff --git a/tests/TestCase/Core/InstanceConfigTraitTest.php b/tests/TestCase/Core/InstanceConfigTraitTest.php
index 0d826231efc..29aabec785a 100644
--- a/tests/TestCase/Core/InstanceConfigTraitTest.php
+++ b/tests/TestCase/Core/InstanceConfigTraitTest.php
@@ -168,7 +168,7 @@ public function testSetSimple()
         $this->assertSame(
             'zum',
             $this->object->config('some'),
-            'should return the overritten value'
+            'should return the overwritten value'
         );
         $this->assertSame(
             $this->object,
@@ -205,7 +205,7 @@ public function testSetNested()
         $this->assertSame(
             'zum',
             $this->object->config('a.nested'),
-            'should return the overritten value'
+            'should return the overwritten value'
         );
 
         $this->assertSame(
diff --git a/tests/TestCase/Database/ConnectionTest.php b/tests/TestCase/Database/ConnectionTest.php
index 367f32919a5..8a05cd8d3fc 100644
--- a/tests/TestCase/Database/ConnectionTest.php
+++ b/tests/TestCase/Database/ConnectionTest.php
@@ -435,17 +435,17 @@ public function testDeleteNoConditions()
      */
     public function testDeleteWithConditions()
     {
-        $this->connection->delete('things', ['id' => '1-rest-is-ommited'], ['id' => 'integer']);
+        $this->connection->delete('things', ['id' => '1-rest-is-omitted'], ['id' => 'integer']);
         $result = $this->connection->execute('SELECT * FROM things');
         $this->assertCount(1, $result);
         $result->closeCursor();
 
-        $this->connection->delete('things', ['id' => '1-rest-is-ommited'], ['id' => 'integer']);
+        $this->connection->delete('things', ['id' => '1-rest-is-omitted'], ['id' => 'integer']);
         $result = $this->connection->execute('SELECT * FROM things');
         $this->assertCount(1, $result);
         $result->closeCursor();
 
-        $this->connection->delete('things', ['id' => '2-rest-is-ommited'], ['id' => 'integer']);
+        $this->connection->delete('things', ['id' => '2-rest-is-omitted'], ['id' => 'integer']);
         $result = $this->connection->execute('SELECT * FROM things');
         $this->assertCount(0, $result);
         $result->closeCursor();
@@ -478,7 +478,7 @@ public function testSimpleTransactions()
      *
      * @return void
      */
-    public function testVirtualNestedTrasanction()
+    public function testVirtualNestedTransaction()
     {
         //starting 3 virtual transaction
         $this->connection->begin();
@@ -502,7 +502,7 @@ public function testVirtualNestedTrasanction()
      *
      * @return void
      */
-    public function testVirtualNestedTrasanction2()
+    public function testVirtualNestedTransaction2()
     {
         //starting 3 virtual transaction
         $this->connection->begin();
@@ -525,7 +525,7 @@ public function testVirtualNestedTrasanction2()
      * @return void
      */
 
-    public function testVirtualNestedTrasanction3()
+    public function testVirtualNestedTransaction3()
     {
         //starting 3 virtual transaction
         $this->connection->begin();
diff --git a/tests/TestCase/Database/Driver/MysqlTest.php b/tests/TestCase/Database/Driver/MysqlTest.php
index 38b106c10a7..4221617c5f0 100644
--- a/tests/TestCase/Database/Driver/MysqlTest.php
+++ b/tests/TestCase/Database/Driver/MysqlTest.php
@@ -94,7 +94,7 @@ public function testConnectionConfigCustom()
             'port' => 3440,
             'flags' => [1 => true, 2 => false],
             'encoding' => 'a-language',
-            'timezone' => 'Antartica',
+            'timezone' => 'Antarctica',
             'init' => [
                 'Execute this',
                 'this too',
@@ -106,7 +106,7 @@ public function testConnectionConfigCustom()
             ->getMock();
         $dsn = 'mysql:host=foo;port=3440;dbname=bar;charset=a-language';
         $expected = $config;
-        $expected['init'][] = "SET time_zone = 'Antartica'";
+        $expected['init'][] = "SET time_zone = 'Antarctica'";
         $expected['init'][] = "SET NAMES a-language";
         $expected['flags'] += [
             PDO::ATTR_PERSISTENT => false,
@@ -119,7 +119,7 @@ public function testConnectionConfigCustom()
             ->getMock();
         $connection->expects($this->at(0))->method('exec')->with('Execute this');
         $connection->expects($this->at(1))->method('exec')->with('this too');
-        $connection->expects($this->at(2))->method('exec')->with("SET time_zone = 'Antartica'");
+        $connection->expects($this->at(2))->method('exec')->with("SET time_zone = 'Antarctica'");
         $connection->expects($this->at(3))->method('exec')->with("SET NAMES a-language");
         $connection->expects($this->exactly(4))->method('exec');
 
diff --git a/tests/TestCase/Database/Driver/PostgresTest.php b/tests/TestCase/Database/Driver/PostgresTest.php
index 36fa44fb1bb..71e9f0a2de9 100644
--- a/tests/TestCase/Database/Driver/PostgresTest.php
+++ b/tests/TestCase/Database/Driver/PostgresTest.php
@@ -94,7 +94,7 @@ public function testConnectionConfigCustom()
             'port' => 3440,
             'flags' => [1 => true, 2 => false],
             'encoding' => 'a-language',
-            'timezone' => 'Antartica',
+            'timezone' => 'Antarctica',
             'schema' => 'fooblic',
             'init' => ['Execute this', 'this too']
         ];
@@ -126,7 +126,7 @@ public function testConnectionConfigCustom()
         $connection->expects($this->at(3))->method('exec')->with('SET search_path TO fooblic');
         $connection->expects($this->at(5))->method('exec')->with('Execute this');
         $connection->expects($this->at(6))->method('exec')->with('this too');
-        $connection->expects($this->at(7))->method('exec')->with('SET timezone = Antartica');
+        $connection->expects($this->at(7))->method('exec')->with('SET timezone = Antarctica');
         $connection->expects($this->exactly(5))->method('exec');
 
         $driver->connection($connection);
diff --git a/tests/TestCase/Database/Expression/TupleComparisonTest.php b/tests/TestCase/Database/Expression/TupleComparisonTest.php
index 9a702f7e585..3eb33a271ae 100644
--- a/tests/TestCase/Database/Expression/TupleComparisonTest.php
+++ b/tests/TestCase/Database/Expression/TupleComparisonTest.php
@@ -129,7 +129,7 @@ public function testTraverse()
     }
 
     /**
-     * Tests that a single ExpressionInteface can be used as the value for
+     * Tests that a single ExpressionInterface can be used as the value for
      * comparison
      *
      * @return void
@@ -143,7 +143,7 @@ public function testValueAsSingleExpression()
     }
 
     /**
-     * Tests that a single ExpressionInteface can be used as the field for
+     * Tests that a single ExpressionInterface can be used as the field for
      * comparison
      *
      * @return void
diff --git a/tests/TestCase/Database/ExpressionTypeCastingTest.php b/tests/TestCase/Database/ExpressionTypeCastingTest.php
index 24687365a35..4cc3ed327f0 100644
--- a/tests/TestCase/Database/ExpressionTypeCastingTest.php
+++ b/tests/TestCase/Database/ExpressionTypeCastingTest.php
@@ -96,7 +96,7 @@ public function testComparisonMultiple()
     }
 
     /**
-     * Tests that the Between expression casts values to expresisons correctly
+     * Tests that the Between expression casts values to expressions correctly
      *
      * @return void
      */
diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
index 5755a93fc4e..e6073627eb2 100644
--- a/tests/TestCase/Database/QueryTest.php
+++ b/tests/TestCase/Database/QueryTest.php
@@ -4079,11 +4079,11 @@ public function testSelectTypeConversion()
 
 
     /**
-     * Tests that the json type can save and get data symetrically
+     * Tests that the json type can save and get data symmetrically
      *
      * @return void
      */
-    public function testSymetricJsonType()
+    public function testSymmetricJsonType()
     {
         $query = new Query($this->connection);
         $insert = $query
diff --git a/tests/TestCase/Database/Statement/StatementDecoratorTest.php b/tests/TestCase/Database/Statement/StatementDecoratorTest.php
index 8a75bf6a44a..87c677abae0 100644
--- a/tests/TestCase/Database/Statement/StatementDecoratorTest.php
+++ b/tests/TestCase/Database/Statement/StatementDecoratorTest.php
@@ -20,7 +20,7 @@
 /**
  * Tests StatementDecorator class
  */
-class StatemetDecoratorTest extends TestCase
+class StatementDecoratorTest extends TestCase
 {
 
     /**
diff --git a/tests/TestCase/Database/Type/BinaryTypeTest.php b/tests/TestCase/Database/Type/BinaryTypeTest.php
index bf8efa21dbb..559c7881072 100644
--- a/tests/TestCase/Database/Type/BinaryTypeTest.php
+++ b/tests/TestCase/Database/Type/BinaryTypeTest.php
@@ -64,7 +64,7 @@ public function testToPHP()
     }
 
     /**
-     * SQLServer returns binary fields as hexidecimal
+     * SQLServer returns binary fields as hexadecimal
      * Ensure decoding happens for SQLServer drivers
      *
      * @return void
diff --git a/tests/TestCase/Database/Type/BoolTypeTest.php b/tests/TestCase/Database/Type/BoolTypeTest.php
index be400d7b64d..be72ced1738 100644
--- a/tests/TestCase/Database/Type/BoolTypeTest.php
+++ b/tests/TestCase/Database/Type/BoolTypeTest.php
@@ -85,7 +85,7 @@ public function testToDatabaseInvalidArray()
     }
 
     /**
-     * Test convertring string booleans to PHP values.
+     * Test converting string booleans to PHP values.
      *
      * @return void
      */
@@ -128,7 +128,7 @@ public function testMarshal()
     }
 
     /**
-     * Test convertring booleans to PDO types.
+     * Test converting booleans to PDO types.
      *
      * @return void
      */
diff --git a/tests/TestCase/Database/Type/IntegerTypeTest.php b/tests/TestCase/Database/Type/IntegerTypeTest.php
index 5be34c5342e..3634edc5767 100644
--- a/tests/TestCase/Database/Type/IntegerTypeTest.php
+++ b/tests/TestCase/Database/Type/IntegerTypeTest.php
@@ -95,7 +95,7 @@ public function testToDatabase()
      * @expectedException \InvalidArgumentException
      * @return void
      */
-    public function testToDatabseInvalid()
+    public function testToDatabaseInvalid()
     {
         $this->type->toDatabase(['3', '4'], $this->driver);
     }
diff --git a/tests/TestCase/Datasource/RulesCheckerTest.php b/tests/TestCase/Datasource/RulesCheckerTest.php
index 316095eb460..615eedfa73b 100644
--- a/tests/TestCase/Datasource/RulesCheckerTest.php
+++ b/tests/TestCase/Datasource/RulesCheckerTest.php
@@ -135,7 +135,7 @@ function () {
     }
 
     /**
-     * Test that returnned error messages work.
+     * Test that returned error messages work.
      *
      * @return void
      */
@@ -158,7 +158,7 @@ function () {
     }
 
     /**
-     * Test that returnned error messages work.
+     * Test that returned error messages work.
      *
      * @return void
      */
@@ -181,7 +181,7 @@ function () {
     }
 
     /**
-     * Test that returnned error messages work.
+     * Test that returned error messages work.
      *
      * @return void
      */
diff --git a/tests/TestCase/Error/ExceptionRendererTest.php b/tests/TestCase/Error/ExceptionRendererTest.php
index f9214a4fa38..eb886204351 100644
--- a/tests/TestCase/Error/ExceptionRendererTest.php
+++ b/tests/TestCase/Error/ExceptionRendererTest.php
@@ -881,7 +881,7 @@ public function testRenderShutdownEvents()
      *
      * @return void
      */
-    public function testRenderShutdownEventsOnDispatcherFacotry()
+    public function testRenderShutdownEventsOnDispatcherFactory()
     {
         $filter = $this->getMockBuilder('Cake\Routing\DispatcherFilter')
             ->setMethods(['afterDispatch'])
diff --git a/tests/TestCase/Filesystem/FolderTest.php b/tests/TestCase/Filesystem/FolderTest.php
index 2a257600568..4bbcc4a0b2b 100644
--- a/tests/TestCase/Filesystem/FolderTest.php
+++ b/tests/TestCase/Filesystem/FolderTest.php
@@ -520,7 +520,7 @@ public function testFolderSubdirectories()
         $this->assertSame([], array_diff($expected, $result));
 
         $expected = [];
-        $result = $folder->subdirectories('NonExistantPath');
+        $result = $folder->subdirectories('NonExistentPath');
         $this->assertSame([], array_diff($expected, $result));
         $result = $folder->subdirectories($path . DS . 'Exception');
         $this->assertSame([], array_diff($expected, $result));
@@ -880,7 +880,7 @@ public function testDirSize()
     }
 
     /**
-     * test that errors and messages can be resetted
+     * test that errors and messages can be restarted
      *
      * @return void
      */
@@ -1130,7 +1130,7 @@ public function testCopyWithOverwrite()
     }
 
     /**
-     * testCopyWithoutResursive
+     * testCopyWithoutRecursive
      *
      * Verify that only the files exist in the target directory.
      *
diff --git a/tests/TestCase/Log/LogTest.php b/tests/TestCase/Log/LogTest.php
index 9a623379ee1..b3976e566c0 100644
--- a/tests/TestCase/Log/LogTest.php
+++ b/tests/TestCase/Log/LogTest.php
@@ -652,7 +652,7 @@ public function testWriteUnhandled()
         Log::drop('error');
         Log::drop('debug');
 
-        $result = Log::write('error', 'Bad stuff', 'unpossible');
+        $result = Log::write('error', 'Bad stuff', 'impossible');
         $this->assertFalse($result);
     }
 
diff --git a/tests/TestCase/ORM/Association/BelongsToManyTest.php b/tests/TestCase/ORM/Association/BelongsToManyTest.php
index 865bb6fea34..0ec1cf0ea0b 100644
--- a/tests/TestCase/ORM/Association/BelongsToManyTest.php
+++ b/tests/TestCase/ORM/Association/BelongsToManyTest.php
@@ -390,7 +390,7 @@ public function testLinkWithNotPersistedSource()
     }
 
     /**
-     * Test liking entities having a non persited target entity
+     * Test liking entities having a non persisted target entity
      *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Cannot link not persisted entities
@@ -462,7 +462,7 @@ public function testLinkSuccess()
     }
 
     /**
-     * Test liking entities having a non persited source entity
+     * Test liking entities having a non persisted source entity
      *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Source entity needs to be persisted before proceeding
@@ -482,7 +482,7 @@ public function testUnlinkWithNotPersistedSource()
     }
 
     /**
-     * Test liking entities having a non persited target entity
+     * Test liking entities having a non persisted target entity
      *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Cannot link not persisted entities
@@ -941,7 +941,7 @@ public function testTargetForeignKey()
     }
 
     /**
-     * Tests that custom foreignKeys are properly trasmitted to involved associations
+     * Tests that custom foreignKeys are properly transmitted to involved associations
      * when they are customized
      *
      * @return void
@@ -1057,7 +1057,7 @@ public function testEagerLoadingRequiresPrimaryKey()
 
     /**
      * Tests that fetching belongsToMany association will not force
-     * all fields being returned, but intead will honor the select() clause
+     * all fields being returned, but instead will honor the select() clause
      *
      * @see https://github.com/cakephp/cakephp/issues/7916
      * @return void
diff --git a/tests/TestCase/ORM/Association/BelongsToTest.php b/tests/TestCase/ORM/Association/BelongsToTest.php
index 610f05951ce..758c42999eb 100644
--- a/tests/TestCase/ORM/Association/BelongsToTest.php
+++ b/tests/TestCase/ORM/Association/BelongsToTest.php
@@ -243,7 +243,7 @@ public function testAttachToMultiPrimaryKey()
      * @expectedExceptionMessage Cannot match provided foreignKey for "Companies", got "(company_id)" but expected foreign key for "(id, tenant_id)"
      * @return void
      */
-    public function testAttachToMultiPrimaryKeyMistmatch()
+    public function testAttachToMultiPrimaryKeyMismatch()
     {
         $this->company->primaryKey(['id', 'tenant_id']);
         $query = $this->client->query();
diff --git a/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php b/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php
index 0c348e56f90..203ab932e62 100644
--- a/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php
+++ b/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php
@@ -321,7 +321,7 @@ public function testLambdaNumberUpdate()
     }
 
     /**
-     * Testing counter cache with lambda returning subqueryn
+     * Testing counter cache with lambda returning a subquery
      *
      * @return void
      */
diff --git a/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php b/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php
index 6780615b5f2..b87dea573fd 100644
--- a/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php
+++ b/tests/TestCase/ORM/Behavior/TreeBehaviorTest.php
@@ -792,7 +792,7 @@ public function testAddOrphan()
     }
 
     /**
-     * Tests that adding a child node as a decendant of one of the roots works
+     * Tests that adding a child node as a descendant of one of the roots works
      *
      * @return void
      */
@@ -1415,7 +1415,7 @@ public function testSetLevelExistingNode()
         $entity = $this->table->get(4);
         $this->assertEquals(2, $entity->depth);
 
-        // Non leaf node so depth of descendents will also change
+        // Non leaf node so depth of descendants will also change
         $entity = $this->table->get(6);
         $this->assertEquals(1, $entity->depth);
 
diff --git a/tests/TestCase/ORM/BindingKeyTest.php b/tests/TestCase/ORM/BindingKeyTest.php
index 8c2fd045ee1..f228c1f8846 100644
--- a/tests/TestCase/ORM/BindingKeyTest.php
+++ b/tests/TestCase/ORM/BindingKeyTest.php
@@ -18,7 +18,7 @@
 use Cake\TestSuite\TestCase;
 
 /**
- * Integration tests for usinge the bindingKey in associations
+ * Integration tests for using the bindingKey in associations
  */
 class BindingKeyTest extends TestCase
 {
diff --git a/tests/TestCase/ORM/CompositeKeysTest.php b/tests/TestCase/ORM/CompositeKeysTest.php
index a8e72a94311..812f724b206 100644
--- a/tests/TestCase/ORM/CompositeKeysTest.php
+++ b/tests/TestCase/ORM/CompositeKeysTest.php
@@ -34,7 +34,7 @@ class OpenArticleEntity extends Entity
 }
 
 /**
- * Integration tetss for table operations involving composite keys
+ * Integration tests for table operations involving composite keys
  */
 class CompositeKeyTest extends TestCase
 {
@@ -302,7 +302,7 @@ public function testBelongsToManyEager($strategy)
     }
 
     /**
-     * Tests loding belongsTo with composite keys
+     * Tests loading belongsTo with composite keys
      *
      * @dataProvider strategiesProviderBelongsTo
      * @return void
@@ -672,7 +672,7 @@ public function testFindThreadedCompositeKeys()
     }
 
     /**
-     * Tets that loadInto() is capable of handling composite primary keys
+     * Tests that loadInto() is capable of handling composite primary keys
      *
      * @return void
      */
@@ -694,8 +694,8 @@ public function testLoadInto()
     }
 
     /**
-     * Tets that loadInto() is capable of handling composite primary keys
-     * when loading belongsTo assocaitions
+     * Tests that loadInto() is capable of handling composite primary keys
+     * when loading belongsTo associations
      *
      * @return void
      */
@@ -716,7 +716,7 @@ public function testLoadIntoWithBelongsTo()
     }
 
     /**
-     * Tets that loadInto() is capable of handling composite primary keys
+     * Tests that loadInto() is capable of handling composite primary keys
      * when loading into multiple entities
      *
      * @return void
@@ -749,7 +749,7 @@ public function skipIfSqlite()
     {
         $this->skipIf(
             $this->connection->driver() instanceof \Cake\Database\Driver\Sqlite,
-            'SQLite does not support the requrirements of this test.'
+            'SQLite does not support the requirements of this test.'
         );
     }
 }
diff --git a/tests/TestCase/ORM/EagerLoaderTest.php b/tests/TestCase/ORM/EagerLoaderTest.php
index a39e53e622f..bb3ed833253 100644
--- a/tests/TestCase/ORM/EagerLoaderTest.php
+++ b/tests/TestCase/ORM/EagerLoaderTest.php
@@ -428,7 +428,7 @@ public function testNormalizedChecksAliasNames()
     }
 
     /**
-     * Tests that the path for gettings to a deep assocition is materialized in an
+     * Tests that the path for getting to a deep association is materialized in an
      * array key
      *
      * @return void
diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
index 7e0c3a0169c..4b006e38dde 100644
--- a/tests/TestCase/ORM/EntityTest.php
+++ b/tests/TestCase/ORM/EntityTest.php
@@ -537,7 +537,7 @@ public function testUnsetMakesClean()
     }
 
     /**
-     * Tests unsetProperty whith multiple properties
+     * Tests unsetProperty with multiple properties
      *
      * @return void
      */
@@ -689,7 +689,7 @@ public function testMethodCache()
      *
      * @return void
      */
-    public function testSetGetLongProperyNames()
+    public function testSetGetLongPropertyNames()
     {
         $entity = $this->getMockBUilder('\Cake\ORM\Entity')
             ->setMethods(['_getVeryLongProperty', '_setVeryLongProperty'])
@@ -713,7 +713,7 @@ public function testJsonSerialize()
     }
 
     /**
-     * Tests that jsonSerialize is called recursivily for contained entities
+     * Tests that jsonSerialize is called recursively for contained entities
      *
      * @return void
      */
@@ -750,8 +750,8 @@ public function testExtract()
         $expected = [];
         $this->assertEquals($expected, $entity->extract([]));
 
-        $expected = ['id' => 1, 'crazyness' => null];
-        $this->assertEquals($expected, $entity->extract(['id', 'crazyness']));
+        $expected = ['id' => 1, 'craziness' => null];
+        $this->assertEquals($expected, $entity->extract(['id', 'craziness']));
     }
 
     /**
@@ -1059,7 +1059,7 @@ public function testErrors()
 
         $this->assertEquals([], $entity->errors('boo'));
         $entity['boo'] = [
-            'someting' => 'stupid',
+            'something' => 'stupid',
             'and' => false
         ];
         $this->assertEquals([], $entity->errors('boo'));
@@ -1236,7 +1236,7 @@ public function testAccessibleAsArray()
     }
 
     /**
-     * Tests that a wildcard can be used for setting accesible properties
+     * Tests that a wildcard can be used for setting accessible properties
      *
      * @return void
      */
@@ -1390,7 +1390,7 @@ public function emptyNamesProvider()
         return [[''], [null], [false]];
     }
     /**
-     * Tests that trying to get an empty propetry name throws exception
+     * Tests that trying to get an empty property name throws exception
      *
      * @dataProvider emptyNamesProvider
      * @expectedException \InvalidArgumentException
diff --git a/tests/TestCase/ORM/Locator/TableLocatorTest.php b/tests/TestCase/ORM/Locator/TableLocatorTest.php
index cb1111f7472..552bdc4e5d1 100644
--- a/tests/TestCase/ORM/Locator/TableLocatorTest.php
+++ b/tests/TestCase/ORM/Locator/TableLocatorTest.php
@@ -170,7 +170,7 @@ public function testGet()
     }
 
     /**
-     * Are auto-models instanciated correctly? How about when they have an alias?
+     * Are auto-models instantiated correctly? How about when they have an alias?
      *
      * @return void
      */
diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
index 0e4a4b0b10b..baa5fe7893a 100644
--- a/tests/TestCase/ORM/QueryRegressionTest.php
+++ b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -317,7 +317,7 @@ public function testBelongsToManyDeepSave($strategy)
     }
 
     /**
-     * Tests that no exceptions are generated becuase of ambiguous column names in queries
+     * Tests that no exceptions are generated because of ambiguous column names in queries
      * during a  save operation
      *
      * @see https://github.com/cakephp/cakephp/issues/3803
@@ -356,7 +356,7 @@ public function testSaveWithExpressionProperty()
 
     /**
      * Tests that whe saving deep associations for a belongsToMany property,
-     * data is not removed becuase of excesive associations filtering.
+     * data is not removed because of excessive associations filtering.
      *
      * @see https://github.com/cakephp/cakephp/issues/4009
      * @return void
diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
index f0474666c48..a084a4960ae 100644
--- a/tests/TestCase/ORM/QueryTest.php
+++ b/tests/TestCase/ORM/QueryTest.php
@@ -1833,7 +1833,7 @@ public function testCollectionProxy($method, $arg)
     }
 
     /**
-     * Tests that calling an inexistent method in query throws an
+     * Tests that calling an non-existent method in query throws an
      * exception
      *
      * @expectedException \BadMethodCallException
@@ -1917,7 +1917,7 @@ public function testCacheWriteIntegration()
     }
 
     /**
-     * Integration test for query caching usigna  real cache engine and
+     * Integration test for query caching using a real cache engine and
      * a formatResults callback
      *
      * @return void
@@ -2215,7 +2215,7 @@ public function testCountCacheDirty()
         $query->where(['dirty' => 'cache']);
 
         $secondResult = $query->count();
-        $this->assertSame(2, $secondResult, 'The query cache should be droppped with any modification');
+        $this->assertSame(2, $secondResult, 'The query cache should be dropped with any modification');
 
         $thirdResult = $query->count();
         $this->assertSame(2, $thirdResult, 'The query has not been modified, the cached value is valid');
diff --git a/tests/TestCase/ORM/ResultSetTest.php b/tests/TestCase/ORM/ResultSetTest.php
index 993aa7664e7..ada74f4c9be 100644
--- a/tests/TestCase/ORM/ResultSetTest.php
+++ b/tests/TestCase/ORM/ResultSetTest.php
@@ -269,7 +269,7 @@ public function testDebugInfo()
      *
      * @return void
      */
-    public function testBelongsToEagerLoaderLeavesEmptyAssocation()
+    public function testBelongsToEagerLoaderLeavesEmptyAssociation()
     {
         $comments = TableRegistry::get('Comments');
         $comments->belongsTo('Articles');
@@ -329,7 +329,7 @@ public function testBelongsToEagerLoaderWithAutoFieldsFalse()
      *
      * @return void
      */
-    public function testHasOneEagerLoaderLeavesEmptyAssocation()
+    public function testHasOneEagerLoaderLeavesEmptyAssociation()
     {
         $this->table->hasOne('Comments');
 
diff --git a/tests/TestCase/ORM/RulesCheckerIntegrationTest.php b/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
index 400df6617f8..10c30663a7d 100644
--- a/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
+++ b/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
@@ -795,7 +795,7 @@ public function testIsUniqueWithCleanFields()
     }
 
     /**
-     * Tests isUnique rule with coflicting columns
+     * Tests isUnique rule with conflicting columns
      *
      * @group save
      * @return void
@@ -841,7 +841,7 @@ public function testExistsInWithCleanFields()
     }
 
     /**
-     * Tests the existsIn with coflicting columns
+     * Tests the existsIn with conflicting columns
      *
      * @group save
      * @return void
diff --git a/tests/TestCase/ORM/TableRegistryTest.php b/tests/TestCase/ORM/TableRegistryTest.php
index edee28ada96..24151727061 100644
--- a/tests/TestCase/ORM/TableRegistryTest.php
+++ b/tests/TestCase/ORM/TableRegistryTest.php
@@ -81,7 +81,7 @@ public function testLocator()
     }
 
     /**
-     * Test that locator() method is returing TableLocator by default.
+     * Test that locator() method is returning TableLocator by default.
      *
      * @return void
      */
diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
index b5658255012..586d3956b99 100644
--- a/tests/TestCase/ORM/TableTest.php
+++ b/tests/TestCase/ORM/TableTest.php
@@ -6257,7 +6257,7 @@ public function testLoadIntoWithConditions()
      *
      * @return void
      */
-    public function testLoadBelognsTo()
+    public function testLoadBelongsTo()
     {
         $table = TableRegistry::get('Articles');
         $table->belongsTo('Authors');
diff --git a/tests/TestCase/Shell/CompletionShellTest.php b/tests/TestCase/Shell/CompletionShellTest.php
index 8869dfec6c0..d021adb042b 100644
--- a/tests/TestCase/Shell/CompletionShellTest.php
+++ b/tests/TestCase/Shell/CompletionShellTest.php
@@ -79,7 +79,7 @@ public function tearDown()
     }
 
     /**
-     * test that the startup method supresses the shell header
+     * test that the startup method suppresses the shell header
      *
      * @return void
      */
@@ -136,7 +136,7 @@ public function testOptionsNoArguments()
     }
 
     /**
-     * test that options with a nonexisting command returns nothing
+     * test that options with a non-existing command returns nothing
      *
      * @return void
      */
@@ -291,7 +291,7 @@ public function testSubCommandsNoArguments()
     }
 
     /**
-     * test that subcommands with a nonexisting command returns nothing
+     * test that subcommands with a non-existing command returns nothing
      *
      * @return void
      */
diff --git a/tests/TestCase/Shell/Task/UnloadTaskTest.php b/tests/TestCase/Shell/Task/UnloadTaskTest.php
index 46caa3996a2..c6cf790ea9d 100644
--- a/tests/TestCase/Shell/Task/UnloadTaskTest.php
+++ b/tests/TestCase/Shell/Task/UnloadTaskTest.php
@@ -99,31 +99,31 @@ public function testRegularExpressions()
         $bootstrap = new File($this->bootstrap, false);
 
         //  Plugin::load('TestPlugin', [
-        //      'boostrap' => false
+        //      'bootstrap' => false
         //  ]);
-        $bootstrap->append("\nPlugin::load('TestPlugin', [\n\t'boostrap' => false\n]);\n");
+        $bootstrap->append("\nPlugin::load('TestPlugin', [\n\t'bootstrap' => false\n]);\n");
         $this->Task->main('TestPlugin');
-        $this->assertNotContains("Plugin::load('TestPlugin', [\n\t'boostrap' => false\n]);", $bootstrap->read());
+        $this->assertNotContains("Plugin::load('TestPlugin', [\n\t'bootstrap' => false\n]);", $bootstrap->read());
         $this->_clearBootstrap();
 
         //  Plugin::load(
         //      'TestPlugin',
-        //      [ 'boostrap' => false]
+        //      [ 'bootstrap' => false]
         //  );
-        $bootstrap->append("\nPlugin::load(\n\t'TestPlugin',\n\t[ 'boostrap' => false]\n);\n");
+        $bootstrap->append("\nPlugin::load(\n\t'TestPlugin',\n\t[ 'bootstrap' => false]\n);\n");
         $this->Task->main('TestPlugin');
-        $this->assertNotContains("Plugin::load(\n\t'TestPlugin',\n\t[ 'boostrap' => false]\n);", $bootstrap->read());
+        $this->assertNotContains("Plugin::load(\n\t'TestPlugin',\n\t[ 'bootstrap' => false]\n);", $bootstrap->read());
         $this->_clearBootstrap();
 
         //  Plugin::load(
         //      'Foo',
         //      [
-        //          'boostrap' => false
+        //          'bootstrap' => false
         //      ]
         //  );
-        $bootstrap->append("\nPlugin::load(\n\t'TestPlugin',\n\t[\n\t\t'boostrap' => false\n\t]\n);\n");
+        $bootstrap->append("\nPlugin::load(\n\t'TestPlugin',\n\t[\n\t\t'bootstrap' => false\n\t]\n);\n");
         $this->Task->main('TestPlugin');
-        $this->assertNotContains("Plugin::load(\n\t'TestPlugin',\n\t[\n\t\t'boostrap' => false\n\t]\n);", $bootstrap->read());
+        $this->assertNotContains("Plugin::load(\n\t'TestPlugin',\n\t[\n\t\t'bootstrap' => false\n\t]\n);", $bootstrap->read());
         $this->_clearBootstrap();
 
         //  Plugin::load('Test', [
diff --git a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php
index 613ff44e2d4..fddba808fb8 100644
--- a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php
+++ b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php
@@ -829,7 +829,7 @@ public function testSendFileHttpServer()
      * @expectedExceptionMessage No response set, cannot assert file
      * @return void
      */
-    public function testAssertFileNoReponse()
+    public function testAssertFileNoResponse()
     {
         $this->assertFileResponse('foo');
     }
diff --git a/tests/TestCase/Validation/ValidatorTest.php b/tests/TestCase/Validation/ValidatorTest.php
index a8a3f41bdd9..97826aa43a9 100644
--- a/tests/TestCase/Validation/ValidatorTest.php
+++ b/tests/TestCase/Validation/ValidatorTest.php
@@ -1086,7 +1086,7 @@ public function testArrayAccessGet()
     }
 
     /**
-     * Tests it is possible to check for validation sets for a field using an array inteface
+     * Tests it is possible to check for validation sets for a field using an array interface
      *
      * @return void
      */
@@ -1102,7 +1102,7 @@ public function testArrayAccessExists()
     }
 
     /**
-     * Tests it is possible to set validation rules for a field using an array inteface
+     * Tests it is possible to set validation rules for a field using an array interface
      *
      * @return void
      */
@@ -1123,7 +1123,7 @@ public function testArrayAccessSet()
      *
      * @return void
      */
-    public function testArrayAccessUset()
+    public function testArrayAccessUnset()
     {
         $validator = new Validator;
         $validator
@@ -1153,7 +1153,7 @@ public function testCount()
      *
      * @return void
      */
-    public function testAddMulitple()
+    public function testAddMultiple()
     {
         $validator = new Validator;
         $validator->add('title', [
diff --git a/tests/TestCase/View/CellTest.php b/tests/TestCase/View/CellTest.php
index 5f52c325817..6574fa4abb9 100644
--- a/tests/TestCase/View/CellTest.php
+++ b/tests/TestCase/View/CellTest.php
@@ -289,12 +289,12 @@ public function testPluginCellAlternateTemplateRenderParam()
     }
 
     /**
-     * Tests that using an unexisting cell throws an exception.
+     * Tests that using an non-existent cell throws an exception.
      *
      * @expectedException \Cake\View\Exception\MissingCellException
      * @return void
      */
-    public function testUnexistingCell()
+    public function testNonExistentCell()
     {
         $cell = $this->View->cell('TestPlugin.Void::echoThis', ['arg1' => 'v1']);
         $cell = $this->View->cell('Void::echoThis', ['arg1' => 'v1', 'arg2' => 'v2']);
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index 47577440a5b..15e188f6283 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -494,7 +494,7 @@ public function testCreateGet()
      *
      * @return void
      */
-    public function testCreateExplictMethodEnctype()
+    public function testCreateExplicitMethodEnctype()
     {
         $encoding = strtolower(Configure::read('App.encoding'));
         $result = $this->Form->create(false, [
diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php
index 69101f68cc8..310b97564a0 100644
--- a/tests/TestCase/View/Helper/PaginatorHelperTest.php
+++ b/tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -1074,7 +1074,7 @@ public function testPrev()
     }
 
     /**
-     * Test that prev() and the shared implementation underneath picks up from optins
+     * Test that prev() and the shared implementation underneath picks up from options
      *
      * @return void
      */
diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
index d75515786ed..fd3023689a7 100644
--- a/tests/TestCase/View/ViewTest.php
+++ b/tests/TestCase/View/ViewTest.php
@@ -897,19 +897,19 @@ public function testPrefixElement()
     }
 
     /**
-     * Test loading inexistent view element
+     * Test loading non-existent view element
      *
      * @expectedException \Cake\View\Exception\MissingElementException
      * @expectedExceptionMessageRegExp $Element file \"Element[\\|/]non_existent_element\.ctp\" is missing$
      * @return void
      */
-    public function testElementInexistent()
+    public function testElementNonExistent()
     {
         $this->View->element('non_existent_element');
     }
 
     /**
-     * Test loading inexistent plugin view element
+     * Test loading non-existent plugin view element
      *
      * @expectedException \Cake\View\Exception\MissingElementException
      * @expectedExceptionMessageRegExp $Element file "test_plugin\.Element[\\|/]plugin_element\.ctp\" is missing$
@@ -1540,7 +1540,7 @@ public function testBlockResetFunc()
     }
 
     /**
-     * Test checking a block's existance.
+     * Test checking a block's existence.
      *
      * @return void
      */
diff --git a/tests/TestCase/View/Widget/WidgetRegistryTest.php b/tests/TestCase/View/Widget/WidgetRegistryTest.php
index 25518b598ff..3c7c1c8c758 100644
--- a/tests/TestCase/View/Widget/WidgetRegistryTest.php
+++ b/tests/TestCase/View/Widget/WidgetRegistryTest.php
@@ -75,7 +75,7 @@ public function testGetViewInstance()
      *
      * @return void
      */
-    public function testAddWidgetsFromConfigInConstuctor()
+    public function testAddWidgetsFromConfigInConstructor()
     {
         $widgets = [
             'text' => ['Cake\View\Widget\BasicWidget'],
@@ -90,7 +90,7 @@ public function testAddWidgetsFromConfigInConstuctor()
      *
      * @return void
      */
-    public function testAddPluginWidgetsFromConfigInConstuctor()
+    public function testAddPluginWidgetsFromConfigInConstructor()
     {
         Plugin::load('TestPlugin');
         $widgets = [
diff --git a/tests/test_app/TestApp/Model/Behavior/DuplicateBehavior.php b/tests/test_app/TestApp/Model/Behavior/DuplicateBehavior.php
index 637f84aad03..3799950fd5d 100644
--- a/tests/test_app/TestApp/Model/Behavior/DuplicateBehavior.php
+++ b/tests/test_app/TestApp/Model/Behavior/DuplicateBehavior.php
@@ -17,7 +17,7 @@
 use Cake\ORM\Behavior;
 
 /**
- * Test class for trigging duplicate method errors.
+ * Test class for triggering duplicate method errors.
  */
 class DuplicateBehavior extends Behavior
 {
diff --git a/tests/test_app/TestApp/Template/Posts/extend_self.ctp b/tests/test_app/TestApp/Template/Posts/extend_self.ctp
index 3515819bc80..34ae3e21143 100644
--- a/tests/test_app/TestApp/Template/Posts/extend_self.ctp
+++ b/tests/test_app/TestApp/Template/Posts/extend_self.ctp
@@ -1,2 +1,2 @@
 <?php $this->extend('extend_self'); ?>
-To infinifty and beyond.
+To infinity and beyond.