Skip to content
Permalink
Browse files

Merge branch 'codeguy-4.x-remove-version' into 4.x

Closes #2067
  • Loading branch information...
akrabat committed Nov 26, 2016
2 parents aa2059b + 5f6c3ba commit 172aad20758947766135daa38648c1899229839d
Showing with 2 additions and 9 deletions.
  1. +0 −7 Slim/App.php
  2. +2 −2 tests/Handlers/ErrorTest.php
@@ -45,13 +45,6 @@ class App
{
use MiddlewareAwareTrait;
/**
* Current version
*
* @var string
*/
const VERSION = '3.7.0-dev';
/**
* Container
*
@@ -85,8 +85,8 @@ public function testPreviousException()
$error = $this->getMockBuilder('\Slim\Handlers\Error')->setMethods(['logError'])->getMock();
$error->expects($this->once())->method('logError')->with(
$this->logicalAnd(
$this->stringContains("Type: Exception\nMessage: Second Oops"),
$this->stringContains("Previous Error:\nType: Exception\nMessage: First Oops")
$this->stringContains("Message: Second Oops"),
$this->stringContains("Previous Error:" . PHP_EOL . "Type: Exception" . PHP_EOL . "Message: First Oops")
)
);

0 comments on commit 172aad2

Please sign in to comment.
You can’t perform that action at this time.