Skip to content

Commit baf9949

Browse files
committed
Merge branch '2.5'
* 2.5: (33 commits) [Validator] Added Swedish translations [Validator] Fixed ExpressionValidator when the validation root is not an object [Validator] Fixed: Made it possible (again) to pass a class name to Validator::validatePropertyValue() Fix incorrect romanian plural translations fix axes handling in Crawler::filterXPath() fix some docblocks Fixed self-reference in 'service_container' service breaks garbage collection (and clone). [Process] Fix tests when pcntl is not available. [DependencyInjection] Roll back changes made to generated files. [Console] Roll back changes made to fixture files. Issue #11489 Added some CA and ES translations [Validator] Added more detailed inline documentation [Validator] Removed information from the violation output if the value is an array, object or resource partially reverted previous commit fixed CS Add point about ConsoleLogger to Console 2.5 changelog [Validator] Fixed failing tests [Validator] CS fixes [FrameworkBundle] Made ConstraintValidatorFactory aware of the legacy validators [Validator] Added extensive test coverage for the constraint validators for the different APIs ... Conflicts: src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf
2 parents 6294272 + 22ea629 commit baf9949

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Fragment/FragmentHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function setRequest(Request $request = null)
9797
* @return string|null The Response content or null when the Response is streamed
9898
*
9999
* @throws \InvalidArgumentException when the renderer does not exist
100-
* @throws \LogicException when the Request is not successful
100+
* @throws \LogicException when no master request is being handled
101101
*/
102102
public function render($uri, $renderer = 'inline', array $options = array())
103103
{

Tests/HttpCache/HttpCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ public function testXForwarderForHeaderForPassRequests()
11771177

11781178
public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
11791179
{
1180-
$time = new \DateTime;
1180+
$time = new \DateTime();
11811181

11821182
$responses = array(
11831183
array(

0 commit comments

Comments
 (0)