Skip to content

Commit 25dfde5

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: (22 commits) 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. [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 properly handle null data when denormalizing [Validator] Renamed valueToString() to formatValue(); added missing formatValue() calls [Validator] Fixed CS [Validator] Fixed date-to-string conversion tests to match ICU 51 [Validator] Added "{{ value }}" parameters where they were missing [Validator] Simplified and explained the LuhnValidator [Validator] Simplified IssnValidator [Validator] Fixed and simplified IsbnValidator [Validator] Simplified IBAN validation algorithm ... Conflicts: src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php src/Symfony/Component/Validator/Constraints/CollectionValidator.php src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
2 parents 28666d5 + be3c911 commit 25dfde5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Debug/TraceableEventDispatcher.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,9 @@ public function preListenerCall($eventName, $eventId, $listener)
252252
/**
253253
* Returns information about the listener
254254
*
255-
* @param object $listener The listener
256-
* @param string $eventName The event name
255+
* @param object $listener The listener
256+
* @param int|null $eventId The event id
257+
* @param string $eventName The event name
257258
*
258259
* @return array Information about the listener
259260
*/

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)