[Catalyst-commits] r9759 - in trunk/Catalyst-Plugin-StackTrace: . lib/Catalyst/Plugin

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2009-04-20 12:54:20 +0100 (Mon, 20 Apr 2009)
New Revision: 9759

Modified:
   trunk/Catalyst-Plugin-StackTrace/Changes
   trunk/Catalyst-Plugin-StackTrace/Makefile.PL
   trunk/Catalyst-Plugin-StackTrace/lib/Catalyst/Plugin/StackTrace.pm
Log:
Make StackTrace MRO compliant


Modified: trunk/Catalyst-Plugin-StackTrace/Changes
===================================================================
--- trunk/Catalyst-Plugin-StackTrace/Changes	2009-04-20 10:44:28 UTC (rev 9758)
+++ trunk/Catalyst-Plugin-StackTrace/Changes	2009-04-20 11:54:20 UTC (rev 9759)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::StackTrace
 
+0.10    2009-04-20 13:50:00
+        - Switch to MRO::Compat
+
 0.09    2008-09-03 12:00:00
         - Filter out unwanted stack frames and attributes in the
           $SIG{__DIE__} handler instead of finalize_error().

Modified: trunk/Catalyst-Plugin-StackTrace/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-StackTrace/Makefile.PL	2009-04-20 10:44:28 UTC (rev 9758)
+++ trunk/Catalyst-Plugin-StackTrace/Makefile.PL	2009-04-20 11:54:20 UTC (rev 9759)
@@ -5,5 +5,6 @@
 
 requires 'Catalyst' => '5.70';
 requires 'Devel::StackTrace';
+requires 'MRO::Compat' => '0.10';
 
 WriteAll;

Modified: trunk/Catalyst-Plugin-StackTrace/lib/Catalyst/Plugin/StackTrace.pm
===================================================================
--- trunk/Catalyst-Plugin-StackTrace/lib/Catalyst/Plugin/StackTrace.pm	2009-04-20 10:44:28 UTC (rev 9758)
+++ trunk/Catalyst-Plugin-StackTrace/lib/Catalyst/Plugin/StackTrace.pm	2009-04-20 11:54:20 UTC (rev 9759)
@@ -7,21 +7,19 @@
 use Devel::StackTrace;
 use HTML::Entities;
 use Scalar::Util qw/blessed/;
-use NEXT;
+use MRO::Compat;
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 __PACKAGE__->mk_accessors('_stacktrace');
 
 sub execute {
     my $c = shift;
 
-    # NEXT hack is required when extending execute :(
-    local $NEXT::NEXT{ $c, 'execute' };
 
     my $conf = $c->config->{stacktrace};
 
-    return $c->NEXT::execute(@_) 
+    return $c->next::method(@_) 
       unless defined $conf->{enable} && $conf->{enable}
           || !defined $conf->{enable} && $c->debug;
 
@@ -45,6 +43,7 @@
                    Catalyst::Plugin::StackTrace
                    Catalyst::Plugin::Static::Simple
                    NEXT
+                   Class::C3
                    main
                   /
             ];
@@ -92,13 +91,13 @@
         die $error;
     };
 
-    return $c->NEXT::execute(@_);
+    return $c->next::method(@_);
 }
 
 sub finalize_error {
     my $c = shift;
 
-    $c->NEXT::finalize_error(@_);
+    $c->next::method(@_);
 
     if ( $c->debug ) {
         return unless ref $c->_stacktrace eq 'ARRAY';
@@ -173,7 +172,7 @@
 sub setup {
     my $c = shift;
 
-    $c->NEXT::setup(@_);
+    $c->next::method(@_);
 
     $c->config->{stacktrace}->{context} ||= 3;
     $c->config->{stacktrace}->{verbose} ||= 0;