Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit c705bee03ade · 2018-10-02T14:28:39.000+02:00
* 2.8:
  [php_cs] disable fopen_flags
  [CS] Remove unused variables passed to closures
  [CS] Remove empty comment
  [CS] Enforces null type hint on last position in phpDocs
  [CS] Use combined assignment operators when possible
  Fix a typo in error messages
  [Console] Add missing null to input values allowed types
  [PHPUnitBridge] Fix microtime() format
  bumped Symfony version to 2.8.47
  update CONTRIBUTORS for 2.8.46
  updated VERSION for 2.8.46
  updated CHANGELOG for 2.8.46
diff --git a/Crawler.php b/Crawler.php
@@ -129,7 +129,7 @@ public function add($node)
      * HTTP 1.1 specification.
      *
      * @param string      $content A string to parse as HTML/XML
-     * @param null|string $type    The content type of the string
+     * @param string|null $type    The content type of the string
      */
     public function addContent($content, $type = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function add($node)`
`129`	`129`	`* HTTP 1.1 specification.`
`130`	`130`	`*`
`131`	`131`	`* @param string $content A string to parse as HTML/XML`
`132`		`- * @param null\|string $type The content type of the string`
	`132`	`+ * @param string\|null $type The content type of the string`
`133`	`133`	`*/`
`134`	`134`	`public function addContent($content, $type = null)`
`135`	`135`	`{`