Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit db0f4ae91fd8 · 2017-10-24T16:05:06.000+02:00
* 2.8:
  [DI] minor docblock fixes
diff --git a/Client.php b/Client.php
@@ -232,8 +232,6 @@ public function getRequest()
     /**
      * Clicks on a given link.
      *
-     * @param Link $link A Link instance
-     *
      * @return Crawler
      */
     public function click(Link $link)
diff --git a/Cookie.php b/Cookie.php
@@ -21,8 +21,6 @@ class Cookie
     /**
      * Handles dates as defined by RFC 2616 section 3.3.1, and also some other
      * non-standard, but common formats.
-     *
-     * @var array
      */
     private static $dateFormats = array(
         'D, d M Y H:i:s T',
diff --git a/CookieJar.php b/CookieJar.php
@@ -20,11 +20,6 @@ class CookieJar
 {
     protected $cookieJar = array();
 
-    /**
-     * Sets a cookie.
-     *
-     * @param Cookie $cookie A Cookie instance
-     */
     public function set(Cookie $cookie)
     {
         $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
diff --git a/History.php b/History.php
@@ -32,8 +32,6 @@ public function clear()
 
     /**
      * Adds a Request to the history.
-     *
-     * @param Request $request A Request instance
      */
     public function add(Request $request)
     {

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,6 @@ public function getRequest()`
`232`	`232`	`/**`
`233`	`233`	`* Clicks on a given link.`
`234`	`234`	`*`
`235`		`- * @param Link $link A Link instance`
`236`		`- *`
`237`	`235`	`* @return Crawler`
`238`	`236`	`*/`
`239`	`237`	`public function click(Link $link)`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,6 @@ class CookieJar`
`20`	`20`	`{`
`21`	`21`	`protected $cookieJar = array();`
`22`	`22`
`23`		`- /**`
`24`		`- * Sets a cookie.`
`25`		`- *`
`26`		`- * @param Cookie $cookie A Cookie instance`
`27`		`- */`
`28`	`23`	`public function set(Cookie $cookie)`
`29`	`24`	`{`
`30`	`25`	`$this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ public function clear()`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* Adds a Request to the history.`
`35`		`- *`
`36`		`- * @param Request $request A Request instance`
`37`	`35`	`*/`
`38`	`36`	`public function add(Request $request)`
`39`	`37`	`{`