[Catalyst-commits] r9776 - in Catalyst-Runtime/5.80/trunk: . lib

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2009-04-21 14:41:12 +0100 (Tue, 21 Apr 2009)
New Revision: 9776

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
pass replace_constructor when making app immutable to force installation

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-04-21 10:50:55 UTC (rev 9775)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-04-21 13:41:12 UTC (rev 9776)
@@ -1,5 +1,8 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+        - pass replace_constructor to the immutable call to ensure
+          applications get a Moose constructor rather than a C::A one
+
 5.80002 2009-04-21 12:21:00
         - Fix issues with restarting the application class due to C3 failures
           on perl 5.10 (t0m)

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-04-21 10:50:55 UTC (rev 9775)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-04-21 13:41:12 UTC (rev 9776)
@@ -1,7 +1,7 @@
 package Catalyst;
 
 use Moose;
-extends 'Catalyst::Component';
+extends 'Catalyst::Component', 'Class::Accessor::Fast';
 use Moose::Util qw/find_meta/;
 use bytes;
 use Scope::Upper ();
@@ -1099,7 +1099,7 @@
     # applying modifiers).
     Scope::Upper::reap(sub {
         my $meta = Class::MOP::get_metaclass_by_name($class);
-        $meta->make_immutable unless $meta->is_immutable;
+        $meta->make_immutable(replace_constructor => 1) unless $meta->is_immutable;
     }, Scope::Upper::SCOPE(1));
 
     $class->setup_finalize;