From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sat, 7 Jan 2006 20:50:34 +0000 (+0000)
Subject: - Catalyst no longer isa Catalyst::Base (adds Catalyst::Controller to @INC instead... 
X-Git-Tag: 5.7099_04~755
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=313751843f67518acde027acf604f327c1679420

- Catalyst no longer isa Catalyst::Base (adds Catalyst::Controller to @INC instead), changed some isa checks to duck typing
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 46f6bae..0226ba1 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,7 +1,7 @@
 package Catalyst;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Component';
 use bytes;
 use UNIVERSAL::require;
 use Catalyst::Exception;
@@ -10,6 +10,7 @@ use Catalyst::Request;
 use Catalyst::Request::Upload;
 use Catalyst::Response;
 use Catalyst::Utils;
+use Catalyst::Controller;
 use File::stat;
 use NEXT;
 use Text::SimpleTable;
@@ -71,7 +72,7 @@ sub import {
 
     unless ( $caller->isa('Catalyst') ) {
         no strict 'refs';
-        push @{"$caller\::ISA"}, $class;
+        push @{"$caller\::ISA"}, $class, 'Catalyst::Controller';
     }
 
     $caller->arguments( [@arguments] );
@@ -1544,7 +1545,7 @@ sub setup_components {
     my $callback = sub {
         my ( $component, $context ) = @_;
 
-        unless ( $component->isa('Catalyst::Component') ) {
+        unless ( $component->can('COMPONENT') ) {
             return $component;
         }
 
diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index b1f105b..a8cc036 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -44,7 +44,7 @@ sub _AUTO : Private {
 sub _ACTION : Private {
     my ( $self, $c ) = @_;
     if (   ref $c->action
-        && $c->action->isa('Catalyst::Action')
+        && $c->action->can('execute')
         && $c->req->action )
     {
         $c->action->execute($c);