Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 3c6cfe7b156e · 2017-11-07T12:58:40.000+01:00
* 2.8:
  Docblock fixes
diff --git a/Client.php b/Client.php
@@ -62,7 +62,7 @@ public function getKernel()
     /**
      * Gets the profile associated with the current Response.
      *
-     * @return HttpProfile A Profile instance
+     * @return HttpProfile|false A Profile instance
      */
     public function getProfile()
     {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function getKernel()`
`62`	`62`	`/**`
`63`	`63`	`* Gets the profile associated with the current Response.`
`64`	`64`	`*`
`65`		`- * @return HttpProfile A Profile instance`
	`65`	`+ * @return HttpProfile\|false A Profile instance`
`66`	`66`	`*/`
`67`	`67`	`public function getProfile()`
`68`	`68`	`{`