Merge branch 'master' into gsoc_breadboard

[catagits/Catalyst-Runtime.git] / lib / Catalyst / IOC / Service / WithParameters.pm

diff --git a/lib/Catalyst/IOC/Service/WithParameters.pm b/lib/Catalyst/IOC/Service/WithParameters.pm
index 44c42f9..2609996 100644 (file)
--- a/lib/Catalyst/IOC/Service/WithParameters.pm
+++ b/lib/Catalyst/IOC/Service/WithParameters.pm
@@ -1,15 +1,18 @@
 package Catalyst::IOC::Service::WithParameters;
 use Moose::Role;
 
-with 'Bread::Board::Service',
-     'Bread::Board::Service::WithParameters';
+with 'Bread::Board::Service::WithParameters' => { excludes => '_build_parameters' };
+
+# FIXME - shouldn't this be merged with WithAcceptContext?
 
 sub _build_parameters {
-    return {
+    {
+        ctx => {
+            required => 1,
+        },
         accept_context_args => {
-            isa      => 'ArrayRef|Undef',
-            required => 0,
-            default  => undef,
+            isa      => 'ArrayRef',
+            default  => [],
         }
     };
 }