From 2fd00245ce0526166f41d8fdffc346f5f118088f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 25 Jul 2016 16:10:34 +0100 Subject: [PATCH] Bug 16586: [QA Follow-up] Simplify code Content-Type: text/plain; charset=utf-8 Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Amended this patch: Replaced none by any. Exists test adjusted. This effectively makes the test pass. --- Koha/Plugins.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm index d3eddcf..6644f78 100644 --- a/Koha/Plugins.pm +++ b/Koha/Plugins.pm @@ -21,6 +21,7 @@ use Modern::Perl; use Module::Load::Conditional qw(can_load); use Module::Pluggable search_path => ['Koha::Plugin'], except => qr/::Edifact(|::Line|::Message|::Order|::Segment|::Transport)$/; +use List::MoreUtils qw( any ); use C4::Context; use C4::Output; @@ -76,17 +77,12 @@ sub GetPlugins { my $plugin = $plugin_class->new({ enable_plugins => $self->{'enable_plugins'} }); # Limit results by method or metadata - my $ok = 1; next if $method && !$plugin->can($method); my $plugin_metadata = $plugin->get_metadata; - foreach my $key ( keys %$req_metadata ) { - if( !$plugin_metadata->{$key} || - $plugin_metadata->{$key} ne $req_metadata->{$key} ) { - $ok = 0; - last; - } - } - push( @plugins, $plugin ) if $ok; + next if $plugin_metadata + and %$req_metadata + and any { !$plugin_metadata->{$_} || $plugin_metadata->{$_} ne $req_metadata->{$_} } keys %$req_metadata; + push @plugins, $plugin; } } return @plugins; -- 1.7.10.4