Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master' into fix/annotaion_input

  • Loading branch information...
commit 676bc3f14f6a7f801d17ed470e746162efb5eb33 2 parents e0f212d + bf5d9b3
@thestanislav authored
View
2  tests/ZendTest/Authentication/Adapter/Http/AuthTest.php
@@ -186,7 +186,7 @@ public function testBasicAuthBadCreds()
public function testBasicAuthBadUser()
{
- // Attempt Basic Authentication with a nonexistant username and
+ // Attempt Basic Authentication with a nonexistent username and
// password
// The expected Basic Www-Authenticate header value
View
4 tests/ZendTest/Barcode/FactoryTest.php
@@ -247,7 +247,7 @@ public function testBarcodeObjectFactoryWithNamespaceButWithoutExtendingObjectAb
$barcode = Barcode\Barcode::makeBarcode('barcodeNamespaceWithoutExtendingObjectAbstract');
}
- public function testBarcodeObjectFactoryWithUnexistantBarcode()
+ public function testBarcodeObjectFactoryWithUnexistentBarcode()
{
$this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
$barcode = Barcode\Barcode::makeBarcode('zf123', array());
@@ -329,7 +329,7 @@ public function testBarcodeFactoryWithNamespaceButWithoutExtendingRendererAbstra
$renderer = Barcode\Barcode::makeRenderer('rendererNamespaceWithoutExtendingRendererAbstract');
}
- public function testBarcodeRendererFactoryWithUnexistantRenderer()
+ public function testBarcodeRendererFactoryWithUnexistentRenderer()
{
$this->setExpectedException('\Zend\ServiceManager\Exception\ServiceNotFoundException');
$renderer = Barcode\Barcode::makeRenderer('zend', array());
View
4 tests/ZendTest/Ldap/Node/OfflineTest.php
@@ -387,9 +387,9 @@ public function testGetChangedData()
public function testDeleteUnusedAttribute()
{
$node = $this->createTestNode();
- $node->deleteAttribute('nonexistant');
+ $node->deleteAttribute('nonexistent');
$changedData = $node->getChangedData();
- $this->assertArrayNotHasKey('nonexistant', $changedData);
+ $this->assertArrayNotHasKey('nonexistent', $changedData);
}
public function testRenameNodeString()
View
2  tests/ZendTest/Ldap/Node/OnlineTest.php
@@ -261,7 +261,7 @@ public function testGetParent()
/**
* @expectedException Zend\Ldap\Exception\ExceptionInterface
*/
- public function testGetNonexistantParent()
+ public function testGetNonexistentParent()
{
$node = $this->getLDAP()->getNode(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE);
$pnode = $node->getParent();
View
4 tests/ZendTest/Navigation/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));
View
6 tests/ZendTest/Navigation/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);
}
View
2  tests/ZendTest/Permissions/Acl/AclTest.php
@@ -1168,7 +1168,7 @@ public function testAclAssertionsGetOriginalIsAllowedObjects()
$assertion->assertReturnValue = false;
$this->assertFalse($acl->isAllowed($user, $blogPost, 'modify'), 'Assertion should return false');
- // check to see if the last assertion has the proper objets
+ // check to see if the last assertion has the proper objects
$this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\User', $assertion->lastAssertRole, 'Assertion did not receive proper role object');
$this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\BlogPost', $assertion->lastAssertResource, 'Assertion did not receive proper resource object');
View
2  tests/ZendTest/Validator/HostnameTest.php
@@ -156,7 +156,7 @@ public function testIDN()
}
/**
- * Ensure the IDN check works on ressource files as expected
+ * Ensure the IDN check works on resource files as expected
*
*/
public function testRessourceIDN()
Please sign in to comment.
Something went wrong with that request. Please try again.