X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=a1fc1fbf97363438e6e04fa675c13924f2f15078;hp=26b5b75ff70b1b7b1189db97904553d7f7f2e9ca;hb=01ce70757e2be0d27df667a7b0e898b0d91476ec;hpb=8a440eba91ace539964b76901ad0e9274ece4ec6

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 26b5b75..a1fc1fb 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -8,6 +8,7 @@ use Moose;
 use Class::MOP::Object ();
 extends 'Catalyst::Component';
 use bytes;
+use B::Hooks::EndOfScope;
 use Catalyst::Exception;
 use Catalyst::Log;
 use Catalyst::Request;
@@ -34,7 +35,6 @@ use Carp qw/croak carp/;
 
 BEGIN { require 5.008001; }
 
-# FIXME lazy => 1 here makes C::P::Auth tests pass?!?
 has stack => (is => 'ro', default => sub { [] });
 has stash => (is => 'rw', default => sub { {} });
 has state => (is => 'rw', default => 0);
@@ -973,8 +973,8 @@ EOF
         my $engine     = $class->engine;
         my $home       = $class->config->{home};
 
-        $class->log->debug(qq/Loaded dispatcher "$dispatcher"/);
-        $class->log->debug(qq/Loaded engine "$engine"/);
+        $class->log->debug(sprintf(q/Loaded dispatcher "%s"/, blessed($dispatcher)));
+        $class->log->debug(sprintf(q/Loaded engine "%s"/, blessed($engine)));
 
         $home
           ? ( -d $home )
@@ -1018,6 +1018,17 @@ EOF
     }
     $class->log->_flush() if $class->log->can('_flush');
 
+    # Make sure that the application class becomes immutable at this point, 
+    # which ensures that it gets an inlined constructor. This means that it 
+    # works even if the user has added a plugin which contains a new method.
+    # Note however that we have to do the work on scope end, so that method
+    # modifiers work correctly in MyApp (as you have to call setup _before_ 
+    # applying modifiers).
+    on_scope_end {
+        my $meta = $class->Moose::Object::meta();
+        $meta->make_immutable unless $meta->is_immutable;
+    };
+
     $class->setup_finished(1);
 }