Fix scope option not working in validateUnique.

The scope option exists in $context not $options. Add a previously failing test as well.
cakephp · Feb 23, 2015 · ee53006 · ee53006
1 parent aeead0f
commit ee53006
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -2055,7 +2055,7 @@ public function validateUnique($value, array $context, array $options = null)
         );
         $fields = array_merge(
             [$options['field']],
-            isset($options['scope']) ? (array)$options['scope'] : []
+            isset($context['scope']) ? (array)$context['scope'] : []
         );
         $rule = new IsUnique($fields);
         return $rule($entity, ['repository' => $this]);

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -3673,13 +3673,16 @@ public function testValidateUniqueScope()
         $table = TableRegistry::get('Users');
         $validator = new Validator;
         $validator->add('username', 'unique', [
-            'rule' => ['validateUnique', ['scope' => 'id']],
+            'rule' => ['validateUnique', ['derp' => 'erp', 'scope' => 'id']],
             'provider' => 'table'
         ]);
         $validator->provider('table', $table);
-        $data = ['username' => 'larry'];
+        $data = ['username' => 'larry', 'id' => 3];
         $this->assertNotEmpty($validator->errors($data));
 
+        $data = ['username' => 'larry', 'id' => 1];
+        $this->assertEmpty($validator->errors($data));
+
         $data = ['username' => 'jose'];
         $this->assertEmpty($validator->errors($data));
     }