From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 12 Jan 2009 03:52:37 +0000 (+0000)
Subject: RenderView and DebugCookie done. Tidy up test in C::Component
X-Git-Tag: 5.8000_05~31
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=edffeb5aca522b3ff18fa1707bd848283dbec12b

RenderView and DebugCookie done. Tidy up test in C::Component
---

diff --git a/Makefile.PL b/Makefile.PL
index 15b0374..50a8cbc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -126,6 +126,8 @@ check_conflicts();
 # Nicked straight from Moose!
 sub check_conflicts {
     my %conflicts = (
+        'Catalyst::Action::RenderView'     => '0.08',
+        'Catalyst::Plugin::DebugCookie'    => '0.999002',
         'Catalyst::Plugin::Authentication' => '0.100092',
         'CatalystX::Imports'               => '0.03',
         'Catalyst-Plugin-HashedCookies'    => '1.03',
diff --git a/TODO b/TODO
index 73b33b6..c41e8c2 100644
--- a/TODO
+++ b/TODO
@@ -22,11 +22,6 @@ Known issues:
        an exception. Needs a test case (Caelum)
      
      - Catalyst::Plugin::Authentication new release.
-     
-     - Catalyst::Action::RenderView
-     - Catalyst::Plugin::DebugCookie
-       - Conflict with each other: $c->config->{debug}->{foo} = 'bar'
-         now breaks, unsure why..
 
 Cleanups:
 
diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 13ccb2c..50d6089 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -97,9 +97,7 @@ 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.
+        # work in a subclass.
         my $class = blessed($self) || $self;
         my $meta = Class::MOP::get_metaclass_by_name($class);
         unless ($meta->has_package_symbol('$_config')) {