8000 Merge branch '4.0' · symfony/symfony@d2fb4d1 · GitHub
[go: up one dir, main page]
Skip to content

Commit d2fb4d1

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.0'
* 4.0: fix merge
2 parents f601142 + 12c1a01 commit d2fb4d1

4 files changed

+56
-40
lines changed

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
2121
private $parameters;
2222
private $targetDirs = array();
2323

24+
/**
25+
* @internal but protected for BC on cache:clear 8000
26+
*/
27+
protected $privates = array();
28+
2429
public function __construct()
2530
{
2631
parent::__construct();
2732

28-
$this->services = array();
33+
$this->services = $this->privates = array();
2934

3035
$this->aliases = array();
3136
}
3237

33-
public function getRemovedIds()
38+
public function reset()
3439
{
35-
return array(
36-
'Psr\\Container\\ContainerInterface' => true,
37-
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
38-
);
40+
$this->privates = array();
41+
parent::reset();
3942
}
4043

4144
public function compile()
@@ -48,10 +51,11 @@ public function isCompiled()
4851
return true;
4952
}
5053

51-
public function isFrozen()
54+
public function getRemovedIds()
5255
{
53-
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
54-
55-
return true;
56+
return array(
57+
'Psr\\Container\\ContainerInterface' => true,
58+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
59+
);
5660
}
5761
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
2121
private $parameters;
2222
private $targetDirs = array();
2323

24+
/**
25+
* @internal but protected for BC on cache:clear
26+
*/
27+
protected $privates = array();
28+
2429
public function __construct()
2530
{
26-
$this->services = array();
31+
$this->services = $this->privates = array();
2732

2833
$this->aliases = array();
2934
}
3035

31-
public function getRemovedIds()
36+
public function reset()
3237
{
33-
return array(
34-
'Psr\\Container\\ContainerInterface' => true,
35-
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
36-
);
38+
$this->privates = array();
39+
parent::reset();
3740
}
3841

3942
public function compile()
@@ -46,10 +49,11 @@ public function isCompiled()
4649
return true;
4750
}
4851

49-
public function isFrozen()
52+
public function getRemovedIds()
5053
{
51-
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
52-
53-
return true;
54+
return array(
55+
'Psr\\Container\\ContainerInterface' => true,
56+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
57+
);
5458
}
5559
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,24 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
2121
private $parameters;
2222
private $targetDirs = array();
2323

24+
/**
25+
* @internal but protected for BC on cache:clear
26+
*/
27+
protected $privates = array();
28+
2429
public function __construct()
2530
{
2631
parent::__construct();
2732

28-
$this->services = array();
33+
$this->services = $this->privates = array();
2934

3035
$this->aliases = array();
3136
}
3237

33-
public function getRemovedIds()
38+
public function reset()
3439
{
35-
return array(
36-
'Psr\\Container\\ContainerInterface' => true,
37-
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
38-
);
40+
$this->privates = array();
41+
parent::reset();
3942
}
4043

4144
public function compile()
@@ -48,10 +51,11 @@ public function isCompiled()
4851
return true;
4952
}
5053

51-
public function isFrozen()
54+
public function getRemovedIds()
5255
{
53-
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
54-
55-
return true;
56+
return array(
57+
'Psr\\Container\\ContainerInterface' => true,
58+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
59+
);
5660
}
5761
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,22 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
2121
private $parameters;
2222
private $targetDirs = array();
2323

24+
/**
25+
* @internal but protected for BC on cache:clear
26+
*/
27+
protected $privates = array();
28+
2429
public function __construct()
2530
{
26-
$this->services = array();
31+
$this->services = $this->privates = array();
2732

2833
$this->aliases = array();
2934
}
3035

31-
public function getRemovedIds()
36+
public function reset()
3237
{
33-
return array(
34-
'Psr\\Container\\ContainerInterface' => true,
35-
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
36-
);
38+
$this->privates = array();
39+
parent::reset();
3740
}
3841

3942
public function compile()
@@ -46,10 +49,11 @@ public function isCompiled()
4649
return true;
4750
}
4851

49-
public function isFrozen()
52+
public function getRemovedIds()
5053
{
51-
@trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
52-
53-
return true;
54+
return array(
55+
'Psr\\Container\\ContainerInterface' => true,
56+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
57+
);
5458
}
5559
}

0 commit comments

Comments
 (0)
0