moved expand_component_module

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 26dc29d..46eb6d5 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -15,7 +15,6 @@ use Catalyst::Response;
 use Catalyst::Utils;
 use Catalyst::Controller;
 use Data::OptList;
-use Devel::InnerPackage ();
 use File::stat;
 use Module::Pluggable::Object ();
 use Text::SimpleTable ();
@@ -2311,8 +2310,8 @@ sub finalize_config { }
 This method is called internally to set up the application's components.
 
 It finds modules by calling the L<locate_components> method, expands them to
-package names with the L<expand_component_module> method, and then installs
-each component into the application.
+package names with the $container->expand_component_module method, and then
+installs each component into the application.
 
 The C<setup_components> config option is passed to both of the above methods.
 
@@ -2351,10 +2350,11 @@ sub setup_components {
     for my $component (@comps) {
         $container->add_component( $component, $class );
 # FIXME - $instance->expand_modules() is broken
-        my @expanded_components = $class->expand_component_module( $component, $config );
+        my @expanded_components = $container->expand_component_module( $component );
         for my $component (@expanded_components) {
             next if $comps{$component};
 
+            # FIXME - Why is it inside the for loop? It makes no sense
             $deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @expanded_components;
             $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
                 qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
@@ -2396,18 +2396,6 @@ sub locate_components {
     return @comps;
 }
 
-=head2 $c->expand_component_module( $component, $setup_component_config )
-
-Components found by C<locate_components> will be passed to this method, which
-is expected to return a list of component (package) names to be set up.
-
-=cut
-
-sub expand_component_module {
-    my ($class, $module) = @_;
-    return Devel::InnerPackage::list_packages( $module );
-}
-
 =head2 $c->setup_dispatcher
 
 Sets up dispatcher.

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 040dc83..94a2fec 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -4,6 +4,7 @@ use Moose;
 use Config::Any;
 use Data::Visitor::Callback;
 use Catalyst::Utils ();
+use Devel::InnerPackage ();
 use Hash::Util qw/lock_hash/;
 use MooseX::Types::LoadableClass qw/ LoadableClass /;
 use Moose::Util;
@@ -600,6 +601,10 @@ sub setup_component {
     return $instance;
 }
 
+sub expand_component_module {
+    my ( $class, $module ) = @_;
+    return Devel::InnerPackage::list_packages( $module );
+}
 
 1;
 
@@ -745,6 +750,13 @@ Example:
 
 The above will respond to C<__baz(x,y)__> in config strings.
 
+=head2 $c->expand_component_module( $component, $setup_component_config )
+
+Components found by C<locate_components> will be passed to this method, which
+is expected to return a list of component (package) names to be set up.
+
+=cut
+
 =head1 AUTHORS
 
 Catalyst Contributors, see Catalyst.pm