Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 2958fca4cc38 · 2019-08-07T14:28:41.000+02:00
* 3.4:
  Fix some return type annotations.
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -188,8 +188,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     /**
      * Writes data as json.
-     *
-     * @return array|string
      */
     private function writeData(array $data, array $options)
     {
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
@@ -142,8 +142,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     /**
      * Writes DOM document.
-     *
-     * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
     {

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])`
`188`	`188`
`189`	`189`	`/**`
`190`	`190`	`* Writes data as json.`
`191`		`- *`
`192`		`- * @return array\|string`
`193`	`191`	`*/`
`194`	`192`	`private function writeData(array $data, array $options)`
`195`	`193`	`{`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])`
`142`	`142`
`143`	`143`	`/**`
`144`	`144`	`* Writes DOM document.`
`145`		`- *`
`146`		`- * @return \DOMDocument\|string`
`147`	`145`	`*/`
`148`	`146`	`private function writeDocument(\DOMDocument $dom)`
`149`	`147`	`{`