From: André Walker <andre@andrewalker.net>
Date: Fri, 29 Jul 2011 04:01:57 +0000 (-0300)
Subject: Removed references to BlockInjection, and created validation for parameters in accept... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=b1afa6e202003c4ae1e91a6795400b44e9adea7d

Removed references to BlockInjection, and created validation for parameters in accept_context_args
---

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 85624a3..4409816 100644
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -8,7 +8,6 @@ use Devel::InnerPackage ();
 use Hash::Util qw/lock_hash/;
 use MooseX::Types::LoadableClass qw/ LoadableClass /;
 use Moose::Util;
-use Catalyst::IOC::BlockInjection;
 use Catalyst::IOC::ConstructorInjection;
 use Module::Pluggable::Object ();
 use namespace::autoclean;
@@ -618,7 +617,6 @@ sub add_component {
 
     $self->get_sub_container($type)->add_service(
         Catalyst::IOC::ConstructorInjection->new(
-            lifecycle => 'Singleton', # FIXME?
             name      => $name,
             class     => $component,
             dependencies => [
@@ -630,6 +628,10 @@ sub add_component {
                     isa => 'Str',
                     default => Catalyst::Utils::class2classsuffix( $component ),
                 },
+                accept_context_args => {
+                    isa => 'ArrayRef',
+                    default => sub { [] },
+                },
             },
         )
     );
diff --git a/lib/Catalyst/IOC/SubContainer.pm b/lib/Catalyst/IOC/SubContainer.pm
index 9ac735c..eadc933 100644
--- a/lib/Catalyst/IOC/SubContainer.pm
+++ b/lib/Catalyst/IOC/SubContainer.pm
@@ -1,7 +1,6 @@
 package Catalyst::IOC::SubContainer;
 use Bread::Board;
 use Moose;
-use Catalyst::IOC::BlockInjection;
 
 extends 'Bread::Board::Container';