Skip to content

Commit cf0fc08

Browse files
fabpotfabpot
committed
removed unneeded var
1 parent 2cd3390 commit cf0fc08

File tree

8 files changed

+26
-29
lines changed

8 files changed

+26
-29
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class PhpDumper extends Dumper
5454
private $variableCount;
5555
private $reservedVariables = array('instance', 'class');
5656
private $expressionLanguage;
57-
private $parameterArgName;
5857

5958
/**
6059
* @var \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface
@@ -106,8 +105,6 @@ public function dump(array $options = array())
106105
'namespace' => '',
107106
), $options);
108107

109-
$this->parameterArgName = 'p'.md5($options['class']);
110-
111108
$code = $this->startClass($options['class'], $options['base_class'], $options['namespace']);
112109

113110
if ($this->container->isFrozen()) {
@@ -807,14 +804,14 @@ private function addConstructor()
807804

808805
$code = <<<EOF
809806
810-
private static \${$this->parameterArgName} = $parameters;
807+
private static \$parameters = $parameters;
811808
812809
/**
813810
* Constructor.
814811
*/
815812
public function __construct()
816813
{
817-
parent::__construct(new ParameterBag(self::\${$this->parameterArgName}));
814+
parent::__construct(new ParameterBag(self::\$parameters));
818815
819816
EOF;
820817

@@ -846,7 +843,7 @@ private function addFrozenConstructor()
846843

847844
$code = <<<EOF
848845
849-
private static \${$this->parameterArgName} = $parameters;
846+
private static \$parameters = $parameters;
850847
851848
/**
852849
* Constructor.
@@ -971,11 +968,11 @@ public function getParameter(\$name)
971968
{
972969
\$name = strtolower(\$name);
973970
974-
if (!(isset(self::\${$this->parameterArgName}[\$name]) || array_key_exists(\$name, self::\${$this->parameterArgName}))) {
971+
if (!(isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters))) {
975972
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
976973
}
977974
978-
return self::\${$this->parameterArgName}[\$name];
975+
return self::\$parameters[\$name];
979976
}
980977
981978
/**
@@ -985,7 +982,7 @@ public function hasParameter(\$name)
985982
{
986983
\$name = strtolower(\$name);
987984
988-
return isset(self::\${$this->parameterArgName}[\$name]) || array_key_exists(\$name, self::\${$this->parameterArgName});
985+
return isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters);
989986
}
990987
991988
/**
@@ -1002,7 +999,7 @@ public function setParameter(\$name, \$value)
1002999
public function getParameterBag()
10031000
{
10041001
if (null === \$this->parameterBag) {
1005-
\$this->parameterBag = new FrozenParameterBag(self::\${$this->parameterArgName});
1002+
\$this->parameterBag = new FrozenParameterBag(self::\$parameters);
10061003
}
10071004
10081005
return \$this->parameterBag;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class Container extends AbstractContainer
1919
{
20-
private static $p0e7278cda02a9c0446dcc75a4df34eb2 = array(
20+
private static $parameters = array(
2121

2222
);
2323

@@ -26,6 +26,6 @@ class Container extends AbstractContainer
2626
*/
2727
public function __construct()
2828
{
29-
parent::__construct(new ParameterBag(self::$p0e7278cda02a9c0446dcc75a4df34eb2));
29+
parent::__construct(new ParameterBag(self::$parameters));
3030
}
3131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020

2121
);
2222

@@ -25,6 +25,6 @@ class ProjectServiceContainer extends Container
2525
*/
2626
public function __construct()
2727
{
28-
parent::__construct(new ParameterBag(self::$pfd16bb2d9829eb444172541e25c08b76));
28+
parent::__construct(new ParameterBag(self::$parameters));
2929
}
3030
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020
'empty_value' => '',
2121
'some_string' => '-',
2222
);
@@ -69,11 +69,11 @@ public function getParameter($name)
6969
{
7070
$name = strtolower($name);
7171

72-
if (!(isset(self::$pfd16bb2d9829eb444172541e25c08b76[$name]) || array_key_exists($name, self::$pfd16bb2d9829eb444172541e25c08b76))) {
72+
if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
7373
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
7474
}
7575

76-
return self::$pfd16bb2d9829eb444172541e25c08b76[$name];
76+
return self::$parameters[$name];
7777
}
7878

7979
/**
@@ -83,7 +83,7 @@ public function hasParameter($name)
8383
{
8484
$name = strtolower($name);
8585

86-
return isset(self::$pfd16bb2d9829eb444172541e25c08b76[$name]) || array_key_exists($name, self::$pfd16bb2d9829eb444172541e25c08b76);
86+
return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
8787
}
8888

8989
/**
@@ -100,7 +100,7 @@ public function setParameter($name, $value)
100100
public function getParameterBag()
101101
{
102102
if (null === $this->parameterBag) {
103-
$this->parameterBag = new FrozenParameterBag(self::$pfd16bb2d9829eb444172541e25c08b76);
103+
$this->parameterBag = new FrozenParameterBag(self::$parameters);
104104
}
105105

106106
return $this->parameterBag;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020

2121
);
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020
'foo' => '%baz%',
2121
'baz' => 'bar',
2222
'bar' => 'foo is %%foo bar',
@@ -38,6 +38,6 @@ class ProjectServiceContainer extends Container
3838
*/
3939
public function __construct()
4040
{
41-
parent::__construct(new ParameterBag(self::$pfd16bb2d9829eb444172541e25c08b76));
41+
parent::__construct(new ParameterBag(self::$parameters));
4242
}
4343
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020
'baz_class' => 'BazClass',
2121
'foo_class' => 'Bar\\FooClass',
2222
'foo' => 'bar',
@@ -27,7 +27,7 @@ class ProjectServiceContainer extends Container
2727
*/
2828
public function __construct()
2929
{
30-
parent::__construct(new ParameterBag(self::$pfd16bb2d9829eb444172541e25c08b76));
30+
parent::__construct(new ParameterBag(self::$parameters));
3131
$this->methodMap = array(
3232
'bar' => 'getBarService',
3333
'baz' => 'getBazService',

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ProjectServiceContainer extends Container
1818
{
19-
private static $pfd16bb2d9829eb444172541e25c08b76 = array(
19+
private static $parameters = array(
2020
'baz_class' => 'BazClass',
2121
'foo_class' => 'Bar\\FooClass',
2222
'foo' => 'bar',
@@ -322,11 +322,11 @@ public function getParameter($name)
322322
{
323323
$name = strtolower($name);
324324

325-
if (!(isset(self::$pfd16bb2d9829eb444172541e25c08b76[$name]) || array_key_exists($name, self::$pfd16bb2d9829eb444172541e25c08b76))) {
325+
if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
326326
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
327327
}
328328

329-
return self::$pfd16bb2d9829eb444172541e25c08b76[$name];
329+
return self::$parameters[$name];
330330
}
331331

332332
/**
@@ -336,7 +336,7 @@ public function hasParameter($name)
336336
{
337337
$name = strtolower($name);
338338

339-
return isset(self::$pfd16bb2d9829eb444172541e25c08b76[$name]) || array_key_exists($name, self::$pfd16bb2d9829eb444172541e25c08b76);
339+
return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
340340
}
341341

342342
/**
@@ -353,7 +353,7 @@ public function setParameter($name, $value)
353353
public function getParameterBag()
354354
{
355355
if (null === $this->parameterBag) {
356-
$this->parameterBag = new FrozenParameterBag(self::$pfd16bb2d9829eb444172541e25c08b76);
356+
$this->parameterBag = new FrozenParameterBag(self::$parameters);
357357
}
358358

359359
return $this->parameterBag;

0 commit comments

Comments
 (0)