Switch to MRO::Compat

diff --git a/Changes b/Changes
index 6364876..8b0aef0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,9 @@
 Revision history for Catalyst-Component-ACCEPT_CONTEXT
 
+        Switch from NEXT to MRO::Compat
+
 0.05    18 Jan 2008
-        Don't inherit from Catalyst::Component; this breaks NEXT (!)        
+        Don't inherit from Catalyst::Component; this breaks NEXT (!)
 
 0.04   15 Sep 2007
        Be less invasive; return the same $self each time.

diff --git a/Makefile.PL b/Makefile.PL
index d173933..05fd7fb 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,6 +7,7 @@ all_from 'lib/Catalyst/Component/ACCEPT_CONTEXT.pm';
 
 requires 'Catalyst';
 requires 'Scalar::Util';
+requires 'MRO::Compat';
 build_requires 'Devel::Cycle';
 auto_install;
 WriteAll;

diff --git a/lib/Catalyst/Component/ACCEPT_CONTEXT.pm b/lib/Catalyst/Component/ACCEPT_CONTEXT.pm
index 9afcdc1..0d6815d 100644 (file)
--- a/lib/Catalyst/Component/ACCEPT_CONTEXT.pm
+++ b/lib/Catalyst/Component/ACCEPT_CONTEXT.pm
@@ -2,7 +2,7 @@ package Catalyst::Component::ACCEPT_CONTEXT;
 
 use warnings;
 use strict;
-use NEXT;
+use MRO::Compat;
 use Scalar::Util qw(weaken);
 
 =head1 NAME
@@ -120,8 +120,8 @@ sub ACCEPT_CONTEXT {
 
     $self->{context} = $context;
     weaken($self->{context});
-    
-    return $self->NEXT::ACCEPT_CONTEXT($context, @_) || $self;
+
+    return $self->next::method($context, @_) || $self;
 }
 
 =head2 COMPONENT
@@ -136,7 +136,7 @@ sub COMPONENT {
     my $args  = shift;
     $args->{context} = $app;
     weaken($args->{context}) if ref $args->{context};
-    return $class->NEXT::COMPONENT($app, $args, @_);
+    return $class->next::method($app, $args, @_);
 }
 
 =head1 AUTHOR