Merge branch 'release-2.0' into release-2.1

php-censor · May 4, 2024 · 1d955a4 · 1d955a4
2 parents c003931 + ed5eed0
commit 1d955a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php-version: ['7.4', '8.0', '8.1']
+ php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
 
  steps:
  - name: Setup MySQL latest
@@ -45,6 +45,7 @@ jobs:
 
  - name: Setup Database
  run: |
+ sudo systemctl start mysql
  n=0
  until [ "$n" -ge 5 ]
  do

diff --git a/src/Controller/SessionController.php b/src/Controller/SessionController.php
@@ -133,7 +133,7 @@ public function login()
  $key = $user->getProviderKey();
  $isLoginFailure = !isset($providers[$key]) || !$providers[$key]->verifyPassword($user, $password);
  } else {
- // Ask each providers to provision the user
+ // Ask each provider to provision the user
  foreach ($providers as $provider) {
  $user = $provider->provisionUser($email);
  if ($user && $provider->verifyPassword($user, $password)) {
@@ -150,7 +150,7 @@ public function login()
 
  $response = new RedirectResponse($this->getLoginRedirect());
  if ($rememberMe) {
- $rememberKey = \md5((string)\microtime(true));
+ $rememberKey = md5(random_bytes(64));
 
  $user->setRememberKey($rememberKey);
  $this->userStore->save($user);