bug #27902 Fix the detection of the Process new argument (stof)

nicolas-grekas · nicolas-grekas · commit 0fcc874e6feb · 2018-07-09T14:30:57.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix the detection of the Process new argument | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This fixes the detection of the new method signature when triggering the deprecation warning. The new `$env` parameter is the second argument, not the first one. Commits ------- 57e95f3 Fix the detection of the Process new argument
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -272,7 +272,7 @@ public function start(callable $callback = null/*, array $env = array()*/)
         } else {
             if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
-                if (__CLASS__ !== $r->getDeclaringClass()->getName() && (2 > $r->getNumberOfParameters() || 'env' !== $r->getParameters()[0]->name)) {
+                if (__CLASS__ !== $r->getDeclaringClass()->getName() && (2 > $r->getNumberOfParameters() || 'env' !== $r->getParameters()[1]->name)) {
                     @trigger_error(sprintf('The %s::start() method expects a second "$env" argument since Symfony 3.3. It will be made mandatory in 4.0.', static::class), E_USER_DEPRECATED);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public function start(callable $callback = null/, array $env = array()/)`
`272`	`272`	`} else {`
`273`	`273`	`if (__CLASS__ !== static::class) {`
`274`	`274`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`275`		`- if (__CLASS__ !== $r->getDeclaringClass()->getName() && (2 > $r->getNumberOfParameters() \|\| 'env' !== $r->getParameters()[0]->name)) {`
	`275`	`+ if (__CLASS__ !== $r->getDeclaringClass()->getName() && (2 > $r->getNumberOfParameters() \|\| 'env' !== $r->getParameters()[1]->name)) {`
`276`	`276`	`@trigger_error(sprintf('The %s::start() method expects a second "$env" argument since Symfony 3.3. It will be made mandatory in 4.0.', static::class), E_USER_DEPRECATED);`
`277`	`277`	`}`
`278`	`278`	`}`