Merge branch '1.2'

* 1.2:
  fixed tests for PHP 5.3

Conflicts:
	tests/Silex/Tests/CallbackServicesTest.php

tests/Silex/Tests/CallbackServicesTest.php

@@ -31,7 +31,7 @@ class CallbackServicesTest extends \PHPUnit_Framework_TestCase
         $app->register(new ServiceControllerServiceProvider());
 
         $app['service'] = function () {
-            return new self();
+            return new CallbackServicesTest();
         };
 
         $app->before('service:beforeApp');