Merge pull request #1 from php5friends/development

Use preg_quote and assertRegexp()

Author: zonuexe

tests/Framework/ConstraintTest.php

@@ -884,9 +884,11 @@ public function testConstraintIsEqual2($expected, $actual, $message)
         try {
             $constraint->evaluate($actual, 'custom message');
         } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertEquals(
-              "custom message\n$message",
-              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+            // absorb the difference in the number of newlines
+            $pattern = preg_replace('/^@@ @@/mu', '*@@ @@', preg_quote($message, '/'));
+            $this->assertRegexp(
+                "/\Acustom message\n{$pattern}\z/",
+                $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;