From: Shawn M Moore <sartak@gmail.com>
Date: Sat, 30 May 2009 22:43:01 +0000 (-0400)
Subject: Role::Method->is_conflict
X-Git-Tag: 0.80~33
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=974039513975995d426c4e5b04692ee4f08b2d1c;p=gitmo%2FMoose.git

Role::Method->is_conflict
---

diff --git a/lib/Moose/Meta/Role/Method/Conflicted.pm b/lib/Moose/Meta/Role/Method/Conflicted.pm
index e96fe6e..914010e 100644
--- a/lib/Moose/Meta/Role/Method/Conflicted.pm
+++ b/lib/Moose/Meta/Role/Method/Conflicted.pm
@@ -12,6 +12,8 @@ our $AUTHORITY = 'cpan:STEVAN';
 
 __PACKAGE__->meta->add_attribute('roles' => (reader => 'roles'));
 
+sub is_conflict { 1 }
+
 1;
 
 __END__
@@ -29,6 +31,17 @@ Moose::Meta::Role::Method::Conflicted - A Moose metaclass for conflicted methods
 C<Moose::Meta::Role::Method::Conflicted> is a subclass of
 L<Moose::Meta::Role::Method::Required>.
 
+=head1 METHODS
+
+=over 4
+
+=item B<< $method->is_conflict >>
+
+Returns whether the method requirement is due to a conflict. By default for
+this class, it's true.
+
+=back
+
 =head1 BUGS
 
 All complex software has bugs lurking in it, and this module is no
diff --git a/lib/Moose/Meta/Role/Method/Required.pm b/lib/Moose/Meta/Role/Method/Required.pm
index 89dae20..e379123 100644
--- a/lib/Moose/Meta/Role/Method/Required.pm
+++ b/lib/Moose/Meta/Role/Method/Required.pm
@@ -21,6 +21,8 @@ __PACKAGE__->meta->add_attribute('name' => (reader => 'name'));
 
 sub new { shift->_new(@_) }
 
+sub is_conflict { 0 }
+
 1;
 
 __END__
@@ -59,6 +61,11 @@ The method name. This is required.
 
 Returns the required method's name, as provided to the constructor.
 
+=item B<< $method->is_conflict >>
+
+Returns whether the method requirement is due to a conflict. By default for
+this class, it's false.
+
 =back
 
 =head1 BUGS