Merge pull request zendframework/zendframework#5042 in master

test/ContainerTest.php

@@ -799,7 +799,7 @@ public function testFindOneByShouldReturnNullIfNotFound()
     {
         $nav = $this->_getFindByNavigation();
 
-        $found = $nav->findOneBy('id', 'non-existant');
+        $found = $nav->findOneBy('id', 'non-existent');
         $this->assertNull($found);
     }
 
@@ -823,7 +823,7 @@ public function testFindAllByShouldReturnAllMatchingPages()
     public function testFindAllByShouldReturnEmptyArrayifNotFound()
     {
         $nav = $this->_getFindByNavigation();
-        $found = $nav->findAllBy('id', 'non-existant');
+        $found = $nav->findAllBy('id', 'non-existent');
 
         $expected = array('type' => 'array', 'count' => 0);
         $actual = array('type' => gettype($found), 'count' => count($found));

test/Page/PageFactoryTest.php

@@ -118,8 +118,8 @@ public function testShouldFailForInvalidType()
     public function testShouldFailForNonExistantType()
     {
         $pageConfig = array(
-            'type' => 'My_NonExistant_Page',
-            'label' => 'My non-existant Page'
+            'type' => 'My_NonExistent_Page',
+            'label' => 'My non-existent Page'
         );
 
         try {
@@ -128,7 +128,7 @@ public function testShouldFailForNonExistantType()
             return;
         }
 
-        $msg = 'An exception has not been thrown for non-existant class';
+        $msg = 'An exception has not been thrown for non-existent class';
         $this->fail($msg);
     }