X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=26e7e01552215f19a7da006305851c7d0f11cc79;hb=59e2fe94743666b9f079545e45252a93839c6398;hp=cf6157a83d6d7a5bd46d3a65ac307ef3cbd553bb;hpb=ed9d06b6c87f01030c2189199fe0351ef674e9e7;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index cf6157a..26e7e01 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -36,15 +36,30 @@ has actions =>
      init_arg => undef,
     );
 
+# ->config(actions => { '*' => ...
+has _all_actions_attributes => (
+    is       => 'ro',
+    isa      => 'HashRef',
+    init_arg => undef,
+    lazy     => 1,
+    builder  => '_build__all_actions_attributes',
+);
+
 sub BUILD {
     my ($self, $args) = @_;
     my $action  = delete $args->{action}  || {};
     my $actions = delete $args->{actions} || {};
     my $attr_value = $self->merge_config_hashes($actions, $action);
     $self->_controller_actions($attr_value);
-}
 
+    # trigger lazy builder
+    $self->_all_actions_attributes;
+}
 
+sub _build__all_actions_attributes {
+    my ($self) = @_;
+    delete $self->_controller_actions->{'*'} || {};
+}
 
 =head1 NAME
 
@@ -195,13 +210,7 @@ sub get_action_methods {
             $meta->find_method_by_name($_)
                 || confess( sprintf 'Action "%s" is not available from controller %s',
                             $_, ref $self )
-          } grep {
-              # '*' is a special action configuration key to apply config to all
-              # actions. It's not to be looked up as a method
-              # name. _controller_actions should probably be cleaned up before
-              # we even get here.
-              $_ ne '*'
-          } keys %{ $self->_controller_actions }
+        } keys %{ $self->_controller_actions }
     ) if ( ref $self );
     return uniq @methods;
 }
@@ -299,17 +308,22 @@ sub _parse_attrs {
         }
     }
 
-    my $actions;
+    my ($actions_config, $all_actions_config);
     if( ref($self) ) {
-        $actions = $self->_controller_actions;
+        $actions_config = $self->_controller_actions;
+        # No, you're not getting actions => { '*' => ... } with actions in MyApp.
+        $all_actions_config = $self->_all_actions_attributes;
     } else {
         my $cfg = $self->config;
-        $actions = $self->merge_config_hashes($cfg->{actions}, $cfg->{action});
+        $actions_config = $self->merge_config_hashes($cfg->{actions}, $cfg->{action});
+        $all_actions_config = {};
     }
 
     %raw_attributes = (
         %raw_attributes,
-        exists $actions->{$name} ? %{ $actions->{$name } } : (),
+        # Note we deep copy array refs here to stop crapping on config
+        # when attributes are parsed. RT#65463
+        exists $actions_config->{$name} ? map { ref($_) eq 'ARRAY' ? [ @$_ ] : $_ } %{ $actions_config->{$name } } : (),
     );
 
     # Private actions with additional attributes will raise a warning and then
@@ -318,10 +332,8 @@ sub _parse_attrs {
     # probably be turned into :Actions instead, or we might want to otherwise
     # disambiguate between those built-in internal actions and user-level
     # Private ones.
-    %raw_attributes = (
-        (exists $actions->{'*'} ? %{ $actions->{'*'} } : ()),
-        %raw_attributes,
-    ) unless $raw_attributes{Private};
+    %raw_attributes = (%{ $all_actions_config }, %raw_attributes)
+        unless $raw_attributes{Private};
 
     my %final_attributes;