get_all_components is getting until we know what to do

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8d566ec..c87bff2 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1017,11 +1017,11 @@ EOF
 
     if (
         $class->debug and
-        my %comps = $class->container->get_all_components
+        my $comps = $class->container->get_all_components($class)
     ) {
         my $column_width = Catalyst::Utils::term_width() - 8 - 9;
         my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
-        $t->row( $_ => ref($comps{$_}) ? 'instance' : 'class' ) for keys %comps;
+        $t->row( $_ => ref($comps->{$_}) ? 'instance' : 'class' ) for keys %$comps;
 
         $class->log->debug( "Loaded components:\n" . $t->draw . "\n" );
     }
@@ -1435,7 +1435,7 @@ sub components {
         $container->add_component( $_ ) for keys %$comps;
     }
 
-    return $container->get_all_components();
+    return $container->get_all_components($class);
 }
 
 =head2 $c->context_class
@@ -2269,10 +2269,10 @@ sub setup_config {
 
     my %args = %{ $class->config || {} };
 
-    my @container_classes = ( "${class}::Container", 'Catalyst::IOC::Container');
-    unshift @container_classes, delete $args{container_class} if exists $args{container_class};
-
-    my $container_class = Class::MOP::load_first_existing_class(@container_classes);
+    my $container_class = exists $args{container_class}
+                        ? Class::MOP::load_class(delete $args{container_class})
+                        : Class::MOP::load_first_existing_class("${class}::Container", 'Catalyst::IOC::Container')
+                        ;
 
     my $container = $container_class->new( %args, application_name => "$class", name => "$class" );
     $class->container($container);
@@ -2300,9 +2300,7 @@ The C<setup_components> config option is passed to both of the above methods.
 
 =cut
 
-sub setup_components {
-    shift->container->setup_components();
-}
+sub setup_components { shift->container->setup_components }
 
 =head2 locate_components