Commit 8ae8cea5 authored by Balint Pekker's avatar Balint Pekker Committed by Christopher C. Wells
Browse files

Issue #3289760 by Project Update Bot, wells, balintpekker: Drupal 10 compatibility

parent d61a7970

composer.json

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        }

    ],

    "require": {

        "drupal/core": "^8.8 || ^9.0",

        "drupal/social_api": "^3"

        "drupal/social_api": "^3",

        "drupal/core": "^9.3 || ^10"

    },

    "require-dev": {

        "drupal/coder": "^8.3"

social_auth.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Social Auth

type: module

description: Allows user authentication with different services.

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9.3 || ^10

package: Social

configure: social_auth.integrations

dependencies:

social_auth.module

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ function social_auth_user_delete(EntityInterface $account) { 
    $storage = \Drupal::entityTypeManager()

      ->getStorage('social_auth');



    /** @var \Drupal\social_auth\Entity\SocialAuth[] $socialAuthUser */

    $users = $storage->loadByProperties([

      'user_id' => $account->id(),

    ]);

social_auth.post_update.php

+5 −1
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ function social_auth_post_update_encrypt_tokens(&$sandbox = NULL) { 
  $storage = \Drupal::entityTypeManager()->getStorage('social_auth');

  // Initializes some variables during the first pass through.

  if (!isset($sandbox['total'])) {

    $sandbox['total'] = $storage->getQuery()->count()->execute();

    $sandbox['total'] = $storage

      ->getQuery()

      ->accessCheck()

      ->count()

      ->execute();

    $sandbox['progress'] = 0;

  }

src/Controller/SocialAuthController.php

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class SocialAuthController extends SocialApiController { 
  public static function setLoginButtonSettings($module, $route, $img_path) {

    $config = \Drupal::configFactory()->getEditable('social_auth.settings');



    $img_path = drupal_get_path('module', $module) . '/' . $img_path;

    $img_path = \Drupal::service('extension.list.module')->getPath($module) . '/' . $img_path;



    $config->set('auth.' . $module . '.route', $route)

      ->set('auth.' . $module . '.img_path', $img_path)