From 1d90d29feeaa52efb11f5d7d1225fba69ff5fb10 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Thu, 16 Jan 2014 08:51:07 +0100 Subject: [PATCH] Fixing typos and removing dead code --- src/Database/Expression/TupleComparison.php | 4 ++-- src/ORM/Association/ExternalAssociationTrait.php | 2 +- tests/TestCase/Database/Schema/SqliteSchemaTest.php | 2 +- tests/TestCase/ORM/CompositeKeysTest.php | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Database/Expression/TupleComparison.php b/src/Database/Expression/TupleComparison.php index e8748613fd5..5419f47d2a4 100644 --- a/src/Database/Expression/TupleComparison.php +++ b/src/Database/Expression/TupleComparison.php @@ -110,9 +110,9 @@ protected function _stringifyValues($generator) { /** * Traverses the tree of expressions stored in this object, visiting first - * expressions in the left hand side and the the rest. + * expressions in the left hand side and then the rest. * - * Callback function receives as only argument an instance of a ExpresisonInterface + * Callback function receives as its only argument an instance of an ExpresisonInterface * * @param callable $callable * @return void diff --git a/src/ORM/Association/ExternalAssociationTrait.php b/src/ORM/Association/ExternalAssociationTrait.php index b65f23695a6..12cd07008f0 100644 --- a/src/ORM/Association/ExternalAssociationTrait.php +++ b/src/ORM/Association/ExternalAssociationTrait.php @@ -186,7 +186,7 @@ protected function _resultInjector($fetchQuery, $resultMap) { * be done with multiple foreign keys * * @param array $resultMap a keyed arrays containing the target table - * @param array $sourceKeys an array witha aliased keys to match + * @param array $sourceKeys an array with aliased keys to match * @param string $nestKey the key under which results should be nested * @return \Closure */ diff --git a/tests/TestCase/Database/Schema/SqliteSchemaTest.php b/tests/TestCase/Database/Schema/SqliteSchemaTest.php index 4e661774cdc..ab1d408bb32 100644 --- a/tests/TestCase/Database/Schema/SqliteSchemaTest.php +++ b/tests/TestCase/Database/Schema/SqliteSchemaTest.php @@ -160,7 +160,7 @@ public function testConvertColumn($type, $expected) { * * @return void */ - public function testCovenrtCompositPrimaryKey() { + public function testConvertCompositPrimaryKey() { $driver = $this->getMock('Cake\Database\Driver\Sqlite'); $dialect = new SqliteSchema($driver); diff --git a/tests/TestCase/ORM/CompositeKeysTest.php b/tests/TestCase/ORM/CompositeKeysTest.php index 962fc97314e..35dfad8972d 100644 --- a/tests/TestCase/ORM/CompositeKeysTest.php +++ b/tests/TestCase/ORM/CompositeKeysTest.php @@ -76,7 +76,6 @@ public function strategiesProvider() { */ public function testHasManyEager($strategy) { $table = TableRegistry::get('SiteAuthors'); - TableRegistry::get('SiteArticles'); $table->hasMany('SiteArticles', [ 'propertyName' => 'articles', 'strategy' => $strategy,