fixed tests for PHP 5.3
Merge branch '1.2'

* 1.2:
  fixed tests for PHP 5.3

Conflicts:
	tests/Silex/Tests/CallbackServicesTest.php