Merge branch '3.2' into 3.3

nicolas-grekas · nicolas-grekas · commit 0a114ae31fc3 · 2017-05-24T16:31:45.000+02:00
* 3.2:
  [Yaml] Add missing deprecation annotation
  [DI] Check for privates before shared services
diff --git a/Dumper.php b/Dumper.php
@@ -41,6 +41,8 @@ public function __construct($indentation = 4)
      * Sets the indentation.
      *
      * @param int $num The amount of spaces to use for indentation of nested nodes
+     *
+     * @deprecated since version 3.1, to be removed in 4.0. Pass the indentation to the constructor instead.
      */
     public function setIndentation($num)
     {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public function __construct($indentation = 4)`
`41`	`41`	`* Sets the indentation.`
`42`	`42`	`*`
`43`	`43`	`* @param int $num The amount of spaces to use for indentation of nested nodes`
	`44`	`+ *`
	`45`	`+ * @deprecated since version 3.1, to be removed in 4.0. Pass the indentation to the constructor instead.`
`44`	`46`	`*/`
`45`	`47`	`public function setIndentation($num)`
`46`	`48`	`{`