[Process] added a deprecation notice

fabpot · fabpot · commit 5bce1d393d8a · 2015-02-05T09:19:53.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1108,11 +1108,13 @@ public function setStdin($stdin)
      *
      * This content will be passed to the underlying process standard input.
      *
-     * @param string|null $input The content
+     * @param mixed $input The content
      *
      * @return self The current Process instance
      *
      * @throws LogicException In case the process is running
+     *
+     * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
      */
     public function setInput($input)
     {
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -167,13 +167,13 @@ public function addEnvironmentVariables(array $variables)
     /**
      * Sets the input of the process.
      *
-     * Deprecation: As of Symfony 2.5, this method only accepts string values.
-     *
-     * @param string|null $input The input as a string
+     * @param mixed $input The input as a string
      *
      * @return ProcessBuilder
      *
      * @throws InvalidArgumentException In case the argument is invalid
+     *
+     * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
      */
     public function setInput($input)
     {
diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php
@@ -83,6 +83,8 @@ public static function escapeArgument($argument)
      * @return string The validated input
      *
      * @throws InvalidArgumentException In case the input is not valid
+     *
+     * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
      */
     public static function validateInput($caller, $input)
     {
@@ -95,6 +97,8 @@ public static function validateInput($caller, $input)
             }
             // deprecated as of Symfony 2.5, to be removed in 3.0
             if (is_object($input) && method_exists($input, '__toString')) {
+                trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+
                 return (string) $input;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1108,11 +1108,13 @@ public function setStdin($stdin)`
`1108`	`1108`	`*`
`1109`	`1109`	`* This content will be passed to the underlying process standard input.`
`1110`	`1110`	`*`
`1111`		`- * @param string\|null $input The content`
	`1111`	`+ * @param mixed $input The content`
`1112`	`1112`	`*`
`1113`	`1113`	`* @return self The current Process instance`
`1114`	`1114`	`*`
`1115`	`1115`	`* @throws LogicException In case the process is running`
	`1116`	`+ *`
	`1117`	`+ * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.`
`1116`	`1118`	`*/`
`1117`	`1119`	`public function setInput($input)`
`1118`	`1120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,13 @@ public function addEnvironmentVariables(array $variables)`
`167`	`167`	`/**`
`168`	`168`	`* Sets the input of the process.`
`169`	`169`	`*`
`170`		`- * Deprecation: As of Symfony 2.5, this method only accepts string values.`
`171`		`- *`
`172`		`- * @param string\|null $input The input as a string`
	`170`	`+ * @param mixed $input The input as a string`
`173`	`171`	`*`
`174`	`172`	`* @return ProcessBuilder`
`175`	`173`	`*`
`176`	`174`	`* @throws InvalidArgumentException In case the argument is invalid`
	`175`	`+ *`
	`176`	`+ * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.`
`177`	`177`	`*/`
`178`	`178`	`public function setInput($input)`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ public static function escapeArgument($argument)`
`83`	`83`	`* @return string The validated input`
`84`	`84`	`*`
`85`	`85`	`* @throws InvalidArgumentException In case the input is not valid`
	`86`	`+ *`
	`87`	`+ * @deprecated Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.`
`86`	`88`	`*/`
`87`	`89`	`public static function validateInput($caller, $input)`
`88`	`90`	`{`
`@@ -95,6 +97,8 @@ public static function validateInput($caller, $input)`
`95`	`97`	`}`
`96`	`98`	`// deprecated as of Symfony 2.5, to be removed in 3.0`
`97`	`99`	`if (is_object($input) && method_exists($input, '__toString')) {`
	`100`	`+ trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`101`	`+`
`98`	`102`	`return (string) $input;`
`99`	`103`	`}`
`100`	`104`