Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecated class Hooks replaced by HookContainer #82

Closed
wants to merge 1 commit into from
Closed

Fix deprecated class Hooks replaced by HookContainer #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/HookRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace SMT;

use MediaWiki\MediaWikiServices;
use SMW\ApplicationFactory;
use SMW\Store;
use Hooks;
Expand Down Expand Up @@ -33,8 +34,15 @@ public function __construct( Store $store, Options $options ) {
* @since 1.0
*/
public function register() {
foreach ( $this->handlers as $name => $callback ) {
Hooks::register( $name, $callback );
if ( class_exists( 'MediaWiki\HookContainer\HookContainer' ) ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using HookContainer::class is better. This works even if the class does not exist.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the check needed at all? I see HookContainer was added in MW 35

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the check needed at all? I see HookContainer was added in MW 35

No it is not needed.

$hookContainer = MediaWikiServices::getInstance()->getHookContainer();
foreach ( $this->handlers as $name => $callback ) {
$hookContainer->register( $name, $callback );
}
} else {
foreach ( $this->handlers as $name => $callback ) {
Hooks::register( $name, $callback );
}
}
}

Expand All @@ -46,7 +54,12 @@ public function register() {
* @return boolean
*/
public function isRegistered( $name ) {
return Hooks::isRegistered( $name );
if ( class_exists( 'MediaWiki\HookContainer\HookContainer' ) ) {
$hookContainer = MediaWikiServices::getInstance()->getHookContainer();
return $hookContainer->isRegistered( $name );
} else {
return Hooks::isRegistered( $name );
}
}

/**
Expand Down