Begin s/conflicted/conflicting/

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 7657e40..79c8b96 100644 (file)
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -264,7 +264,7 @@ $_->make_immutable(
     Moose::Meta::Role
     Moose::Meta::Role::Method
     Moose::Meta::Role::Method::Required
-    Moose::Meta::Role::Method::Conflicted
+    Moose::Meta::Role::Method::Conflicting
 
     Moose::Meta::Role::Composite
 

diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm
index 08f176c..18e68de 100644 (file)
--- a/lib/Moose/Meta/Role.pm
+++ b/lib/Moose/Meta/Role.pm
@@ -17,7 +17,7 @@ our $AUTHORITY = 'cpan:STEVAN';
 use Moose::Meta::Class;
 use Moose::Meta::Role::Method;
 use Moose::Meta::Role::Method::Required;
-use Moose::Meta::Role::Method::Conflicted;
+use Moose::Meta::Role::Method::Conflicting;
 
 use base 'Class::MOP::Module';
 
@@ -137,9 +137,9 @@ $META->add_attribute(
 );
 
 $META->add_attribute(
-    'conflicted_method_metaclass',
-    reader  => 'conflicted_method_metaclass',
-    default => 'Moose::Meta::Role::Method::Conflicted',
+    'conflicting_method_metaclass',
+    reader  => 'conflicting_method_metaclass',
+    default => 'Moose::Meta::Role::Method::Conflicting',
 );
 
 ## some things don't always fit, so they go here ...
@@ -175,7 +175,7 @@ sub add_required_methods {
     }
 }
 
-sub add_conflicted_method {
+sub add_conflicting_method {
     my $self = shift;
 
     my $method;
@@ -183,7 +183,7 @@ sub add_conflicted_method {
         $method = shift;
     }
     else {
-        $method = $self->conflicted_method_metaclass->new(@_);
+        $method = $self->conflicting_method_metaclass->new(@_);
     }
 
     $self->add_required_methods($method);
@@ -951,9 +951,9 @@ Adds the named methods to the role's list of required methods.
 
 Removes the named methods from the role's list of required methods.
 
-=item B<< $metarole->add_conflicted_method(%params) >>
+=item B<< $metarole->add_conflicting_method(%params) >>
 
-Instantiate the parameters as a L<Moose::Meta::Role::Method::Conflicted>
+Instantiate the parameters as a L<Moose::Meta::Role::Method::Conflicting>
 object, then add it to the required method list.
 
 =back

diff --git a/lib/Moose/Meta/Role/Application/RoleSummation.pm b/lib/Moose/Meta/Role/Application/RoleSummation.pm
index 8449f0b..c623554 100644 (file)
--- a/lib/Moose/Meta/Role/Application/RoleSummation.pm
+++ b/lib/Moose/Meta/Role/Application/RoleSummation.pm
@@ -171,7 +171,7 @@ sub apply_methods {
 
         if ($seen) {
             if ($seen->{method}->body != $method->{method}->body) {
-                $c->add_conflicted_method(
+                $c->add_conflicting_method(
                     name  => $method->{name},
                     roles => [$method->{role}->name, $seen->{role}->name],
                 );

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index ed60669..e547fa5 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -106,7 +106,7 @@ sub apply_methods {
             $role2->get_method($method_name)->body != $role1->get_method($method_name)->body) {
             # method conflicts between roles result
             # in the method becoming a requirement
-            $role2->add_conflicted_method(
+            $role2->add_conflicting_method(
                 name  => $method_name,
                 roles => [$role1->name, $role2->name],
             );

diff --git a/lib/Moose/Meta/Role/Method/Conflicted.pm b/lib/Moose/Meta/Role/Method/Conflicted.pm
index 914010e..73eeadd 100644 (file)
--- a/lib/Moose/Meta/Role/Method/Conflicted.pm
+++ b/lib/Moose/Meta/Role/Method/Conflicted.pm
@@ -1,5 +1,5 @@
 
-package Moose::Meta::Role::Method::Conflicted;
+package Moose::Meta::Role::Method::Conflicting;
 
 use strict;
 use warnings;
@@ -22,13 +22,13 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Method::Conflicted - A Moose metaclass for conflicted methods in Roles
+Moose::Meta::Role::Method::Conflicting - A Moose metaclass for conflicting methods in Roles
 
 =head1 DESCRIPTION
 
 =head1 INHERITANCE
 
-C<Moose::Meta::Role::Method::Conflicted> is a subclass of
+C<Moose::Meta::Role::Method::Conflicting> is a subclass of
 L<Moose::Meta::Role::Method::Required>.
 
 =head1 METHODS

diff --git a/t/030_roles/005_role_conflict_detection.t b/t/030_roles/005_role_conflict_detection.t
index 9382a2a..9a09acd 100644 (file)
--- a/t/030_roles/005_role_conflict_detection.t
+++ b/t/030_roles/005_role_conflict_detection.t
@@ -100,7 +100,7 @@ Role method conflicts
 
     ::throws_ok {
         with 'Role::Bling', 'Role::Bling::Bling';
-    } qr/Due to a method name conflict in roles 'Role::Bling' and 'Role::Bling::Bling', the method 'bling' must be implemented by 'My::Test3'/, '... role methods conflicted and method was required';
+    } qr/Due to a method name conflict in roles 'Role::Bling' and 'Role::Bling::Bling', the method 'bling' must be implemented by 'My::Test3'/, '... role methods conflict and method was required';
 
     package My::Test4;
     use Moose;
@@ -190,7 +190,7 @@ Role attribute conflicts
     ::throws_ok {
         with 'Role::Boo', 'Role::Boo::Hoo';
     } qr/We have encountered an attribute conflict/,
-      '... role attrs conflicted and method was required';
+      '... role attrs conflict and method was required';
 
     package My::Test8;
     use Moose;
@@ -216,7 +216,7 @@ Role attribute conflicts
     ::throws_ok {
         with 'Role::Boo', 'Role::Boo::Hoo';
     } qr/We have encountered an attribute conflict/,
-      '... role attrs conflicted and cannot be manually disambiguted';
+      '... role attrs conflict and cannot be manually disambiguted';
 
 }
 

diff --git a/t/030_roles/011_overriding.t b/t/030_roles/011_overriding.t
index 01f578a..49b8237 100644 (file)
--- a/t/030_roles/011_overriding.t
+++ b/t/030_roles/011_overriding.t
@@ -49,7 +49,7 @@ is( Class::A->new->xxy, "Role::B::xxy",  "... got the right xxy method" );
 
 {
     # check that when a role is added to another role
-    # and they conflict and the method they conflicted
+    # and they conflict and the method they conflict
     # with is then required.
 
     package Role::A::Conflict;