Skip to content

Commit

Permalink
Fix combat issue with MW 1.39 and PHP 8.2 (#23)
Browse files Browse the repository at this point in the history
* Fix combat issue with MW 1.39 and PHP 8.2

* Add 8.1 and 8.2 to our syntax checks
  • Loading branch information
jdarwood007 authored Feb 26, 2023
1 parent 5a127e5 commit 29f4975
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Syntax-Check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
operating-system: [ ubuntu-latest ]
php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
name: PHP ${{ matrix.php }} Syntax Check
steps:
- uses: actions/checkout@master
Expand Down
19 changes: 13 additions & 6 deletions ForumProvider/smf2.0.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class ForumSoftwareProvidersmf20 extends ForumSoftwareProvider
'userlogout' => 'logout'
];

protected $wikiMemberOptions = null;

/**
* Validate that the configuration file exists and is readable.
*
Expand Down Expand Up @@ -276,15 +278,20 @@ public function getMemberRealName(array $member): string
public function legacyUpdateWikiUser(array $member, object $wikiUser): bool
{
// Convert the smf_member_id over?
if ($this->ForumSettings['NameStyle'] == 'smf' && $wikiUser->getOption('forum_member_id', 0) == 0 && $wikiUser->getOption('smf_member_id', 0) != 0)
if ($this->ForumSettings['NameStyle'] !== 'smf')
return false;

if (empty($this->wikiMemberOptions) || !is_object($this->wikiMemberOptions))
$this->wikiMemberOptions = \MediaWiki\MediaWikiServices::getInstance()->getUserOptionsManager();

if ($this->wikiMemberOptions->getIntOption($wikiUser, 'forum_member_id', 0) == 0 && $this->wikiMemberOptions->getIntOption($wikiUser, 'smf_member_id', 0) != 0)
{
$this->MWlogger->debug('SMF Auth conversion to FS Provider. "{OLD}" vs "{NEW}"', array(
'OLD' => $wikiUser->getOption('forum_member_id', 0),
'NEW' => $wikiUser->getOption('smf_member_id', 0),
'OLD' => $this->wikiMemberOptions->getIntOption($wikiUser, 'forum_member_id', 0),
'NEW' => $this->wikiMemberOptions->getIntOption($wikiUser, 'smf_member_id', 0),
));

$wikiUser->setOption('forum_member_id', $member['id_member']);
$wikiUser->setOption('smf_member_id', 0);
$this->wikiMemberOptions->setOption($wikiUser, 'forum_member_id', (int) $member['id_member']);
$this->wikiMemberOptions->setOption($wikiUser, 'smf_member_id', 0);
return true;
}

Expand Down

0 comments on commit 29f4975

Please sign in to comment.