From 6f6bc862f8231de3685a7433de4cc3b8505470e6 Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Wed, 25 May 2022 12:41:37 -0400
Subject: [PATCH] Upgrading drupal/externalauth (1.3.0 => 1.4.0)
---
composer.json | 2 +-
composer.lock | 16 ++++++++--------
vendor/composer/installed.json | 16 ++++++++--------
vendor/composer/installed.php | 10 +++++-----
web/modules/externalauth/externalauth.info.yml | 8 ++++----
web/modules/externalauth/externalauth.install | 6 ++++--
.../externalauth/src/AuthmapInterface.php | 4 ++--
.../Tests => tests/src/Kernel}/AuthmapTest.php | 2 +-
.../tests/src/Unit/ExternalAuthTest.php | 6 +++---
9 files changed, 36 insertions(+), 34 deletions(-)
rename web/modules/externalauth/{src/Tests => tests/src/Kernel}/AuthmapTest.php (98%)
diff --git a/composer.json b/composer.json
index e23a58291f..bb659dd2c2 100644
--- a/composer.json
+++ b/composer.json
@@ -118,7 +118,7 @@
"drupal/entity_embed": "1.2",
"drupal/entity_reference_revisions": "1.9",
"drupal/exif_orientation": "^1.1",
- "drupal/externalauth": "1.3",
+ "drupal/externalauth": "1.4",
"drupal/field_group": "3.1",
"drupal/field_permissions": "1.1",
"drupal/file_browser": "1.3",
diff --git a/composer.lock b/composer.lock
index e7dc111015..6a164a4ea5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0db64872456ea6dcec72cfaea15b3fdf",
+ "content-hash": "3af1e335c59e13fda531315f16f09e0c",
"packages": [
{
"name": "alchemy/zippy",
@@ -4232,17 +4232,17 @@
},
{
"name": "drupal/externalauth",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/externalauth.git",
- "reference": "8.x-1.3"
+ "reference": "8.x-1.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.3.zip",
- "reference": "8.x-1.3",
- "shasum": "b1b38e6718fe66bd38fc894dab1f9d7a7d60f10b"
+ "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.4.zip",
+ "reference": "8.x-1.4",
+ "shasum": "caea7d2d5a890adad9e6b5beaa2cf139727266d6"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -4250,8 +4250,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.3",
- "datestamp": "1587629529",
+ "version": "8.x-1.4",
+ "datestamp": "1624457496",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 83a97a7e71..517a63f717 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -4366,18 +4366,18 @@
},
{
"name": "drupal/externalauth",
- "version": "1.3.0",
- "version_normalized": "1.3.0.0",
+ "version": "1.4.0",
+ "version_normalized": "1.4.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/externalauth.git",
- "reference": "8.x-1.3"
+ "reference": "8.x-1.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.3.zip",
- "reference": "8.x-1.3",
- "shasum": "b1b38e6718fe66bd38fc894dab1f9d7a7d60f10b"
+ "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.4.zip",
+ "reference": "8.x-1.4",
+ "shasum": "caea7d2d5a890adad9e6b5beaa2cf139727266d6"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -4385,8 +4385,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.3",
- "datestamp": "1587629529",
+ "version": "8.x-1.4",
+ "datestamp": "1624457496",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index afded3349f..89d72eef0b 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'ac0e30f29859b960ce5fce6752376c2d329ff838',
+ 'reference' => '8efca4e84f761c4555f30d66931381a148db7860',
'name' => 'osu-asc-webservices/d8-upstream',
'dev' => true,
),
@@ -935,12 +935,12 @@
'dev_requirement' => false,
),
'drupal/externalauth' => array(
- 'pretty_version' => '1.3.0',
- 'version' => '1.3.0.0',
+ 'pretty_version' => '1.4.0',
+ 'version' => '1.4.0.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/externalauth',
'aliases' => array(),
- 'reference' => '8.x-1.3',
+ 'reference' => '8.x-1.4',
'dev_requirement' => false,
),
'drupal/field' => array(
@@ -2101,7 +2101,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'ac0e30f29859b960ce5fce6752376c2d329ff838',
+ 'reference' => '8efca4e84f761c4555f30d66931381a148db7860',
'dev_requirement' => false,
),
'pantheon-systems/quicksilver-pushback' => array(
diff --git a/web/modules/externalauth/externalauth.info.yml b/web/modules/externalauth/externalauth.info.yml
index 87c03eb99f..a73e17abc1 100644
--- a/web/modules/externalauth/externalauth.info.yml
+++ b/web/modules/externalauth/externalauth.info.yml
@@ -3,9 +3,9 @@ type: module
description: Helper module to authenticate users using an external site / service and storing identification details
core: 8.x
core_version_requirement: ^8 || ^9
-package: Authentication
+package: 'User authentication'
-# Information added by Drupal.org packaging script on 2020-04-23
-version: '8.x-1.3'
+# Information added by Drupal.org packaging script on 2021-06-23
+version: '8.x-1.4'
project: 'externalauth'
-datestamp: 1587629530
+datestamp: 1624457461
diff --git a/web/modules/externalauth/externalauth.install b/web/modules/externalauth/externalauth.install
index f67c30241a..3e672385ba 100644
--- a/web/modules/externalauth/externalauth.install
+++ b/web/modules/externalauth/externalauth.install
@@ -70,13 +70,15 @@ function externalauth_schema() {
*/
function externalauth_update_8101() {
$schema = Database::getConnection()->schema();
- $schema->changeField('authmap', 'authname', 'authname', [
+ if ($schema->tableExists('authmap')) {
+ $schema->changeField('authmap', 'authname', 'authname', [
'description' => 'Unique authentication name provided by authentication provider',
'type' => 'varchar',
'length' => 128,
'not null' => TRUE,
'default' => '',
- ]);
+ ]);
+ }
}
/**
diff --git a/web/modules/externalauth/src/AuthmapInterface.php b/web/modules/externalauth/src/AuthmapInterface.php
index a004ed7206..553ec68b15 100644
--- a/web/modules/externalauth/src/AuthmapInterface.php
+++ b/web/modules/externalauth/src/AuthmapInterface.php
@@ -34,8 +34,8 @@ public function save(UserInterface $account, $provider, $authname, $data = NULL)
* @param string $provider
* The name of the service providing external authentication.
*
- * @return string
- * The external authname / ID.
+ * @return string|bool
+ * The external authname / ID, or FALSE.
*/
public function get($uid, $provider);
diff --git a/web/modules/externalauth/src/Tests/AuthmapTest.php b/web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
similarity index 98%
rename from web/modules/externalauth/src/Tests/AuthmapTest.php
rename to web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
index eea6ba6384..ad4ae374c0 100644
--- a/web/modules/externalauth/src/Tests/AuthmapTest.php
+++ b/web/modules/externalauth/tests/src/Kernel/AuthmapTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\externalauth\Tests;
+namespace Drupal\Tests\externalauth\Kernel;
use Drupal\KernelTests\KernelTestBase;
use Drupal\user\Entity\User;
diff --git a/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php b/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
index b07f386e78..0fd48f4999 100644
--- a/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
+++ b/web/modules/externalauth/tests/src/Unit/ExternalAuthTest.php
@@ -107,7 +107,7 @@ public function testLoad() {
$this->eventDispatcher
);
$result = $externalauth->load("test_authname", "test_provider");
- $this->assertTrue($result instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $result);
}
/**
@@ -209,7 +209,7 @@ public function testRegister($registration_data, $expected_data) {
$this->eventDispatcher
);
$registered_account = $externalauth->register($registration_data['authname'], $registration_data['provider'], $registration_data['account_data'], $registration_data['authmap_data']);
- $this->assertTrue($registered_account instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $registered_account);
$this->assertEquals($expected_data['timezone'], $registered_account->getTimeZone());
$this->assertEquals($expected_data['data'], $dispatched_event->getData());
}
@@ -303,7 +303,7 @@ public function testLoginRegister() {
->will($this->returnValue($account));
$result = $externalauth->loginRegister("test_authname", "test_provider");
- $this->assertTrue($result instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $result);
}
/**
--
GitLab