Merge pull request #499 from bjdelange/master

Fix a few typos
propelorm · Nov 10, 2012 · 73d41e8 · 73d41e8
2 parents 943e036 + 22b7ef5
commit 73d41e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...tsuite/generator/behavior/nestedset/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php b/...tsuite/generator/behavior/nestedset/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php
@@ -205,7 +205,7 @@ public function testShiftLevel()
             't6' => array(8, 9, 4),
             't7' => array(10, 11, 4),
         );
-        $this->assertEquals($this->dumpTreeWithScope(1), $expected, 'shiftLevel can shift level whith a scope');
+        $this->assertEquals($this->dumpTreeWithScope(1), $expected, 'shiftLevel can shift level with a scope');
         $expected = array(
             't8' => array(1, 6, 0),
             't9' => array(2, 3, 1),

diff --git a/test/testsuite/runtime/map/ColumnMapTest.php b/test/testsuite/runtime/map/ColumnMapTest.php
@@ -118,7 +118,7 @@ public function testGetRelation()
     $this->assertEquals($publisherColumn->getRelation(), $bookTable->getRelation('Publisher'), 'getRelation() returns the RelationMap object for this foreign key');
     $bookstoreTable = BookstoreEmployeePeer::getTableMap();
     $supervisorColumn = $bookstoreTable->getColumn('SUPERVISOR_ID');
-    $this->assertEquals($supervisorColumn->getRelation(), $supervisorColumn->getRelation('Supervisor'), 'getRelation() returns the RelationMap object even whit ha specific refPhpName');
+    $this->assertEquals($supervisorColumn->getRelation(), $supervisorColumn->getRelation('Supervisor'), 'getRelation() returns the RelationMap object even without specific refPhpName');
 
   }
 

diff --git a/test/testsuite/runtime/util/BasePeerTest.php b/test/testsuite/runtime/util/BasePeerTest.php
@@ -261,7 +261,7 @@ public function testDoDeleteSeveralConditions()
         $c->add(BookPeer::ID, 12);
         BasePeer::doDelete($c, $con);
         $expectedSQL = "DELETE FROM `book` WHERE book.TITLE='War And Peace' AND book.ID=12";
-        $this->assertEquals($expectedSQL, $con->getLastExecutedQuery(), 'doDelete() combines conditions in WHERE whith an AND');
+        $this->assertEquals($expectedSQL, $con->getLastExecutedQuery(), 'doDelete() combines conditions in WHERE with an AND');
     }
 
     public function testDoDeleteTableAlias()