Skip to content

Commit fafcbc4

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: [Locale] added support for the position argument to NumberFormatter::parse() [Locale] added some more stubs for the number formatter [Yaml] fixed typo [Yaml] fixed a test on PHP < 5.4 [DomCrawler]Crawler guess charset from html fixed PHP 5.3 compatibility [Yaml] reverted previous merge partially (refs #8897) [Security] remove unused logger [Security] fix typo [Yaml] Fixed filename in the ParseException message Conflicts: src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Locale/Stub/StubNumberFormatter.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
2 parents 8a6b09e + 53c7b14 commit fafcbc4

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Resources/config/security_listeners.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@
206206
<argument type="service" id="security.access.decision_manager" />
207207
<argument type="service" id="security.access_map" />
208208
<argument type="service" id="security.authentication.manager" />
209-
<argument type="service" id="logger" on-invalid="null" />
210209
</service>
211210
</services>
212211
</container>

0 commit comments

Comments
 (0)