Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 26fe34d169a2 · 2018-10-02T14:40:59.000+02:00
* 3.4:
  [php_cs] disable fopen_flags
  [DI] fix error in dumped container
  [CS] Remove unused variables passed to closures
  [DI] fix dumping setters before their inlined instances
  [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
  Don't return early as this bypasses the auto exit feature
  [Console] Add missing null to input values allowed types
  [PHPUnitBridge] Fix microtime() format
  bumped Symfony version to 3.4.17
  updated VERSION for 3.4.16
  updated CHANGELOG for 3.4.16
  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/Node/ElementNode.php b/Node/ElementNode.php
@@ -37,15 +37,15 @@ public function __construct(string $namespace = null, string $element = null)
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getNamespace()
     {
         return $this->namespace;
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getElement()
     {
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -142,7 +142,7 @@ public function getNextIdentifier()
     /**
      * Returns nex identifier or star delimiter token.
      *
-     * @return null|string The identifier token value or null if star found
+     * @return string|null The identifier token value or null if star found
      *
      * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
      */

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ public function __construct(string $namespace = null, string $element = null)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @return null\|string`
	`40`	`+ * @return string\|null`
`41`	`41`	`*/`
`42`	`42`	`public function getNamespace()`
`43`	`43`	`{`
`44`	`44`	`return $this->namespace;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * @return null\|string`
	`48`	`+ * @return string\|null`
`49`	`49`	`*/`
`50`	`50`	`public function getElement()`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function getNextIdentifier()`
`142`	`142`	`/**`
`143`	`143`	`* Returns nex identifier or star delimiter token.`
`144`	`144`	`*`
`145`		`- * @return null\|string The identifier token value or null if star found`
	`145`	`+ * @return string\|null The identifier token value or null if star found`
`146`	`146`	`*`
`147`	`147`	`* @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`148`	`148`	`*/`