More type constraint fixes for edge cases in is_a_type_of and is_a_subtype_of when...

[gitmo/Moose.git] / lib / Moose / Meta / TypeConstraint / Class.pm

diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm
index 0a763a1..4d63b09 100644 (file)
--- a/lib/Moose/Meta/TypeConstraint/Class.pm
+++ b/lib/Moose/Meta/TypeConstraint/Class.pm
@@ -7,7 +7,8 @@ use metaclass;
 use Scalar::Util 'blessed';
 use Moose::Util::TypeConstraints ();
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.57';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
@@ -19,9 +20,8 @@ __PACKAGE__->meta->add_attribute('class' => (
 sub new {
     my ( $class, %args ) = @_;
 
-    $args{class}  = $args{name} unless exists $args{class};
     $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object');
-    my $self      = $class->meta->new_object(%args);
+    my $self      = $class->_new(\%args);
 
     $self->_create_hand_optimized_type_constraint;
     $self->compile_type_constraint();
@@ -51,7 +51,7 @@ sub parents {
             # regardless of their name
             Moose::Util::TypeConstraints::find_type_constraint($_) 
                 || 
-            __PACKAGE__->new( name => $_ )
+            __PACKAGE__->new( class => $_, name => "__ANON__" )
         } $self->class->meta->superclasses,
     );
 }
@@ -61,6 +61,7 @@ sub equals {
 
     my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
 
+    return unless defined $other;
     return unless $other->isa(__PACKAGE__);
 
     return $self->class eq $other->class;
@@ -83,6 +84,8 @@ sub is_subtype_of {
     }
 
     my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_class);
+    
+    return unless defined $type;
 
     if ( $type->isa(__PACKAGE__) ) {
         # if $type_or_name_or_class isn't a class, it might be the TC name of another ::Class type