Fix warning message, patch from dev list.

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Component.pm

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 176769c..2782252 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -2,8 +2,9 @@ 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';
 
@@ -68,8 +69,6 @@ sub BUILDARGS {
     return $args;
 }
 
-no Moose;
-
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
@@ -78,8 +77,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 linearized 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);
 }
@@ -95,11 +96,10 @@ sub config {
     } else {
         # this is a bit of a kludge, required to make
         # __PACKAGE__->config->{foo} = 'bar';
-        # 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')) {
+        # work in a subclass.
+        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 +120,7 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+no Moose;
 
 __PACKAGE__->meta->make_immutable;
 1;
@@ -169,7 +170,7 @@ Alias for the method in L<Catalyst::Utils>.
 
 =head2 ACCEPT_CONTEXT($c, @args)
 
-Catalyst components are normally initalized during server startup, either
+Catalyst components are normally initialized during server startup, either
 as a Class or a Instance. However, some components require information about
 the current request. To do so, they can implement an ACCEPT_CONTEXT method.