diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Removed deprecated setting private/pre-defined services

Browse Source
This commit is contained in:
Roland Franssen 2017-05-20 15:15:17 +02:00
parent 344c8bb106
commit 9f969529f0
4 changed files with 39 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/CHANGELOG.md
View File

@ -19,6 +19,8 @@ CHANGELOG
* removed `ContainerBuilder::addClassResource()`, use the `addObjectResource()` or the `getReflectionClass()` method instead. * removed `ContainerBuilder::addClassResource()`, use the `addObjectResource()` or the `getReflectionClass()` method instead.
* removed support for top-level anonymous services * removed support for top-level anonymous services
* removed silent behavior for unused attributes and elements * removed silent behavior for unused attributes and elements
* removed support for setting and accessing private services in `Container`
* removed support for setting pre-defined services in `Container`
3.4.0 3.4.0
----- -----

37
src/Symfony/Component/DependencyInjection/Container.php
View File

@ -151,30 +151,25 @@ class Container implements ResettableContainerInterface
throw new InvalidArgumentException('You cannot set service "service_container".'); throw new InvalidArgumentException('You cannot set service "service_container".');
} }
if (isset($this->privates[$id])) {
throw new InvalidArgumentException(sprintf('You cannot set the private service "%s".', $id));
}
if (isset($this->methodMap[$id])) {
throw new InvalidArgumentException(sprintf('You cannot set the pre-defined service "%s".', $id));
}
if (isset($this->aliases[$id])) { if (isset($this->aliases[$id])) {
unset($this->aliases[$id]); unset($this->aliases[$id]);
} }
$this->services[$id] = $service;
if (null === $service) { if (null === $service) {
unset($this->services[$id]); unset($this->services[$id]);
return;
} }
if (isset($this->privates[$id])) { $this->services[$id] = $service;
if (null === $service) {
@trigger_error(sprintf('Unsetting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
unset($this->privates[$id]);
} else {
@trigger_error(sprintf('Setting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
}
} elseif (isset($this->methodMap[$id])) {
if (null === $service) {
@trigger_error(sprintf('Unsetting the "%s" pre-defined service is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
} else {
@trigger_error(sprintf('Setting the "%s" pre-defined service is deprecated since Symfony 3.3 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
}
}
} }
/** /**
@ -187,7 +182,7 @@ class Container implements ResettableContainerInterface
public function has($id) public function has($id)
{ {
if (isset($this->privates[$id])) { if (isset($this->privates[$id])) {
@trigger_error(sprintf('Checking for the existence of the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED); return false;
} }
if ('service_container' === $id) { if ('service_container' === $id) {
return true; return true;
@ -226,7 +221,11 @@ class Container implements ResettableContainerInterface
public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
{ {
if (isset($this->privates[$id])) { if (isset($this->privates[$id])) {
@trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED); if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
throw new ServiceNotFoundException($id);
}
return;
} }
if ('service_container' === $id) { if ('service_container' === $id) {
return $this; return $this;
@ -295,7 +294,7 @@ class Container implements ResettableContainerInterface
} }
if (isset($this->privates[$id])) { if (isset($this->privates[$id])) {
@trigger_error(sprintf('Checking for the initialization of the "%s" private service is deprecated since Symfony 3.4 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED); return false;
} }
if (isset($this->aliases[$id])) { if (isset($this->aliases[$id])) {

61
src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
View File

@ -147,6 +147,7 @@ class ContainerTest extends TestCase
public function testSetWithNullResetTheService() public function testSetWithNullResetTheService()
{ {
$sc = new Container(); $sc = new Container();
$sc->set('foo', new \stdClass());
$sc->set('foo', null); $sc->set('foo', null);
$this->assertFalse($sc->has('foo'), '->set() with null service resets the service'); $this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
} }
@ -159,22 +160,6 @@ class ContainerTest extends TestCase
$this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias'); $this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias');
} }
/**
* @group legacy
* @expectedDeprecation Unsetting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
*/
public function testSetWithNullResetPredefinedService()
{
$sc = new Container();
$sc->set('foo', new \stdClass());
$sc->set('foo', null);
$this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
$sc = new ProjectServiceContainer();
$sc->set('bar', null);
$this->assertTrue($sc->has('bar'), '->set() with null service resets the pre-defined service');
}
public function testGet() public function testGet()
{ {
$sc = new ProjectServiceContainer(); $sc = new ProjectServiceContainer();
@ -275,15 +260,11 @@ class ContainerTest extends TestCase
$this->assertTrue($sc->initialized('alias'), '->initialized() returns true for alias if aliased service is initialized'); $this->assertTrue($sc->initialized('alias'), '->initialized() returns true for alias if aliased service is initialized');
} }
/**
* @group legacy
* @expectedDeprecation Checking for the initialization of the "internal" private service is deprecated since Symfony 3.4 and won't be supported anymore in Symfony 4.0.
*/
public function testInitializedWithPrivateService() public function testInitializedWithPrivateService()
{ {
$sc = new ProjectServiceContainer(); $sc = new ProjectServiceContainer();
$sc->get('internal_dependency'); $sc->get('internal_dependency');
$this->assertTrue($sc->initialized('internal')); $this->assertFalse($sc->initialized('internal'));
} }
public function testReset() public function testReset()
@ -360,42 +341,37 @@ class ContainerTest extends TestCase
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedDeprecation Unsetting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0. * @expectedExceptionMessage You cannot set the private service "internal".
*/ */
public function testUnsetInternalPrivateServiceIsDeprecated() public function testUnsetInternalPrivateService()
{ {
$c = new ProjectServiceContainer(); $c = new ProjectServiceContainer();
$c->set('internal', null); $c->set('internal', null);
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedDeprecation Setting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0. * @expectedExceptionMessage You cannot set the private service "internal".
*/ */
public function testChangeInternalPrivateServiceIsDeprecated() public function testChangeInternalPrivateService()
{ {
$c = new ProjectServiceContainer(); $c = new ProjectServiceContainer();
$c->set('internal', $internal = new \stdClass()); $c->set('internal', new \stdClass());
$this->assertSame($c->get('internal'), $internal);
} }
/** public function testCheckExistenceOfAnInternalPrivateService()
* @group legacy
* @expectedDeprecation Checking for the existence of the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0.
*/
public function testCheckExistenceOfAnInternalPrivateServiceIsDeprecated()
{ {
$c = new ProjectServiceContainer(); $c = new ProjectServiceContainer();
$c->get('internal_dependency'); $c->get('internal_dependency');
$this->assertTrue($c->has('internal')); $this->assertFalse($c->has('internal'));
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
* @expectedDeprecation Requesting the "internal" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0. * @expectedExceptionMessage You have requested a non-existent service "internal".
*/ */
public function testRequestAnInternalSharedPrivateServiceIsDeprecated() public function testRequestAnInternalSharedPrivateService()
{ {
$c = new ProjectServiceContainer(); $c = new ProjectServiceContainer();
$c->get('internal_dependency'); $c->get('internal_dependency');
@ -403,16 +379,13 @@ class ContainerTest extends TestCase
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0. * @expectedExceptionMessage You cannot set the pre-defined service "bar".
*/ */
public function testReplacingAPreDefinedServiceIsDeprecated() public function testReplacingAPreDefinedService()
{ {
$c = new ProjectServiceContainer(); $c = new ProjectServiceContainer();
$c->set('bar', new \stdClass()); $c->set('bar', new \stdClass());
$c->set('bar', $bar = new \stdClass());
$this->assertSame($bar, $c->get('bar'), '->set() replaces a pre-defined service');
} }
} }

23
src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
View File

@ -267,8 +267,8 @@ class PhpDumperTest extends TestCase
} }
/** /**
* @group legacy * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0. * @expectedExceptionMessage You cannot set the pre-defined service "bar".
*/ */
public function testOverrideServiceWhenUsingADumpedContainer() public function testOverrideServiceWhenUsingADumpedContainer()
{ {
@ -277,25 +277,6 @@ class PhpDumperTest extends TestCase
$container = new \ProjectServiceContainer(); $container = new \ProjectServiceContainer();
$container->set('bar', $bar = new \stdClass()); $container->set('bar', $bar = new \stdClass());
$container->setParameter('foo_bar', 'foo_bar');
$this->assertSame($bar, $container->get('bar'), '->set() overrides an already defined service');
}
/**
* @group legacy
* @expectedDeprecation Setting the "bar" pre-defined service is deprecated since Symfony 3.3 and won't be supported anymore in Symfony 4.0.
*/
public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFromAnotherOne()
{
require_once self::$fixturesPath.'/php/services9.php';
require_once self::$fixturesPath.'/includes/foo.php';
require_once self::$fixturesPath.'/includes/classes.php';
$container = new \ProjectServiceContainer();
$container->set('bar', $bar = new \stdClass());
$this->assertSame($bar, $container->get('foo')->bar, '->set() overrides an already defined service');
} }
/** /**