Skip to content

Commit 0821f3a

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: Fix some annotates [FrameworkBundle] made sure that the debug event dispatcher is used everywhere [HttpKernel] remove unneeded strtoupper updated the composer install command to reflect changes in Composer Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/README.md src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
2 parents 457ba76 + b7bcde9 commit 0821f3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Encoder/XmlEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function getRootNodeName()
148148
}
149149

150150
/**
151-
* @param DOMNode $node
151+
* @param \DOMNode $node
152152
* @param string $val
153153
*
154154
* @return Boolean

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ Resources
1111
You can run the unit tests with the following command:
1212

1313
$ cd path/to/Symfony/Component/Serializer/
14-
$ composer.phar install --dev
14+
$ composer.phar install
1515
$ phpunit

0 commit comments

Comments
 (0)