do not fail terribly on teardown when ldap could not be set up

zf1s · Feb 19, 2023 · 050c989 · 050c989
1 parent 4d4b74c
commit 050c989
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/tests/Zend/Ldap/CopyRenameTest.php b/tests/Zend/Ldap/CopyRenameTest.php
@@ -103,6 +103,8 @@ protected function setUp()
 
  protected function tearDown()
  {
+ if (!$this->_getLdap()) return;
+
  if ($this->_getLdap()->exists($this->_newDn))
  $this->_getLdap()->delete($this->_newDn, false);
  if ($this->_getLdap()->exists($this->_orgDn))

diff --git a/tests/Zend/Ldap/Node/UpdateTest.php b/tests/Zend/Ldap/Node/UpdateTest.php
@@ -48,6 +48,8 @@ protected function setUp()
 
  protected function tearDown()
  {
+ if(!$this->_getLdap()) return;
+
  foreach ($this->_getLdap()->getBaseNode()->searchChildren('objectClass=*') as $child) {
  $this->_getLdap()->delete($child->getDn(), true);
  }

diff --git a/tests/Zend/Ldap/OnlineTestCase.php b/tests/Zend/Ldap/OnlineTestCase.php
@@ -135,6 +135,8 @@ protected function _prepareLdapServer()
 
  protected function _cleanupLdapServer()
  {
+ if (!$this->_ldap) return;
+
  $ldap=$this->_ldap->getResource();
  foreach (array_reverse($this->_nodes) as $dn => $entry) {
  ldap_delete($ldap, $dn);