Commit 2c1d8874 authored by Joe Parsons's avatar Joe Parsons Committed by Brian Osborne
Browse files

Issue #3291020 by joegraduate, bkosborne: Support Externalauth 2.0.x

parent c1ce24bf

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
  "license": "GPL-2.0-or-later",

  "minimum-stability": "dev",

  "require": {

    "drupal/externalauth": "^1.2"

    "drupal/externalauth": "^1.2||^2.0"

  },

  "require-dev": {

    "drupal/cas_mock_server": "^1.2"

drupalci.yml

+0 −4
Original line number Diff line number Diff line 
build:

  assessment:

    validate_codebase:

      # Remove patching as soon as #3192093 is committed.

      # See https://www.drupal.org/project/coder/issues/3192093

      container_command:

        commands: "cd ${SOURCE_DIR}/vendor/drupal/coder && sudo -u www-data curl https://patch-diff.githubusercontent.com/raw/pfrenssen/coder/pull/135.diff | sudo -u www-data patch -p1"

      phplint:

        halt-on-fail: true

      phpcs:

src/Plugin/Validation/Constraint/CasProtectedUserFieldConstraintValidator.php

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class CasProtectedUserFieldConstraintValidator extends ProtectedUserFieldConstra 
    // management and if the user being validated is a CAS user.

    if (!empty($items)) {

      $account = $items->getEntity();

      if ($account && $this->restrictedPasswordManagement && !empty($this->casUserManager->getCasUsernameForAccount($account->id()))) {

      if ($account->id() !== NULL && $this->restrictedPasswordManagement && !empty($this->casUserManager->getCasUsernameForAccount($account->id()))) {

        return;

      }

    }