Copied and adapted tests from Catalyst::Plugin::ConfigLoader

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3928ce9..2dd7d5d 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -758,7 +758,7 @@ sub view {
             my $container = $c->container->get_sub_container('view');
             if ($container->has_service($check)) {
 
-                return $c->_filter_component( $container->get_service($check)->get, @args );
+                return $c->_filter_component( $container->resolve(service => $check), @args );
             }
             else {
                 $c->log->warn( "Attempted to use view '$check', but does not exist" );
@@ -2453,7 +2453,9 @@ sub setup_actions { my $c = shift; $c->dispatcher->setup_actions( $c, @_ ) }
 sub setup_config {
     my $class = shift;
 
-    my %args = %{$class->config || {} };
+    my %args = %{ $class->config || {} };
+
+# FIXME: what is this 'MyApp' doing here?
     my @container_classes = qw/MyApp::Container Catalyst::Container/;
     unshift @container_classes, delete $args{container_class} if exists $args{container_class};