setup_components back to method

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 30e3854..0cd35b0 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2317,7 +2317,7 @@ The C<setup_components> config option is passed to both of the above methods.
 =cut
 
 sub setup_components {
-    shift->container->resolve( service => 'setup_components' );
+    shift->container->setup_components();
 }
 
 # FIXME - removed locate_components

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 7d40bf5..2abd08b 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -76,7 +76,6 @@ sub BUILD {
         config_local_suffix
         config_path
         locate_components
-        setup_components
     /;
 
     $self->add_sub_container(
@@ -405,61 +404,46 @@ sub build_locate_components_service {
     );
 }
 
-sub build_setup_components_service {
+sub setup_components {
     my $self = shift;
+    my $class = $self->resolve( service => 'application_name' );
+    my @comps = @{ $self->resolve( service => 'locate_components' ) };
+    my %comps = map { $_ => 1 } @comps;
+    my $deprecatedcatalyst_component_names = 0;
 
-    return Bread::Board::BlockInjection->new(
-        lifecycle => 'Singleton',
-        name      => 'setup_components',
-        block     => sub {
-            my $s     = shift;
-            my $class = $s->param('application_name');
-            my @comps = @{ $s->param( 'locate_components' ) };
-            my %comps = map { $_ => 1 } @comps;
-            my $deprecatedcatalyst_component_names = 0;
-
-            for my $component ( @comps ) {
+    for my $component ( @comps ) {
 
-                # We pass ignore_loaded here so that overlay files for (e.g.)
-                # Model::DBI::Schema sub-classes are loaded - if it's in @comps
-                # we know M::P::O found a file on disk so this is safe
+        # We pass ignore_loaded here so that overlay files for (e.g.)
+        # Model::DBI::Schema sub-classes are loaded - if it's in @comps
+        # we know M::P::O found a file on disk so this is safe
 
-                Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
-            }
+        Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
+    }
 
-            for my $component (@comps) {
-                $self->add_component( $component, $class );
-                # FIXME - $instance->expand_modules() is broken
-                my @expanded_components = $self->expand_component_module( $component );
-
-                if (
-                    !$deprecatedcatalyst_component_names &&
-                    ($deprecatedcatalyst_component_names = $component =~ m/::[CMV]::/) ||
-                    ($deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @expanded_components)
-                ) {
-                    # FIXME - should I be calling warn here?
-                    $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}
-                    );
-                }
+    for my $component (@comps) {
+        $self->add_component( $component, $class );
+        # FIXME - $instance->expand_modules() is broken
+        my @expanded_components = $self->expand_component_module( $component );
+
+        if (
+            !$deprecatedcatalyst_component_names &&
+            ($deprecatedcatalyst_component_names = $component =~ m/::[CMV]::/) ||
+            ($deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @expanded_components)
+        ) {
+            # FIXME - should I be calling warn here?
+            $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}
+            );
+        }
 
-                for my $component (@expanded_components) {
-                    $self->add_component( $component, $class )
-                        unless $comps{$component};
-                }
-            }
+        for my $component (@expanded_components) {
+            $self->add_component( $component, $class )
+                unless $comps{$component};
+        }
+    }
 
-            # FIXME - how can this be done?
-            #$s->param('/model')->make_single_default;
-            #$s->param('/view')->make_single_default;
-        },
-        dependencies => [
-            depends_on('application_name'),
-            depends_on('locate_components'),
-            #depends_on('/model'),
-            #depends_on('/view'),
-        ],
-    );
+    $self->get_sub_container('model')->make_single_default;
+    $self->get_sub_container('view')->make_single_default;
 }
 
 sub _fix_syntax {