Merge branch 'hotfix/1' into develop

Forward port #1
zendframework · Jul 6, 2015 · 622280b · 622280b
2 parents d0fc9fc + c805b77
commit 622280b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,3 +40,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#4](https://github.com/zendframework/zend-log/pull/4) adds better, more
   complete verbiage to the `composer.json` `suggest` section, to detail why
   and when you might need additional dependencies.
+- [#1](https://github.com/zendframework/zend-log/pull/1) updates the code to
+  remove conditionals related to PHP versions prior to PHP 5.5, and use bound
+  closures in tests (not possible before 5.5).
diff --git a/src/Processor/Backtrace.php b/src/Processor/Backtrace.php
@@ -66,10 +66,6 @@ public function process(array $event)
      */
     protected function getBacktrace()
     {
-        if (PHP_VERSION_ID >= 50400) {
-            return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $this->traceLimit);
-        }
-
-        return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $this->traceLimit);
     }
 }
diff --git a/src/Processor/RequestId.php b/src/Processor/RequestId.php
@@ -53,9 +53,7 @@ protected function getIdentifier()
             return $this->identifier;
         }
 
-        $requestTime = (PHP_VERSION_ID >= 50400)
-                     ? $_SERVER['REQUEST_TIME_FLOAT']
-                     : $_SERVER['REQUEST_TIME'];
+        $requestTime = $_SERVER['REQUEST_TIME_FLOAT'];
 
         if (Console::isConsole()) {
             $this->identifier = md5($requestTime);

diff --git a/test/LoggerAwareTraitTest.php b/test/LoggerAwareTraitTest.php
@@ -12,9 +12,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Log\Logger;
 
-/**
- * @requires PHP 5.4
- */
 class LoggerAwareTraitTest extends TestCase
 {
     public function testSetLogger()

diff --git a/test/LoggerTest.php b/test/LoggerTest.php
@@ -457,9 +457,8 @@ public function testRegisterFatalShutdownFunction()
         // check for single error handler instance
         $this->assertFalse(Logger::registerFatalErrorShutdownFunction($this->logger));
 
-        $self = $this;
-        register_shutdown_function(function () use ($writer, $self, &$caught) {
-            $self->assertEquals(
+        register_shutdown_function(function () use ($writer) {
+            $this->assertEquals(
                 'Call to undefined method ZendTest\Log\LoggerTest::callToNonExistingMethod()',
                 $writer->events[0]['message']
             );
@@ -489,9 +488,8 @@ public function testRegisterFatalErrorShutdownFunctionHandlesCompileTimeErrors()
         // check for single error handler instance
         $this->assertFalse(Logger::registerFatalErrorShutdownFunction($this->logger));
 
-        $self = $this;
-        register_shutdown_function(function () use ($writer, $self, &$caught) {
-            $self->assertStringMatchesFormat(
+        register_shutdown_function(function () use ($writer) {
+            $this->assertStringMatchesFormat(
                 'syntax error%A',
                 $writer->events[0]['message']
             );