Merge branch '5.2' into 5.x

derrabus · derrabus · commit bc921bee738b · 2021-01-19T22:04:23.000+01:00
* 5.2: [HttpFoundation] Drop int return type from parseFilesize() Added $translator->addLoader() bug symfony/symfony#39878 [doctrine-bridge] Add username to UserNameNotFoundException [Uid] Clarify the format returned by getTime() fix spelling Add check for constant in Curl client Revert #38614, add assert to avoid regression Fix container injection with TypedReference Fix problem when SYMFONY_PHPUNIT_VERSION is empty string value Update PHP CS Fixer config to v2.18
diff --git a/Security/User/EntityUserProvider.php b/Security/User/EntityUserProvider.php
@@ -62,7 +62,10 @@ public function loadUserByUsername(string $username)
         }
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         return $user;
@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)
 
             $refreshedUser = $repository->find($id);
             if (null === $refreshedUser) {
-                throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $e = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $e->setUsername(json_encode($id));
+
+                throw $e;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public function loadUserByUsername(string $username)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (null === $user) {`
`65`		`- throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`65`	`+ $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`66`	`+ $e->setUsername($username);`
	`67`	`+`
	`68`	`+ throw $e;`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`return $user;`
`@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)`
`92`	`95`
`93`	`96`	`$refreshedUser = $repository->find($id);`
`94`	`97`	`if (null === $refreshedUser) {`
`95`		`- throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`98`	`+ $e = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`99`	`+ $e->setUsername(json_encode($id));`
	`100`	`+`
	`101`	`+ throw $e;`
`96`	`102`	`}`
`97`	`103`	`}`
`98`	`104`