Skip to content

Commit

Permalink
Bump m4tthumphrey/php-gitlab-api to 11.x in order to support PHP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
tehplague committed Aug 11, 2022
1 parent e1eb3d2 commit 411a942
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Classes/ResourceServer/GitLab.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function loadUserDetails(ResourceOwnerInterface $user): void
$gitlabClient = $user->getApiClient();

try {
$project = $gitlabClient->projects->show($this->projectName);
$project = $gitlabClient->projects()->show($this->projectName);

$accessLevel = 0;
if (isset($project['permissions']['project_access'])) {
Expand Down
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"require": {
"php": "^7.4||^8.0",
"league/oauth2-client": "^2.6",
"m4tthumphrey/php-gitlab-api": "^9.19",
"m4tthumphrey/php-gitlab-api": "^11.0",
"omines/oauth2-gitlab": "^3.4",
"php-http/guzzle7-adapter": "^1.0",
"psr/http-factory": "^1.0",
Expand All @@ -50,5 +50,11 @@
"typo3/cms": {
"extension-key": "oauth2"
}
},
"config": {
"allow-plugins": {
"typo3/cms-composer-installers": false,
"typo3/class-alias-loader": false
}
}
}
4 changes: 4 additions & 0 deletions ext_localconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
$extensionConfig = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['oauth2']);
} elseif (isset($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['oauth2'])) {
$extensionConfig = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['oauth2'];
} else {
$extensionConfig = [
'enableBackendLogin' => false,
];
}

if ($extensionConfig['enableBackendLogin']) {
Expand Down

0 comments on commit 411a942

Please sign in to comment.