Skip to content

fix: remove redundant null-coalescing on always-set array offsets in SocialBehavior #1181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steinkel merged 2 commits into from
May 7, 2026
+6 −23
Merged

fix: remove redundant null-coalescing on always-set array offsets in SocialBehavior #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0803d71
fix: remove redundant null-coalescing on always-set array offsets in …
steinkel May 7, 2026
5035d65
fix: replace ReCaptcha\Response mock with real instance for PHP 8.4+ …
steinkel May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Model/Behavior/SocialBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ protected function _populateUser($data, $existingUser, $useEmail, $validateEmail
$email = explode('@', $dataEmail);
$userData['username'] = Hash::get($email, 0);
} else {
$firstName = $userData['first_name'] ?? null;
$firstName = $userData['first_name'];
$lastName = $userData['last_name'];
$userData['username'] = strtolower($firstName . $lastName);
$userData['username'] = preg_replace('/[^A-Za-z0-9]/i', '', $userData['username']);
}
}

$userData['username'] = $this->generateUniqueUsername($userData['username'] ?? null);
$userData['username'] = $this->generateUniqueUsername($userData['username']);
if ($useEmail) {
$userData['email'] = $data['email'] ?? null;
if (empty($dataValidated)) {
Expand Down
25 changes: 4 additions & 21 deletions tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

use Cake\Core\Configure;
use Cake\TestSuite\TestCase;
use ReCaptcha\Response;
use ReflectionMethod;

class ReCaptchaTraitTest extends TestCase
Expand Down Expand Up @@ -58,13 +59,7 @@ public function testValidateValidReCaptcha()
->onlyMethods(['verify'])
->disableOriginalConstructor()
->getMock();
$Response = $this->getMockBuilder('ReCaptcha\Response')
->onlyMethods(['isSuccess'])
->disableOriginalConstructor()
->getMock();
$Response->expects($this->once())
->method('isSuccess')
->will($this->returnValue(true));
$Response = new Response(true);
$ReCaptcha->expects($this->once())
->method('verify')
->with('value')
Expand All @@ -87,13 +82,7 @@ public function testValidateInvalidReCaptcha()
->onlyMethods(['verify'])
->disableOriginalConstructor()
->getMock();
$Response = $this->getMockBuilder('ReCaptcha\Response')
->onlyMethods(['isSuccess'])
->disableOriginalConstructor()
->getMock();
$Response->expects($this->once())
->method('isSuccess')
->will($this->returnValue(false));
$Response = new Response(false);
$ReCaptcha->expects($this->once())
->method('verify')
->with('invalid')
Expand Down Expand Up @@ -130,13 +119,7 @@ public function testValidateReCaptchaFalse()
->onlyMethods(['verify'])
->disableOriginalConstructor()
->getMock();
$Response = $this->getMockBuilder('ReCaptcha\Response')
->onlyMethods(['isSuccess'])
->disableOriginalConstructor()
->getMock();
$Response->expects($this->once())
->method('isSuccess')
->will($this->returnValue(false));
$Response = new Response(false);
$ReCaptcha->expects($this->once())
->method('verify')
->with('value')
Expand Down
Loading