Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 18dd04193654 · 2017-01-05T18:48:24.000+01:00
* 3.2:
  [Cache] Remove silenced warning tiggered by PhpArrayAdapter
  [Cache] Fix order of writes in ChainAdapter
  [Console] Fix return type in Terminal docblocks
diff --git a/Terminal.php b/Terminal.php
@@ -19,7 +19,7 @@ class Terminal
     /**
      * Gets the terminal width.
      *
-     * @return int|null
+     * @return int
      */
     public function getWidth()
     {
@@ -37,7 +37,7 @@ public function getWidth()
     /**
      * Gets the terminal height.
      *
-     * @return int|null
+     * @return int
      */
     public function getHeight()
     {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Terminal`
`19`	`19`	`/**`
`20`	`20`	`* Gets the terminal width.`
`21`	`21`	`*`
`22`		`- * @return int\|null`
	`22`	`+ * @return int`
`23`	`23`	`*/`
`24`	`24`	`public function getWidth()`
`25`	`25`	`{`
`@@ -37,7 +37,7 @@ public function getWidth()`
`37`	`37`	`/**`
`38`	`38`	`* Gets the terminal height.`
`39`	`39`	`*`
`40`		`- * @return int\|null`
	`40`	`+ * @return int`
`41`	`41`	`*/`
`42`	`42`	`public function getHeight()`
`43`	`43`	`{`