Merge branch 'hotfix/errorHandling' of https://github.com/heiglandreas/zend-ldap into hotfix/47

Author: heiglandreas

src/ErrorHandler.php

@@ -70,7 +70,7 @@ protected static function getErrorHandler()
      */
     public function startErrorHandling($level = E_WARNING)
     {
-        // Do nothing!
+        set_error_handler(function ($errNo, $errString) {});
     }
 
     /**
@@ -83,7 +83,7 @@ public function startErrorHandling($level = E_WARNING)
      */
     public function stopErrorHandling($throw = false)
     {
-        // Do nothing;
+        restore_error_handler();
     }
 
     /**

test/ErrorHandlerTest.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Ldap;
+
+use Zend\Ldap\ErrorHandler;
+
+/**
+ * @group      Zend_Ldap
+ */
+class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
+{
+    protected $dummyErrorHandler;
+
+    protected $currentErrorHandler = [
+        'PHPUnit_Util_ErrorHandler',
+        'handleError',
+    ];
+
+    public function setup()
+    {
+        $this->dummyErrorHandler = function ($errno, $error) {};
+    }
+    public function testErrorHandlerSettingWorks()
+    {
+        $errorHandler = new ErrorHandler();
+
+        $this->assertEquals($this->currentErrorHandler, set_error_handler($this->dummyErrorHandler));
+        $errorHandler->startErrorHandling();
+        $this->assertEquals($this->dummyErrorHandler, set_error_handler($this->dummyErrorHandler));
+
+        restore_error_handler();
+        restore_error_handler();
+    }
+
+    public function testErrorHandlerREmovalWorks()
+    {
+        $errorHandler = new ErrorHandler();
+
+        $this->assertEquals($this->currentErrorHandler, set_error_handler($this->dummyErrorHandler));
+        $errorHandler->stopErrorHandling();
+        $this->assertEquals($this->currentErrorHandler, set_error_handler($this->dummyErrorHandler));
+
+        restore_error_handler();
+    }
+}

test/bootstrap.php

@@ -15,11 +15,6 @@
  */
 require __DIR__ . '/../vendor/autoload.php';
 
-/**
- * Setting the ZendTest\Ldap\ErrorHandler as default ErrorHandler
- */
-Zend\Ldap\ErrorHandler::setErrorHandler(new ZendTest\Ldap\ErrorHandler());
-
 /**
  * Start output buffering, if enabled
  */