X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=13ccb2c55c4ce74a447229ba93d91381bda7e57c;hb=e106a59f5b94228aa1df4cf2224e06c5ef53298b;hp=176769c97fe75495b6b1c9e7d68a9b674bf883e4;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 176769c..13ccb2c 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -2,10 +2,12 @@ package Catalyst::Component;
 
 use Moose;
 use Class::MOP;
-use MooseX::Adopt::Class::Accessor::Fast;
+use Class::MOP::Object;
 use Catalyst::Utils;
+use Class::C3::Adopt::NEXT;
 use MRO::Compat;
 use mro 'c3';
+use Scalar::Util qw/blessed/;
 
 with 'MooseX::Emulate::Class::Accessor::Fast';
 with 'Catalyst::ClassData';
@@ -68,8 +70,6 @@ sub BUILDARGS {
     return $args;
 }
 
-no Moose;
-
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
@@ -78,8 +78,10 @@ sub COMPONENT {
     if( my $next = $self->next::can ){
       my $class = blessed $self || $self;
       my ($next_package) = Class::MOP::get_code_info($next);
-      warn "There is a COMPONENT method resolving after Catalyst::Component in ${next_package}. This behavior is deprecated and will stop working in future releases.";
-      return $next->($self, $arguments);
+      warn "There is a COMPONENT method resolving after Catalyst::Component in ${next_package}.\n";
+      warn "This behavior can no longer be supported, and so your application is probably broken.\n";
+      warn "Your linearised isa hierarchy is: " . join(', ', mro::get_linear_isa($class)) . "\n";
+      warn "Please see perldoc Catalyst::Upgrading for more information about this issue.\n";
     }
     return $self->new($c, $arguments);
 }
@@ -98,8 +100,9 @@ sub config {
         # work in a subclass. If we don't have the package symbol in the
         # current class we know we need to copy up to ours, which calling
         # the setter will do for us.
-
-        unless ($self->meta->has_package_symbol('$_config')) {
+        my $class = blessed($self) || $self;
+        my $meta = Class::MOP::get_metaclass_by_name($class);
+        unless ($meta->has_package_symbol('$_config')) {
 
             $config = $self->merge_config_hashes( $config, {} );
             $self->_config( $config );
@@ -120,6 +123,7 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+no Moose;
 
 __PACKAGE__->meta->make_immutable;
 1;