Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 9c3c94d2dd6f · 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/User/LdapUserProvider.php b/User/LdapUserProvider.php
@@ -130,7 +130,7 @@ protected function loadUser($username, Entry $entry)
     /**
      * Fetches a required unique attribute value from an LDAP entry.
      *
-     * @param null|Entry $entry
+     * @param Entry|null $entry
      * @param string     $attribute
      */
     private function getAttributeValue(Entry $entry, $attribute)

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ protected function loadUser($username, Entry $entry)`
`130`	`130`	`/**`
`131`	`131`	`* Fetches a required unique attribute value from an LDAP entry.`
`132`	`132`	`*`
`133`		`- * @param null\|Entry $entry`
	`133`	`+ * @param Entry\|null $entry`
`134`	`134`	`* @param string $attribute`
`135`	`135`	`*/`
`136`	`136`	`private function getAttributeValue(Entry $entry, $attribute)`