fix merge

Robin Chalas · Robin Chalas · commit 39557e25c4c7 · 2018-01-19T11:06:48.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -31,7 +31,7 @@ public function create(ContainerBuilder $container, $id, $config)
         $users = array();
 
         foreach ($config['users'] as $username => $user) {
-            $users[$username] = array('password' => (string) $user['password'], 'roles' => $user['roles']);
+            $users[$username] = array('password' => null !== $user['password'] ? (string) $user['password'] : $defaultPassword, 'roles' => $user['roles']);
         }
 
         $definition->addArgument($users);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function create(ContainerBuilder $container, $id, $config)`
`31`	`31`	`$users = array();`
`32`	`32`
`33`	`33`	`foreach ($config['users'] as $username => $user) {`
`34`		`- $users[$username] = array('password' => (string) $user['password'], 'roles' => $user['roles']);`
	`34`	`+ $users[$username] = array('password' => null !== $user['password'] ? (string) $user['password'] : $defaultPassword, 'roles' => $user['roles']);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$definition->addArgument($users);`