[Process] Deprecate ProcessBuilder

nicolas-grekas · nicolas-grekas · commit 201c3bd3f167 · 2017-06-09T15:37:35.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * deprecated the ProcessBuilder class
+
 3.3.0
 -----
 
diff --git a/ProcessBuilder.php b/ProcessBuilder.php
@@ -11,13 +11,17 @@
 
 namespace Symfony\Component\Process;
 
+@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use the Process class instead.', ProcessBuilder::class), E_USER_DEPRECATED);
+
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\Process\Exception\LogicException;
 
 /**
  * Process builder.
  *
  * @author Kris Wallsmith <kris@symfony.com>
+ *
+ * @deprecated since version 3.4, to be removed in 4.0. Use the Process class instead.
  */
 class ProcessBuilder
 {
@@ -120,13 +124,9 @@ public function setWorkingDirectory($cwd)
      * @param bool $inheritEnv
      *
      * @return $this
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
      */
     public function inheritEnvironmentVariables($inheritEnv = true)
     {
-        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
         $this->inheritEnv = $inheritEnv;
 
         return $this;
@@ -221,13 +221,9 @@ public function setTimeout($timeout)
      * @param string $value The option value
      *
      * @return $this
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
      */
     public function setOption($name, $value)
     {
-        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
         $this->options[$name] = $value;
 
         return $this;
diff --git a/Tests/ProcessBuilderTest.php b/Tests/ProcessBuilderTest.php
@@ -14,11 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ProcessBuilder;
 
+/**
+ * @group legacy
+ */
 class ProcessBuilderTest extends TestCase
 {
-    /**
-     * @group legacy
-     */
     public function testInheritEnvironmentVars()
     {
         $proc = ProcessBuilder::create()

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Process\ProcessBuilder;`
`16`	`16`
	`17`	`+/**`
	`18`	`+ * @group legacy`
	`19`	`+ */`
`17`	`20`	`class ProcessBuilderTest extends TestCase`
`18`	`21`	`{`
`19`		`- /**`
`20`		`- * @group legacy`
`21`		`- */`
`22`	`22`	`public function testInheritEnvironmentVars()`
`23`	`23`	`{`
`24`	`24`	`$proc = ProcessBuilder::create()`