minor symfony#17941 [DependencyInjection] Remove unused parameter of private property (paradajozsef)

fabpot · fabpot · commit 248b4cfa7e1f · 2016-02-28T10:55:03.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- [DependencyInjection] Remove unused parameter of private property | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- d5129d2 [DependencyInjection] Remove unused parameter of private property
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -315,7 +315,7 @@ private function addServiceInlinedDefinitions($id, $definition)
                     throw new ServiceCircularReferenceException($id, array($id));
                 }
 
-                $code .= $this->addNewInstance($id, $sDefinition, '$'.$name, ' = ');
+                $code .= $this->addNewInstance($sDefinition, '$'.$name, ' = ');
 
                 if (!$this->hasReference($id, $sDefinition->getMethodCalls(), true) && !$this->hasReference($id, $sDefinition->getProperties(), true)) {
                     $code .= $this->addServiceMethodCalls(null, $sDefinition, $name);
@@ -389,7 +389,7 @@ private function addServiceInstance($id, $definition)
             $instantiation .= ' = ';
         }
 
-        $code = $this->addNewInstance($id, $definition, $return, $instantiation);
+        $code = $this->addNewInstance($definition, $return, $instantiation);
 
         if (!$simple) {
             $code .= "\n";
@@ -676,7 +676,7 @@ private function addServices()
         return $publicServices.$privateServices;
     }
 
-    private function addNewInstance($id, Definition $definition, $return, $instantiation)
+    private function addNewInstance(Definition $definition, $return, $instantiation)
     {
         $class = $this->dumpValue($definition->getClass());
 

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ private function addServiceInlinedDefinitions($id, $definition)`
`315`	`315`	`throw new ServiceCircularReferenceException($id, array($id));`
`316`	`316`	`}`
`317`	`317`
`318`		`- $code .= $this->addNewInstance($id, $sDefinition, '$'.$name, ' = ');`
	`318`	`+ $code .= $this->addNewInstance($sDefinition, '$'.$name, ' = ');`
`319`	`319`
`320`	`320`	`if (!$this->hasReference($id, $sDefinition->getMethodCalls(), true) && !$this->hasReference($id, $sDefinition->getProperties(), true)) {`
`321`	`321`	`$code .= $this->addServiceMethodCalls(null, $sDefinition, $name);`
`@@ -389,7 +389,7 @@ private function addServiceInstance($id, $definition)`
`389`	`389`	`$instantiation .= ' = ';`
`390`	`390`	`}`
`391`	`391`
`392`		`- $code = $this->addNewInstance($id, $definition, $return, $instantiation);`
	`392`	`+ $code = $this->addNewInstance($definition, $return, $instantiation);`
`393`	`393`
`394`	`394`	`if (!$simple) {`
`395`	`395`	`$code .= "\n";`
`@@ -676,7 +676,7 @@ private function addServices()`
`676`	`676`	`return $publicServices.$privateServices;`
`677`	`677`	`}`
`678`	`678`
`679`		`- private function addNewInstance($id, Definition $definition, $return, $instantiation)`
	`679`	`+ private function addNewInstance(Definition $definition, $return, $instantiation)`
`680`	`680`	`{`
`681`	`681`	`$class = $this->dumpValue($definition->getClass());`
`682`	`682`