change the way we do this logic for older perl compat

diff --git a/.travis.yml b/.travis.yml
index d8b448a..4db74ef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
 
    # author deps -- wish there was a better way
    - cpanm --notest --metacpan --skip-satisfied CatalystX::LeakChecker Catalyst::Devel Catalyst::Engine::PSGI Starman MooseX::Daemonize Test::WWW::Mechanize::Catalyst Catalyst::Plugin::Params::Nested
-   - cpanm --notest --metacpan --skip-satisfied Test::Without::Module Test::NoTabs Test::Pod Test::Pod::Coverage Test::Spelling Pod::Coverage::TrustPod
+   - cpanm --notest --metacpan --skip-satisfied Test::Without::Module Test::NoTabs Test::Pod Test::Pod::Coverage Test::Spelling Pod::Coverage::TrustPod Type::Tiny
    - cpanm --notest --metacpan --skip-satisfied --installdeps .
    - echo y | perl Makefile.PL
 

diff --git a/Changes b/Changes
index 374b9aa..4d86d01 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+5.90101 - 2015-09-04
+  - Fixed a regression introduced in the last release which caused test
+    case failure when using a version of Perl 5.14 or older.
+
 5.90100 - 2015-08-24
   - Document using namespace::autoclean with controllers that have actions
     with type constraints.

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9b41885..c290fff 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -180,7 +180,7 @@ sub composed_stats_class {
 __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC);
 
 # Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90100';
+our $VERSION = '5.90101';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
 sub import {

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 257feb5..fef451d 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -249,50 +249,49 @@ sub resolve_type_constraint {
     return $name;
   }
 
+  # This is broken for when there is more than one constraint
   if($name=~m/::/) {
     eval "use Type::Registry; 1" || die "Can't resolve type constraint $name without installing Type::Tiny";
     my $tc =  Type::Registry->new->foreign_lookup($name);
-    return defined $tc ? $tc : die "'$name' not a type constraint in ${\$self->private_path}";
+    return defined $tc ? $tc : die "'$name' not a full namespace type constraint in ${\$self->private_path}";
   }
+  
+  my @tc = grep { defined $_ } (eval("package ${\$self->class}; $name"));
 
-  my @tc = eval "package ${\$self->class}; $name" or do {
+  unless(scalar @tc) {
     # ok... so its not defined in the package.  we need to look at all the roles
     # and superclasses, look for attributes and figure it out.
     # Superclasses take precedence;
-    #
+
     my @supers = $self->class->can('meta') ? map { $_->meta } $self->class->meta->superclasses : ();
     my @roles = $self->class->can('meta') ? $self->class->meta->calculate_all_roles : ();
 
     # So look thru all the super and roles in order and return the
     # first type constraint found. We should probably find all matching
     # type constraints and try to do some sort of resolution.
-    
-    warn "--> Hunting for TC $name in controller hierarchy\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
 
     foreach my $parent (@roles, @supers) {
-      warn "    Looking for TC $name in ${\$parent->name}\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
       if(my $m = $parent->get_method($self->name)) {
         if($m->can('attributes')) {
-          warn "      method $m has attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
           my ($key, $value) = map { $_ =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ }
             grep { $_=~/^Args\(/ or $_=~/^CaptureArgs\(/ }
               @{$m->attributes};
-          warn "      about to evaluate any found attrs\n"  if $ENV{CATALYST_CONSTRAINTS_DEBUG};
           next unless $value eq $name;
-          warn "      found attr info $key and $value\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
           my @tc = eval "package ${\$parent->name}; $name";
-          return @tc if scalar(@tc);
-        } else {
-          warn "    method $m does not have method attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
-        }
+          if(scalar(@tc)) {
+            return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
+          } else {
+            return;
+          }
+        } 
       }
     }
     
     my $classes = join(',', $self->class, @roles, @supers);
     die "'$name' not a type constraint in '${\$self->private_path}', Looked in: $classes";
-  };
+  }
 
-  if($tc[0]) {
+  if(scalar(@tc)) {
     return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
   } else {
     return;

diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm
index a801245..a9c86d1 100644 (file)
--- a/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@ -7,7 +7,7 @@ BEGIN { require 5.008003; }
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION = '5.90100';
+our $VERSION = '5.90101';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
 =head1 NAME