From: André Walker <andre@andrewalker.net>
Date: Sat, 20 Aug 2011 04:26:09 +0000 (-0300)
Subject: ditto
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=217d924448313f6a9238e4820a7e5cc138271e75

ditto
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index f021840..3f1e569 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2334,10 +2334,6 @@ sub setup_components { shift->container->setup_components }
 
 =cut
 
-# FIXME - removed locate_components
-# don't people mess with this method directly?
-# what to do with that?
-
 sub locate_components {
     my $class = shift;
 
diff --git a/lib/Catalyst/IOC/Service/WithAcceptContext.pm b/lib/Catalyst/IOC/Service/WithAcceptContext.pm
index 9e113b4..99b45e0 100644
--- a/lib/Catalyst/IOC/Service/WithAcceptContext.pm
+++ b/lib/Catalyst/IOC/Service/WithAcceptContext.pm
@@ -17,9 +17,6 @@ around get => sub {
     my $instance = $self->$orig(@_);
 
     if ( $accept_context_args && $instance->can($ac_sub) ) {
-        # FIXME - MADNESS!
-        # how the heck does this warn CODE???????????
-        warn ref $accept_context_args if ref $accept_context_args ne 'ARRAY';
         return $instance->$ac_sub( @$accept_context_args );
     }
 
diff --git a/t/lib/TestAppCustomContainer.pm b/t/lib/TestAppCustomContainer.pm
index 8915669..30ce27b 100644
--- a/t/lib/TestAppCustomContainer.pm
+++ b/t/lib/TestAppCustomContainer.pm
@@ -4,9 +4,8 @@ use Catalyst;
 extends 'Catalyst';
 use namespace::autoclean;
 
- confess("No default container") unless $ENV{TEST_APP_CURRENT_CONTAINER};
-Class::MOP::load_class($ENV{TEST_APP_CURRENT_CONTAINER}); # FIXME!
-# Custom container name is silently ignored if the class doesn't exist!
+confess("No default container") unless $ENV{TEST_APP_CURRENT_CONTAINER};
+
 __PACKAGE__->config(
     container_class => $ENV{TEST_APP_CURRENT_CONTAINER}
 );