Permalink
Browse files

Merge branch 'hotfix/4700' into develop

Forward port #4700
  • Loading branch information...
2 parents 597d87e + c9b7da5 commit 957d278e0595e2fae06c709e73d707e75ae464c0 @weierophinney weierophinney committed Jul 18, 2013
Showing with 20 additions and 12 deletions.
  1. +0 −4 .travis.yml
  2. +20 −8 tests/ZendTest/Log/Formatter/BaseTest.php
View
@@ -6,10 +6,6 @@ php:
- 5.4
- 5.5
-matrix:
- allow_failures:
- - php: 5.5
-
before_install:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
@@ -138,14 +138,26 @@ public function testFormatNoInfiniteLoopOnSelfReferencingArrayValues()
'selfRefArr' => $selfRefArr,
),
);
- $outputExpected = array(
- 'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
- 'priority' => 1,
- 'message' => 'tottakai',
- 'extra' => array(
- 'selfRefArr' => '{"selfRefArr":{"selfRefArr":null}}',
- ),
- );
+
+ if (version_compare(PHP_VERSION, '5.5.0alpha1', 'lte')) {
+ $outputExpected = array(
+ 'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
+ 'priority' => 1,
+ 'message' => 'tottakai',
+ 'extra' => array(
+ 'selfRefArr' => '{"selfRefArr":{"selfRefArr":null}}',
+ ),
+ );
+ } else {
+ $outputExpected = array(
+ 'timestamp' => $datetime->format($formatter->getDateTimeFormat()),
+ 'priority' => 1,
+ 'message' => 'tottakai',
+ 'extra' => array(
+ 'selfRefArr' => '',
+ ),
+ );
+ }
$this->assertEquals($outputExpected, $formatter->format($event));
}

0 comments on commit 957d278

Please sign in to comment.