Skip to content
Snippets Groups Projects
Unverified Commit 4d55d5f3 authored by Lucas Hedding's avatar Lucas Hedding
Browse files

Issue #3310455 by heddn: PHP 8 support & Drupal 10 support

parent 6f7361b8
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"require": { "require": {
"php": "^7.2", "php": "^7.2|^8",
"league/oauth2-client": "^2" "league/oauth2-client": "^2"
}, },
"suggest": { "suggest": {
......
name: 'Box Token Manager' name: 'Box Token Manager'
type: module type: module
description: 'OAuth2 Token Manager for Box' description: 'OAuth2 Token Manager for Box'
core: 8.x core_version_requirement: ^9.3 || ^10
core_version_requirement: ^8 || ^9
package: 'Security' package: 'Security'
dependencies: dependencies:
- oauth2_token_manager:oauth2_token_manager - oauth2_token_manager:oauth2_token_manager
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"extra": { "extra": {
"drush": { "drush": {
"services": { "services": {
"drush.services.yml": "^9 || ^10" "drush.services.yml": "^10 || ^11 || ^12"
} }
} }
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"extra": { "extra": {
"drush": { "drush": {
"services": { "services": {
"drush.services.yml": "^9 || ^10" "drush.services.yml": "^10 || ^11 || ^12"
} }
} }
} }
......
name: 'Quip Token Manager' name: 'Quip Token Manager'
type: module type: module
description: 'OAuth2 Token Manager for Quip' description: 'OAuth2 Token Manager for Quip'
core: 8.x core_version_requirement: ^9.3 || ^10
core_version_requirement: ^8 || ^9
package: 'Security' package: 'Security'
dependencies: dependencies:
- oauth2_token_manager:oauth2_token_manager - oauth2_token_manager:oauth2_token_manager
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"extra": { "extra": {
"drush": { "drush": {
"services": { "services": {
"drush.services.yml": "^9 || ^10" "drush.services.yml": "^10 || ^11 || ^12"
} }
} }
} }
......
name: 'Slack Token Manager' name: 'Slack Token Manager'
type: module type: module
description: 'OAuth2 Token Manager for Slack' description: 'OAuth2 Token Manager for Slack'
core: 8.x core_version_requirement: ^9.3 || ^10
core_version_requirement: ^8 || ^9
package: 'Security' package: 'Security'
dependencies: dependencies:
- oauth2_token_manager:oauth2_token_manager - oauth2_token_manager:oauth2_token_manager
name: 'OAuth2 Token Manager' name: 'OAuth2 Token Manager'
type: module type: module
description: 'OAuth2 Token Manager' description: 'OAuth2 Token Manager'
core: 8.x core_version_requirement: ^9.3 || ^10
core_version_requirement: ^8 || ^9
package: 'Security' package: 'Security'
...@@ -35,7 +35,7 @@ class TokenGeneratorCommandsBase extends DrushCommands { ...@@ -35,7 +35,7 @@ class TokenGeneratorCommandsBase extends DrushCommands {
* *
* @throws \Exception * @throws \Exception
*/ */
public function setRefreshToken($refresh_token) { public function setRefreshToken($refresh_token): void {
if (!$this->tokenManager->setSystemRefreshToken($refresh_token)) { if (!$this->tokenManager->setSystemRefreshToken($refresh_token)) {
throw new \Exception('Using refresh token failed.'); throw new \Exception('Using refresh token failed.');
} }
...@@ -46,7 +46,7 @@ class TokenGeneratorCommandsBase extends DrushCommands { ...@@ -46,7 +46,7 @@ class TokenGeneratorCommandsBase extends DrushCommands {
/** /**
* Initializes a new refresh token. * Initializes a new refresh token.
*/ */
public function initRefreshToken() { public function initRefreshToken(): void {
$authUrl = $this->tokenManager->initSystemAccessToken(); $authUrl = $this->tokenManager->initSystemAccessToken();
$this->logger()->success(dt('Please visit the following URL to initialize the system token: {url}', ['url' => $authUrl])); $this->logger()->success(dt('Please visit the following URL to initialize the system token: {url}', ['url' => $authUrl]));
} }
......
...@@ -22,7 +22,7 @@ class LoadTest extends BrowserTestBase { ...@@ -22,7 +22,7 @@ class LoadTest extends BrowserTestBase {
* *
* @var array * @var array
*/ */
public static $modules = [ protected static $modules = [
'oauth2_token_manager', 'oauth2_token_manager',
'box_token_manager', 'box_token_manager',
'quip_token_manager', 'quip_token_manager',
...@@ -39,7 +39,7 @@ class LoadTest extends BrowserTestBase { ...@@ -39,7 +39,7 @@ class LoadTest extends BrowserTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function setUp() { protected function setUp(): void {
parent::setUp(); parent::setUp();
$this->user = $this->drupalCreateUser(['administer site configuration']); $this->user = $this->drupalCreateUser(['administer site configuration']);
$this->drupalLogin($this->user); $this->drupalLogin($this->user);
...@@ -48,9 +48,9 @@ class LoadTest extends BrowserTestBase { ...@@ -48,9 +48,9 @@ class LoadTest extends BrowserTestBase {
/** /**
* Tests that the home page loads with a 200 response. * Tests that the home page loads with a 200 response.
*/ */
public function testLoad() { public function testLoad(): void {
$this->drupalGet(Url::fromRoute('<front>')); $this->drupalGet(Url::fromRoute('<front>'));
$this->assertResponse(200); $this->assertSession()->statusCodeEquals(200);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment