Skip to content

Commit d779845

Browse files
TobionTobion
committed
[DI] remove inheritdoc from dumped container
1 parent 2abe788 commit d779845

23 files changed

+0
-336
lines changed

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -899,25 +899,16 @@ public function __construct()
899899
if ($this->container->isCompiled()) {
900900
$code .= <<<EOF
901901
902-
/*{$this->docStar}
903-
* {@inheritdoc}
904-
*/
905902
public function compile()
906903
{
907904
throw new LogicException('You cannot compile a dumped container that was already compiled.');
908905
}
909906
910-
/*{$this->docStar}
911-
* {@inheritdoc}
912-
*/
913907
public function isCompiled()
914908
{
915909
return true;
916910
}
917911
918-
/*{$this->docStar}
919-
* {@inheritdoc}
920-
*/
921912
public function isFrozen()
922913
{
923914
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -931,9 +922,6 @@ public function isFrozen()
931922
if ($this->asFiles) {
932923
$code .= <<<EOF
933924
934-
/*{$this->docStar}
935-
* {@inheritdoc}
936-
*/
937925
protected function load(\$file, \$lazyLoad = true)
938926
{
939927
return require \$file;
@@ -1125,9 +1113,6 @@ private function addDefaultParametersMethod()
11251113
if ($this->container->isCompiled()) {
11261114
$code .= <<<'EOF'
11271115
1128-
/**
1129-
* {@inheritdoc}
1130-
*/
11311116
public function getParameter($name)
11321117
{
11331118
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -1144,27 +1129,18 @@ public function getParameter($name)
11441129
return $this->parameters[$name];
11451130
}
11461131
1147-
/**
1148-
* {@inheritdoc}
1149-
*/
11501132
public function hasParameter($name)
11511133
{
11521134
$name = $this->normalizeParameterName($name);
11531135
11541136
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
11551137
}
11561138
1157-
/**
1158-
* {@inheritdoc}
1159-
*/
11601139
public function setParameter($name, $value)
11611140
{
11621141
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
11631142
}
11641143
1165-
/**
1166-
* {@inheritdoc}
1167-
*/
11681144
public function getParameterBag()
11691145
{
11701146
if (null === $this->parameterBag) {
@@ -1179,9 +1155,6 @@ public function getParameterBag()
11791155
}
11801156

11811157
EOF;
1182-
if ('' === $this->docStar) {
1183-
$code = str_replace('/**', '/*', $code);
1184-
}
11851158

11861159
if ($dynamicPhp) {
11871160
$loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, count($dynamicPhp), false)), '', 8);

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,16 @@ public function __construct()
2828
$this->aliases = array();
2929
}
3030

31-
/**
32-
* {@inheritdoc}
33-
*/
3431
public function compile()
3532
{
3633
throw new LogicException('You cannot compile a dumped container that was already compiled.');
3734
}
3835

39-
/**
40-
* {@inheritdoc}
41-
*/
4236
public function isCompiled()
4337
{
4438
return true;
4539
}
4640

47-
/**
48-
* {@inheritdoc}
49-
*/
5041
public function isFrozen()
5142
{
5243
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,16 @@ public function __construct()
2626
$this->aliases = array();
2727
}
2828

29-
/**
30-
* {@inheritdoc}
31-
*/
3229
public function compile()
3330
{
3431
throw new LogicException('You cannot compile a dumped container that was already compiled.');
3532
}
3633

37-
/**
38-
* {@inheritdoc}
39-
*/
4034
public function isCompiled()
4135
{
4236
return true;
4337
}
4438

45-
/**
46-
* {@inheritdoc}
47-
*/
4839
public function isFrozen()
4940
{
5041
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,16 @@ public function __construct()
3131
$this->aliases = array();
3232
}
3333

34-
/**
35-
* {@inheritdoc}
36-
*/
3734
public function compile()
3835
{
3936
throw new LogicException('You cannot compile a dumped container that was already compiled.');
4037
}
4138

42-
/**
43-
* {@inheritdoc}
44-
*/
4539
public function isCompiled()
4640
{
4741
return true;
4842
}
4943

50-
/**
51-
* {@inheritdoc}
52-
*/
5344
public function isFrozen()
5445
{
5546
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -67,9 +58,6 @@ protected function getTestService()
6758
return $this->services['test'] = new \stdClass(array('only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end'));
6859
}
6960

70-
/**
71-
* {@inheritdoc}
72-
*/
7361
public function getParameter($name)
7462
{
7563
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -86,27 +74,18 @@ public function getParameter($name)
8674
return $this->parameters[$name];
8775
}
8876

89-
/**
90-
* {@inheritdoc}
91-
*/
9277
public function hasParameter($name)
9378
{
9479
$name = $this->normalizeParameterName($name);
9580

9681
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
9782
}
9883

99-
/**
100-
* {@inheritdoc}
101-
*/
10284
public function setParameter($name, $value)
10385
{
10486
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
10587
}
10688

107-
/**
108-
* {@inheritdoc}
109-
*/
11089
public function getParameterBag()
11190
{
11291
if (null === $this->parameterBag) {

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,16 @@ public function __construct()
3535
$this->aliases = array();
3636
}
3737

38-
/**
39-
* {@inheritdoc}
40-
*/
4138
public function compile()
4239
{
4340
throw new LogicException('You cannot compile a dumped container that was already compiled.');
4441
}
4542

46-
/**
47-
* {@inheritdoc}
48-
*/
4943
public function isCompiled()
5044
{
5145
return true;
5246
}
5347

54-
/**
55-
* {@inheritdoc}
56-
*/
5748
public function isFrozen()
5849
{
5950
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);
@@ -71,9 +62,6 @@ protected function getTestService()
7162
return $this->services['test'] = new \stdClass(('wiz'.$this->targetDirs[1]), array(('wiz'.$this->targetDirs[1]) => ($this->targetDirs[2].'/')));
7263
}
7364

74-
/**
75-
* {@inheritdoc}
76-
*/
7765
public function getParameter($name)
7866
{
7967
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
@@ -90,27 +78,18 @@ public function getParameter($name)
9078
return $this->parameters[$name];
9179
}
9280

93-
/**
94-
* {@inheritdoc}
95-
*/
9681
public function hasParameter($name)
9782
{
9883
$name = $this->normalizeParameterName($name);
9984

10085
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
10186
}
10287

103-
/**
104-
* {@inheritdoc}
105-
*/
10688
public function setParameter($name, $value)
10789
{
10890
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
10991
}
11092

111-
/**
112-
* {@inheritdoc}
113-
*/
11493
public function getParameterBag()
11594
{
11695
if (null === $this->parameterBag) {

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,16 @@ public function __construct()
2929
$this->aliases = array();
3030
}
3131

32-
/**
33-
* {@inheritdoc}
34-
*/
3532
public function compile()
3633
{
3734
throw new LogicException('You cannot compile a dumped container that was already compiled.');
3835
}
3936

40-
/**
41-
* {@inheritdoc}
42-
*/
4337
public function isCompiled()
4438
{
4539
return true;
4640
}
4741

48-
/**
49-
* {@inheritdoc}
50-
*/
5142
public function isFrozen()
5243
{
5344
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,16 @@ public function __construct()
3030
$this->aliases = array();
3131
}
3232

33-
/**
34-
* {@inheritdoc}
35-
*/
3633
public function compile()
3734
{
3835
throw new LogicException('You cannot compile a dumped container that was already compiled.');
3936
}
4037

41-
/**
42-
* {@inheritdoc}
43-
*/
4438
public function isCompiled()
4539
{
4640
return true;
4741
}
4842

49-
/**
50-
* {@inheritdoc}
51-
*/
5243
public function isFrozen()
5344
{
5445
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,16 @@ public function __construct()
2929
$this->aliases = array();
3030
}
3131

32-
/**
33-
* {@inheritdoc}
34-
*/
3532
public function compile()
3633
{
3734
throw new LogicException('You cannot compile a dumped container that was already compiled.');
3835
}
3936

40-
/**
41-
* {@inheritdoc}
42-
*/
4337
public function isCompiled()
4438
{
4539
return true;
4640
}
4741

48-
/**
49-
* {@inheritdoc}
50-
*/
5142
public function isFrozen()
5243
{
5344
@trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy