Skip to content

Commit 5741aaa

Browse files
Merge branch '2.8' into 3.1
* 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 6e4f331 + 0552fbf commit 5741aaa

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

Compiler/ServiceReferenceGraphEdge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceRefere
3939
/**
4040
* Returns the value of the edge.
4141
*
42-
* @return ServiceReferenceGraphNode
42+
* @return string
4343
*/
4444
public function getValue()
4545
{

Tests/ContainerTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,18 @@ public function testGetCircularReference()
208208
}
209209
}
210210

211+
/**
212+
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
213+
* @expectedExcepionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
214+
*/
215+
public function testGetSyntheticServiceAlwaysThrows()
216+
{
217+
require_once __DIR__.'/Fixtures/php/services9.php';
218+
219+
$container = new \ProjectServiceContainer();
220+
$container->get('request', ContainerInterface::NULL_ON_INVALID_REFERENCE);
221+
}
222+
211223
public function testHas()
212224
{
213225
$sc = new ProjectServiceContainer();

Tests/Dumper/PhpDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function testConflictingMethodsWithParent()
189189

190190
/**
191191
* @dataProvider provideInvalidFactories
192-
* @expectedException Symfony\Component\DependencyInjection\Exception\RuntimeException
192+
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
193193
* @expectedExceptionMessage Cannot dump definition
194194
*/
195195
public function testInvalidFactories($factory)

0 commit comments

Comments
 (0)