From f31e3902c928de754a553bf2e1c3f66696a05bb6 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 2 Jul 2018 18:04:31 -0700 Subject: [PATCH] resourceloader: Simplify ResourceLoader::isFileModule() Method already has 100% test coverage. Change-Id: I695e0ecca7a749e1721e489007f3b9f99358a96b --- includes/resourceloader/ResourceLoader.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 43f294b9c5..80eb5984eb 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -570,8 +570,7 @@ class ResourceLoader implements LoggerAwareInterface { } /** - * Return whether the definition of a module corresponds to a simple ResourceLoaderFileModule - * or one of its subclasses. + * Whether the module is a ResourceLoaderFileModule (including subclasses). * * @param string $name Module name * @return bool @@ -584,14 +583,13 @@ class ResourceLoader implements LoggerAwareInterface { if ( isset( $info['object'] ) ) { return false; } - if ( - isset( $info['class'] ) && - $info['class'] !== ResourceLoaderFileModule::class && - !is_subclass_of( $info['class'], ResourceLoaderFileModule::class ) - ) { - return false; - } - return true; + return ( + // The implied default for 'class' is ResourceLoaderFileModule + !isset( $info['class'] ) || + // Explicit default + $info['class'] === ResourceLoaderFileModule::class || + is_subclass_of( $info['class'], ResourceLoaderFileModule::class ) + ); } /** -- 2.20.1