remainings of flush_request_services()

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 7c51d8d..71b7c43 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1017,11 +1017,11 @@ EOF
 
     if (
         $class->debug and
-        my @comps_names_types = $class->container->get_components_names_types
+        my %comps = $class->container->get_all_components
     ) {
         my $column_width = Catalyst::Utils::term_width() - 8 - 9;
         my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
-        $t->row( @$_ ) for @comps_names_types;
+        $t->row( $_ => ref($comps{$_}) ? 'instance' : 'class' ) for keys %comps;
 
         $class->log->debug( "Loaded components:\n" . $t->draw . "\n" );
     }
@@ -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