Renamed Null log writer to Noop

`null` will be a reserved keyword in PHP 7; this patch renames the `Null` log writer to `Noop` (as it performs a no-op). A later patch will re-define the `Null` writer to extend `Noop` and emit a deprecation notice.
akrabat · Mar 25, 2015 · 7410c83 · 7410c83
1 parent 6972652
commit 7410c83
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/library/Zend/Log/Writer/Null.php → library/Zend/Log/Writer/Noop.php b/library/Zend/Log/Writer/Null.php → library/Zend/Log/Writer/Noop.php
@@ -9,7 +9,7 @@
 
 namespace Zend\Log\Writer;
 
-class Null extends AbstractWriter
+class Noop extends AbstractWriter
 {
     /**
      * Write a message to the log.

diff --git a/library/Zend/Log/WriterPluginManager.php b/library/Zend/Log/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',

diff --git a/tests/ZendTest/Log/LoggerTest.php b/tests/ZendTest/Log/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()

diff --git a/tests/ZendTest/Log/Writer/NullTest.php → tests/ZendTest/Log/Writer/NoopTest.php b/tests/ZendTest/Log/Writer/NullTest.php → tests/ZendTest/Log/Writer/NoopTest.php
@@ -9,16 +9,16 @@
 
 namespace ZendTest\Log\Writer;
 
-use Zend\Log\Writer\Null as NullWriter;
+use Zend\Log\Writer\Noop as NoopWriter;
 
 /**
  * @group      Zend_Log
  */
-class NullTest extends \PHPUnit_Framework_TestCase
+class NoopTest extends \PHPUnit_Framework_TestCase
 {
     public function testWrite()
     {
-        $writer = new NullWriter();
+        $writer = new NoopWriter();
         $writer->write(array('message' => 'foo', 'priority' => 42));
     }
 }