Skip to content

Commit 83cb5aa

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Fix: Adjust DocBlock \"ParserTest->getParserTestData()\" -> only some more tests [Lock] Pedantic improvements for lock [EventDispatcher] Fixed phpdoc on interface update year in license files [Console] Fix help text for single command applications Fix random test failure on lock improve error message when using test client without the BrowserKit component [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset. Fixed minor typos Fix: Method can also return null [Stopwatch] Fixed phpdoc for category name
2 parents da0d229 + 83dc224 commit 83cb5aa

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

RegistryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getEntityManagers();
5252
* it makes sense to get a new one to replace the closed one.
5353
*
5454
* Be warned that you will get a brand new entity manager as
55-
* the existing one is not useable anymore. This means that any
55+
* the existing one is not usable anymore. This means that any
5656
* other object with a dependency on this entity manager will
5757
* hold an obsolete reference. You can inject the registry instead
5858
* to avoid this problem.

Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
6464
);
6565

6666
$bundles = array(
67-
'FristBundle' => 'My\FristBundle',
67+
'FirstBundle' => 'My\FirstBundle',
6868
'SecondBundle' => 'My\SecondBundle',
6969
);
7070

@@ -98,7 +98,7 @@ public function getAutomappingData()
9898
array(),
9999
array(
100100
'mappings' => array(
101-
'FristBundle' => array(
101+
'FirstBundle' => array(
102102
'mapping' => true,
103103
'is_bundle' => true,
104104
),
@@ -132,7 +132,7 @@ public function getAutomappingData()
132132
),
133133
array(
134134
'mappings' => array(
135-
'FristBundle' => array(
135+
'FirstBundle' => array(
136136
'mapping' => true,
137137
'is_bundle' => true,
138138
),
@@ -153,7 +153,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
153153
);
154154

155155
$bundles = array(
156-
'FristBundle' => 'My\FristBundle',
156+
'FirstBundle' => 'My\FirstBundle',
157157
'SecondBundle' => 'My\SecondBundle',
158158
);
159159

0 commit comments

Comments
 (0)