Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 7e15fbf17878 · 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/User/LdapUserProvider.php b/User/LdapUserProvider.php
@@ -140,7 +140,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
`@@ -140,7 +140,7 @@ protected function loadUser($username, Entry $entry)`
`140`	`140`	`/**`
`141`	`141`	`* Fetches a required unique attribute value from an LDAP entry.`
`142`	`142`	`*`
`143`		`- * @param null\|Entry $entry`
	`143`	`+ * @param Entry\|null $entry`
`144`	`144`	`* @param string $attribute`
`145`	`145`	`*/`
`146`	`146`	`private function getAttributeValue(Entry $entry, $attribute)`