X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=016ef2dd2f53228c249100a64c98af6486820dc3;hp=068a249fb0cdbb9024818f7fa593c02a1d9da581;hb=refs%2Ftags%2F5.90091;hpb=395037a225a8df6f6fe370f970e7657dc85b4748
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 068a249..016ef2d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -157,7 +157,7 @@ sub composed_stats_class {
__PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC);
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90089_003';
+our $VERSION = '5.90091';
$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
sub import {
@@ -199,6 +199,11 @@ sub _application { $_[0] }
Catalyst - The Elegant MVC Web Application Framework
+=for html
+
+
+
=head1 SYNOPSIS
See the L distribution for comprehensive
@@ -1379,6 +1384,7 @@ EOF
: $class->log->debug(q/Couldn't find home/);
my $column_width = Catalyst::Utils::term_width() - 8 - 9;
+
my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
for my $comp ( sort keys %{ $class->components } ) {
my $type = ref $class->components->{$comp} ? 'instance' : 'class';
@@ -2848,10 +2854,10 @@ sub setup_components {
# of named components in the configuration that are not actually existing (not a
# real file).
- my @injected_components = $class->setup_injected_components;
+ $class->setup_injected_components;
# All components are registered, now we need to 'init' them.
- foreach my $component_name (@comps, @injected_components) {
+ foreach my $component_name (keys %{$class->components||+{}}) {
$class->components->{$component_name} = $class->components->{$component_name}->() if
(ref($class->components->{$component_name}) || '') eq 'CODE';
}
@@ -2872,8 +2878,6 @@ sub setup_injected_components {
$injected_comp_name,
$class->config->{inject_components}->{$injected_comp_name});
}
-
- return @injected_components;
}
=head2 $app->setup_injected_component( $injected_component_name, $config )