merged branch srsbiz/master (PR #574)

This PR was squashed before being merged into the master branch (closes #574).

Commits
-------

8c2b5755 OS independent regexp in Monolog test case

Discussion
----------

OS independent regexp in Monolog test case

Minor correction to make this test case pass on Windows

---------------------------------------------------------------------------

by igorw at 2013-01-05T17:11:05Z

Maybe just change the test to check for `very bad error` - seems less messy.

---------------------------------------------------------------------------

by davedevelopment at 2013-01-06T20:59:30Z

Or just .* the whole path up to the filename

---------------------------------------------------------------------------

by igorw at 2013-01-06T23:46:14Z

👍

---------------------------------------------------------------------------

by igorw at 2013-02-05T12:51:31Z

Can we get this merged please? We now have other PRs like #614 duplicating this effort.

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -97,7 +97,7 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
         $request = Request::create('/error');
         $app->handle($request);
 
-        $pattern = "#RuntimeException: very bad error \(uncaught exception\) at .*Silex/Tests/Provider/MonologServiceProviderTest\.php line \d+#";
+        $pattern = "#RuntimeException: very bad error \(uncaught exception\) at .* line \d+#";
         $this->assertMatchingRecord($pattern, Logger::CRITICAL, $app['monolog.handler']);
     }