Merge branch 'feature/7263'

Adds PHP 7 support.

Close zendframework/zendframework#7366
Fixes zendframework/zendframework#7270
Fixes zendframework/zendframework#7263

test/DiCompatibilityTest.php

@@ -9,6 +9,9 @@
 
 namespace ZendTest\Di;
 
+use BadMethodCallException;
+use Exception;
+use PHPUnit_Framework_Error;
 use Zend\Di\Config;
 use Zend\Di\Di;
 
@@ -41,7 +44,7 @@ public function providesSimpleClasses()
         return array(
             array('Zend\Di\Di'),
             array('Zend\EventManager\EventManager'),
-            array('Zend\Filter\Null'),
+            array('Zend\Filter\ToNull'),
             array('Zend\Form\Form'),
             array('Zend\Log\Logger'),
             array('Zend\Stdlib\SplStack'),
@@ -53,13 +56,34 @@ public function providesSimpleClasses()
      *
      * error: Missing argument 1 for $class::__construct()
      * @dataProvider providesClassWithConstructionParameters
-     * @expectedException PHPUnit_Framework_Error
      * @param string $class
      */
     public function testRaiseErrorMissingConstructorRequiredParameter($class)
     {
-        $bareObject = new $class;
-        $this->assertInstanceOf($class, $bareObject, 'Test instantiate simple');
+        if (version_compare(PHP_VERSION, '7', '>=')) {
+            $this->markTestSkipped('Errors have changed to E_FATAL, no longer allowing test to run');
+        }
+
+        $phpunit = $this;
+        $caught  = false;
+        set_error_handler(function ($errno, $errstr) use ($phpunit, &$caught) {
+            if ($errno === E_WARNING && 0 !== strpos($errstr, 'Missing argument')) {
+                $phpunit->fail('Unexpected error caught during instantiation');
+                return false;
+            }
+
+            throw new BadMethodCallException('TRAPPED');
+        }, E_WARNING|E_RECOVERABLE_ERROR);
+        try {
+            $bareObject = new $class;
+        } catch (Exception $e) {
+            if ($e instanceof PHPUnit_Framework_Error
+                || ($e instanceof BadMethodCallException && $e->getMessage() === 'TRAPPED')
+            ) {
+                $caught = true;
+            }
+        }
+        $this->assertTrue($caught);
     }
 
     /**