find_modules should return a list

mojolicious · Feb 20, 2015 · e7041d9 · e7041d9
1 parent 8dcb287
commit e7041d9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/Mojo/Loader.pm b/lib/Mojo/Loader.pm
@@ -36,7 +36,7 @@ sub find_modules {
     }
   }
 
-  return [keys %modules];
+  return sort keys %modules;
 }
 
 # DEPRECATED in Tiger Face!
@@ -65,7 +65,7 @@ sub new {
 }
 
 # DEPRECATED in Tiger Face!
-sub search { shift; find_modules(@_) }
+sub search { shift; [find_modules(@_)] }
 
 sub _all {
   my $class = shift;
@@ -109,7 +109,7 @@ Mojo::Loader - Loader
   use Mojo::Loader qw(data_section find_modules load_class);
 
   # Find modules in a namespace
-  for my $module (@{find_modules 'Some::Namespace'}) {
+  for my $module (find_modules 'Some::Namespace') {
 
     # Load them safely
     my $e = load_class $module;
@@ -146,7 +146,7 @@ Check if embedded file from the C<DATA> section of a class was Base64 encoded.
 
 =head2 find_modules
 
-  my $modules = find_modules 'MyApp::Namespace';
+  my @modules = find_modules 'MyApp::Namespace';
 
 Search for modules in a namespace non-recursively.
 

diff --git a/lib/Mojolicious/Commands.pm b/lib/Mojolicious/Commands.pm
@@ -62,7 +62,7 @@ sub run {
   my %all;
   for my $ns (@{$self->namespaces}) {
     $all{substr $_, length "${ns}::"} //= $_->new->description
-      for grep { _command($_) } @{find_modules $ns};
+      for grep { _command($_) } find_modules $ns;
   }
 
   my @rows = map { [" $_", $all{$_}] } sort keys %all;

diff --git a/t/mojo/loader.t b/t/mojo/loader.t
@@ -50,11 +50,11 @@ is $e->lines_after->[1][1], '1;', 'right line';
 like "$e", qr/Exception/, 'right message';
 
 # Search
-my @modules = sort @{find_modules 'Mojo::LoaderTest'};
+my @modules = find_modules 'Mojo::LoaderTest';
 is_deeply \@modules,
   [qw(Mojo::LoaderTest::A Mojo::LoaderTest::B Mojo::LoaderTest::C)],
   'found the right modules';
-is_deeply [sort @{find_modules "Mojo'LoaderTest"}],
+is_deeply [find_modules "Mojo'LoaderTest"],
   [qw(Mojo'LoaderTest::A Mojo'LoaderTest::B Mojo'LoaderTest::C)],
   'found the right modules';