Merge pull request #1163 from CakeDC/more-deprecations

fix deprecation

Author: steinkel

src/Model/Behavior/RegisterBehavior.php

@@ -146,7 +146,9 @@ public function activateUser(EntityInterface $user)
     public function buildValidator(\Cake\Event\EventInterface $event, Validator $validator, $name): void
     {
         if ($name === 'default') {
-            $validator = $this->_emailValidator($validator, $this->validateEmail);
+            $event->setResult($this->_emailValidator($validator, $this->validateEmail));
+
+            return;
         }
 
         $event->setResult($validator);
@@ -164,7 +166,7 @@ protected function _emailValidator(Validator $validator, $validateEmail)
         $this->validateEmail = (bool)$validateEmail;
         $validator
             ->add('email', 'valid_email', ['rule' => 'email'])
-            ->notBlank('email', __d('cake_d_c/users', 'This field is required'), function ($context) {
+            ->notBlank('email', __d('cake_d_c/users', 'This field is required'), function () {
                 return $this->validateEmail;
             });
 

src/Model/Behavior/SocialBehavior.php

@@ -307,6 +307,7 @@ protected function extractAccountData(array $data)
         $accountData['reference'] = $data['id'] ?? null;
         $accountData['avatar'] = $data['avatar'] ?? null;
         $accountData['link'] = $data['link'] ?? null;
+        $accountData['provider'] = $data['provider'] ?? null;
 
         if ($accountData['avatar'] ?? null) {
             $accountData['avatar'] = str_replace('normal', 'square', $accountData['avatar']);

tests/TestCase/Model/Behavior/RegisterBehaviorTest.php

@@ -14,11 +14,13 @@
 namespace CakeDC\Users\Test\TestCase\Model\Behavior;
 
 use Cake\Core\Configure;
+use Cake\Event\Event;
 use Cake\Mailer\Mailer;
 use Cake\Mailer\TransportFactory;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
+use Cake\Validation\Validator;
 use CakeDC\Users\Exception\TokenExpiredException;
 use CakeDC\Users\Exception\UserNotFoundException;
 use CakeDC\Users\Model\Behavior\RegisterBehavior;
@@ -357,4 +359,32 @@ public function testRegisterUsingCustomRole()
             ]);
         $this->assertSame('emperor', $result['role']);
     }
+
+    /**
+     * Test buildValidator method with 'default' validator name
+     *
+     * @return void
+     */
+    public function testBuildValidatorDefault()
+    {
+        $event = new Event('Model.buildValidator');
+        $validator = new Validator();
+        $this->Behavior->buildValidator($event, $validator, 'default');
+        $this->assertSame($validator, $event->getResult());
+        $this->assertArrayHasKey('valid_email', $validator->field('email')->rules());
+    }
+
+    /**
+     * Test buildValidator method with non-default validator name
+     *
+     * @return void
+     */
+    public function testBuildValidatorNonDefault()
+    {
+        $event = new Event('Model.buildValidator');
+        $validator = new Validator();
+        $this->Behavior->buildValidator($event, $validator, 'custom');
+        $this->assertSame($validator, $event->getResult());
+        $this->assertArrayNotHasKey('valid_email', $validator->field('email')->rules());
+    }
 }