Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/ZF2-51' of https://github.com/postalservice14/zf2 …
Browse files Browse the repository at this point in the history 
…into feature/zf2-51

Conflicts:
	tests/Zend/Config/ConfigTest.php
	tests/Zend/Controller/Action/Helper/ActionStackTest.php
	tests/Zend/Controller/Router/RewriteTest.php
	tests/Zend/Controller/Router/Route/ChainTest.php
	tests/Zend/Controller/Router/Route/ModuleTest.php
	tests/Zend/Controller/Router/Route/RegexTest.php
	tests/Zend/Controller/Router/Route/StaticTest.php
	tests/Zend/Controller/Router/RouteTest.php
	tests/Zend/Db/Adapter/AbstractTest.php
	tests/Zend/Db/Adapter/PdoIbmTest.php
	tests/Zend/Db/Adapter/PdoMysqlTest.php
	tests/Zend/Db/Adapter/PdoSqliteTest.php
	tests/Zend/Db/Adapter/StaticTest.php
	tests/Zend/Db/Select/AbstractTest.php
	tests/Zend/Db/Statement/AbstractPdoTest.php
	tests/Zend/Db/Statement/AbstractTest.php
	tests/Zend/Db/Statement/MysqliTest.php
	tests/Zend/Http/CookieJarTest.php
	tests/Zend/Json/JsonTest.php
	tests/Zend/Loader/PluginLoaderTest.php
  • Loading branch information
@weierophinney
weierophinney committed Aug 25, 2011
24 parents 872994b + 26b2f38 + 0aa1278 + 0b4eeb2 + 14733fb + 9522bf5 + 13eba34 + 80e576a + edc16b1 + 9113d7c + 2510b05 + 1f7f769 + 37761a1 + 6e8b2c3 + e4ea566 + 0b2466c + 46af398 + 34ac43f + 5fb91dd + 7b1f77f + 3579086 + 77122ab + 4313ad6 + e65e38f commit 97328c7
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
52 changes: 26 additions & 26 deletions test/Node/RootDseTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,38 +94,38 @@ public function testGetters()
{
$root=$this->_getLDAP()->getRootDse();

$this->assertType('array', $root->getNamingContexts());
$this->assertType('string', $root->getSubschemaSubentry());
$this->assertInternalType('array', $root->getNamingContexts());
$this->assertInternalType('string', $root->getSubschemaSubentry());

switch ($root->getServerType()) {
case RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
$this->assertType('string', $root->getConfigurationNamingContext());
$this->assertType('string', $root->getCurrentTime());
$this->assertType('string', $root->getDefaultNamingContext());
$this->assertType('string', $root->getDnsHostName());
$this->assertType('string', $root->getDomainControllerFunctionality());
$this->assertType('string', $root->getDomainFunctionality());
$this->assertType('string', $root->getDsServiceName());
$this->assertType('string', $root->getForestFunctionality());
$this->assertType('string', $root->getHighestCommittedUSN());
$this->assertInternalType('string', $root->getConfigurationNamingContext());
$this->assertInternalType('string', $root->getCurrentTime());
$this->assertInternalType('string', $root->getDefaultNamingContext());
$this->assertInternalType('string', $root->getDnsHostName());
$this->assertInternalType('string', $root->getDomainControllerFunctionality());
$this->assertInternalType('string', $root->getDomainFunctionality());
$this->assertInternalType('string', $root->getDsServiceName());
$this->assertInternalType('string', $root->getForestFunctionality());
$this->assertInternalType('string', $root->getHighestCommittedUSN());
$this->assertType('boolean', $root->getIsGlobalCatalogReady());
$this->assertType('boolean', $root->getIsSynchronized());
$this->assertType('string', $root->getLDAPServiceName());
$this->assertType('string', $root->getRootDomainNamingContext());
$this->assertType('string', $root->getSchemaNamingContext());
$this->assertType('string', $root->getServerName());
$this->assertInternalType('string', $root->getLDAPServiceName());
$this->assertInternalType('string', $root->getRootDomainNamingContext());
$this->assertInternalType('string', $root->getSchemaNamingContext());
$this->assertInternalType('string', $root->getServerName());
break;
case RootDse::SERVER_TYPE_EDIRECTORY:
$this->assertType('string', $root->getVendorName());
$this->assertType('string', $root->getVendorVersion());
$this->assertType('string', $root->getDsaName());
$this->assertType('string', $root->getStatisticsErrors());
$this->assertType('string', $root->getStatisticsSecurityErrors());
$this->assertType('string', $root->getStatisticsChainings());
$this->assertType('string', $root->getStatisticsReferralsReturned());
$this->assertType('string', $root->getStatisticsExtendedOps());
$this->assertType('string', $root->getStatisticsAbandonOps());
$this->assertType('string', $root->getStatisticsWholeSubtreeSearchOps());
$this->assertInternalType('string', $root->getVendorName());
$this->assertInternalType('string', $root->getVendorVersion());
$this->assertInternalType('string', $root->getDsaName());
$this->assertInternalType('string', $root->getStatisticsErrors());
$this->assertInternalType('string', $root->getStatisticsSecurityErrors());
$this->assertInternalType('string', $root->getStatisticsChainings());
$this->assertInternalType('string', $root->getStatisticsReferralsReturned());
$this->assertInternalType('string', $root->getStatisticsExtendedOps());
$this->assertInternalType('string', $root->getStatisticsAbandonOps());
$this->assertInternalType('string', $root->getStatisticsWholeSubtreeSearchOps());
break;
case RootDse::SERVER_TYPE_OPENLDAP:
$this->_assertNullOrString($root->getConfigContext());
Expand All @@ -139,7 +139,7 @@ protected function _assertNullOrString($value)
if ($value===null) {
$this->assertNull($value);
} else {
$this->assertType('string', $value);
$this->assertInternalType('string', $value);
}
}

Expand Down
10 changes: 5 additions & 5 deletions test/Node/SchemaTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ public function testSchemaNode()

public function testGetters()
{
$this->assertType('array', $this->_schema->getAttributeTypes());
$this->assertType('array', $this->_schema->getObjectClasses());
$this->assertInternalType('array', $this->_schema->getAttributeTypes());
$this->assertInternalType('array', $this->_schema->getObjectClasses());

switch ($this->_getLDAP()->getRootDse()->getServerType()) {
case RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
break;
case RootDse::SERVER_TYPE_EDIRECTORY:
break;
case RootDse::SERVER_TYPE_OPENLDAP:
$this->assertType('array', $this->_schema->getLDAPSyntaxes());
$this->assertType('array', $this->_schema->getMatchingRules());
$this->assertType('array', $this->_schema->getMatchingRuleUse());
$this->assertInternalType('array', $this->_schema->getLDAPSyntaxes());
$this->assertInternalType('array', $this->_schema->getMatchingRules());
$this->assertInternalType('array', $this->_schema->getMatchingRuleUse());
break;
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/SearchTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public function testCallingCurrentOnIteratorReturnsFirstElement()
TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Ldap\Ldap::SEARCH_SCOPE_SUB);
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->getInnerIterator()->key());
$current = $items->getInnerIterator()->current();
$this->assertType('array', $current);
$this->assertInternalType('array', $current);
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);
}

Expand All @@ -468,7 +468,7 @@ public function testCallingCurrentOnCollectionReturnsFirstElement()
$this->assertEquals(0, $items->key());
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->dn());
$current = $items->current();
$this->assertType('array', $current);
$this->assertInternalType('array', $current);
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);
}

Expand Down Expand Up @@ -505,7 +505,7 @@ public function testResultIterationAfterCallingCurrent()
$this->assertEquals(9, $items->count());
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $items->getInnerIterator()->key());
$current = $items->current();
$this->assertType('array', $current);
$this->assertInternalType('array', $current);
$this->assertEquals(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, $current['dn']);

$i=0;
Expand Down

0 comments on commit 97328c7

Please sign in to comment.