Merge branch 'feature/7263'

Adds PHP 7 support.

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

src/Writer/Noop.php

@@ -0,0 +1,23 @@
+<?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 Zend\Log\Writer;
+
+class Noop extends AbstractWriter
+{
+    /**
+     * Write a message to the log.
+     *
+     * @param array $event event data
+     * @return void
+     */
+    protected function doWrite(array $event)
+    {
+    }
+}

src/Writer/Null.php

@@ -9,15 +9,27 @@
 
 namespace Zend\Log\Writer;
 
-class Null extends AbstractWriter
+/**
+ * Stub class for backwards compatibility.
+ *
+ * Since PHP 7 adds "null" as a reserved keyword, we can no longer have a class
+ * named that and retain PHP 7 compatibility. The original class has been
+ * renamed to "Noop", and this class is now an extension of it. It raises an
+ * E_USER_DEPRECATED to warn users to migrate.
+ *
+ * @deprecated
+ */
+class Null extends Noop
 {
-    /**
-     * Write a message to the log.
-     *
-     * @param array $event event data
-     * @return void
-     */
-    protected function doWrite(array $event)
+    public function __construct()
     {
+        trigger_error(
+            sprintf(
+                'The class %s has been deprecated; please use %s\\Noop',
+                __CLASS__,
+                __NAMESPACE__
+            ),
+            E_USER_DEPRECATED
+        );
     }
 }

src/WriterPluginManager.php

@@ -13,6 +13,11 @@
 
 class WriterPluginManager extends AbstractPluginManager
 {
+    protected $aliases = array(
+        'null'                 => 'noop',
+        'Zend\Log\Writer\Null' => 'noop',
+    );
+
     /**
      * Default set of writers
      *
@@ -25,7 +30,7 @@ class WriterPluginManager extends AbstractPluginManager
         'firephp'        => 'Zend\Log\Writer\FirePhp',
         'mail'           => 'Zend\Log\Writer\Mail',
         'mock'           => 'Zend\Log\Writer\Mock',
-        'null'           => 'Zend\Log\Writer\Null',
+        'noop'           => 'Zend\Log\Writer\Noop',
         'stream'         => 'Zend\Log\Writer\Stream',
         'syslog'         => 'Zend\Log\Writer\Syslog',
         'zendmonitor'    => 'Zend\Log\Writer\ZendMonitor',

test/LoggerTest.php

@@ -105,7 +105,7 @@ public function testSetWriters()
         $writers = $this->logger->getWriters();
         $this->assertInstanceOf('Zend\Stdlib\SplPriorityQueue', $writers);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Null);
+        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
         $writer = $writers->extract();
         $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
     }
@@ -120,7 +120,7 @@ public function testAddWriterWithPriority()
 
         $this->assertInstanceOf('Zend\Stdlib\SplPriorityQueue', $writers);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Null);
+        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
         $writer = $writers->extract();
         $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
     }
@@ -137,7 +137,7 @@ public function testAddWithSamePriority()
         $writer = $writers->extract();
         $this->assertTrue($writer instanceof \Zend\Log\Writer\Mock);
         $writer = $writers->extract();
-        $this->assertTrue($writer instanceof \Zend\Log\Writer\Null);
+        $this->assertTrue($writer instanceof \Zend\Log\Writer\Noop);
     }
 
     public function testLogging()
@@ -369,7 +369,8 @@ public function testExceptionHandler()
         $this->assertFalse(Logger::registerExceptionHandler($this->logger));
 
         // get the internal exception handler
-        $exceptionHandler = set_exception_handler(function ($e) {});
+        $exceptionHandler = set_exception_handler(function ($e) {
+        });
         set_exception_handler($exceptionHandler);
 
         // reset the exception handler
@@ -443,6 +444,10 @@ public function testErrorHandlerWithStreamWriter()
      */
     public function testRegisterFatalShutdownFunction()
     {
+        if (version_compare(PHP_VERSION, '7', 'ge')) {
+            $this->markTestSkipped('PHP7: cannot test as code now raises E_ERROR');
+        }
+
         $writer = new MockWriter;
         $this->logger->addWriter($writer);
 
@@ -453,14 +458,14 @@ public function testRegisterFatalShutdownFunction()
         $this->assertFalse(Logger::registerFatalErrorShutdownFunction($this->logger));
 
         $self = $this;
-        register_shutdown_function(function () use ($writer, $self) {
+        register_shutdown_function(function () use ($writer, $self, &$caught) {
             $self->assertEquals(
                 'Call to undefined method ZendTest\Log\LoggerTest::callToNonExistingMethod()',
                 $writer->events[0]['message']
             );
         });
 
-        // Temporary hide errors, because we don't want the fatal error to fail the test
+        // Temporarily hide errors, because we don't want the fatal error to fail the test
         @$this->callToNonExistingMethod();
     }
 
@@ -471,6 +476,10 @@ public function testRegisterFatalShutdownFunction()
      */
     public function testRegisterFatalErrorShutdownFunctionHandlesCompileTimeErrors()
     {
+        if (version_compare(PHP_VERSION, '7', 'ge')) {
+            $this->markTestSkipped('PHP7: cannot test as code now raises E_ERROR');
+        }
+
         $writer = new MockWriter;
         $this->logger->addWriter($writer);
 
@@ -481,14 +490,14 @@ public function testRegisterFatalErrorShutdownFunctionHandlesCompileTimeErrors()
         $this->assertFalse(Logger::registerFatalErrorShutdownFunction($this->logger));
 
         $self = $this;
-        register_shutdown_function(function () use ($writer, $self) {
+        register_shutdown_function(function () use ($writer, $self, &$caught) {
             $self->assertStringMatchesFormat(
                 'syntax error%A',
                 $writer->events[0]['message']
             );
         });
 
-        // Temporary hide errors, because we don't want the fatal error to fail the test
+        // Temporarily hide errors, because we don't want the fatal error to fail the test
         @eval('this::code::is::invalid {}');
     }
 
@@ -497,8 +506,10 @@ public function testRegisterFatalErrorShutdownFunctionHandlesCompileTimeErrors()
      */
     public function testCatchExceptionNotValidPriority()
     {
-        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException',
-                                    '$priority must be an integer >= 0 and < 8; received -1');
+        $this->setExpectedException(
+            'Zend\Log\Exception\InvalidArgumentException',
+            '$priority must be an integer >= 0 and < 8; received -1'
+        );
         $writer = new MockWriter();
         $this->logger->addWriter($writer);
         $this->logger->log(-1, 'Foo');

test/Writer/NoopTest.php

@@ -0,0 +1,24 @@
+<?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\Log\Writer;
+
+use Zend\Log\Writer\Noop as NoopWriter;
+
+/**
+ * @group      Zend_Log
+ */
+class NoopTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWrite()
+    {
+        $writer = new NoopWriter();
+        $writer->write(array('message' => 'foo', 'priority' => 42));
+    }
+}

test/Writer/NullTest.php

@@ -16,9 +16,16 @@
  */
 class NullTest extends \PHPUnit_Framework_TestCase
 {
-    public function testWrite()
+    public function setUp()
     {
-        $writer = new NullWriter();
-        $writer->write(array('message' => 'foo', 'priority' => 42));
+        if (version_compare(PHP_VERSION, '7.0', '>=')) {
+            $this->markTestSkipped('Cannot test Null log writer under PHP 7; reserved keyword');
+        }
+    }
+
+    public function testRaisesNoticeOnInstantiation()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        new NullWriter();
     }
 }