From: Christopher J. Madsen Date: Wed, 4 Jul 2012 04:50:25 +0000 (-0500) Subject: Fix is_subtype_of to handle not-yet-defined role X-Git-Tag: 2.0800~36 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0031c50c1ba39e702417ee2bc1cb6a00b7af2cfa;p=gitmo%2FMoose.git Fix is_subtype_of to handle not-yet-defined role --- diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm index 3451f13..1f5fe77 100644 --- a/lib/Moose/Meta/TypeConstraint/Role.pm +++ b/lib/Moose/Meta/TypeConstraint/Role.pm @@ -92,7 +92,8 @@ sub is_subtype_of { if ( not ref $type_or_name_or_role ) { # it might be a role - return 1 if Class::MOP::class_of($self->role)->does_role( $type_or_name_or_role ); + my $class = Class::MOP::class_of($self->role); + return 1 if defined($class) && $class->does_role( $type_or_name_or_role ); } my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_role); @@ -102,7 +103,8 @@ sub is_subtype_of { if ( $type->isa(__PACKAGE__) ) { # if $type_or_name_or_role isn't a role, it might be the TC name of another ::Role type # or it could also just be a type object in this branch - return Class::MOP::class_of($self->role)->does_role( $type->role ); + my $class = Class::MOP::class_of($self->role); + return defined($class) && $class->does_role( $type->role ); } else { # the only other thing we are a subtype of is Object $self->SUPER::is_subtype_of($type);