替換棄用字串助手與斷言

Author: frankslin

app/Http/Controllers/Auth/RegisterController.php

@@ -8,6 +8,7 @@
 use Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Str;
 use Naux\Mail\SendCloudTemplate;
 
 class RegisterController extends Controller
@@ -83,7 +84,7 @@ protected function create(array $data)
             'email' => $data['email'],
             'institution' => $data['institution'],
             'avatar' => 'avatar5.png',
-            'confirmation_token' => str_random(40),
+            'confirmation_token' => Str::random(40),
             'settings' => [
                 'registration_ip' => $ip,
                 'last_login_ip' => $ip,

app/Http/Controllers/EmailController.php

@@ -5,6 +5,7 @@
 use App\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 use Auth;
 
 class EmailController extends Controller
@@ -17,7 +18,7 @@ public function verify($token)
             return route('/');
         }
 //        $user->is_active = 2;
-        $user->confirmation_token = str_random(40);
+        $user->confirmation_token = Str::random(40);
         $user->save();
         Auth::login($user);
         flash('用户激活成功 '.Carbon::now(), 'success');

database/factories/ModelFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 /*
 |--------------------------------------------------------------------------
 | Model Factories
@@ -19,6 +21,6 @@
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
         'password' => $password ?: $password = bcrypt('secret'),
-        'remember_token' => str_random(10),
+        'remember_token' => Str::random(10),
     ];
 });

tests/Feature/AdminBatchLoadBookTitlesTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class AdminBatchLoadBookTitlesTest extends TestCase
@@ -83,7 +84,7 @@ protected function makeUser(array $attributes = []): User
             'email' => uniqid('admin', true).'@example.com',
             'password' => bcrypt('secret'),
             'avatar' => 'avatar5.png',
-            'confirmation_token' => str_random(10),
+            'confirmation_token' => Str::random(10),
         ]);
 
         foreach ($attributes as $key => $value) {

tests/Feature/AdminBatchLoadOfficesTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class AdminBatchLoadOfficesTest extends TestCase
@@ -95,7 +96,7 @@ protected function makeUser(array $attributes = []): User
             'email' => uniqid('admin', true).'@example.com',
             'password' => bcrypt('secret'),
             'avatar' => 'avatar5.png',
-            'confirmation_token' => str_random(10),
+            'confirmation_token' => Str::random(10),
         ]);
 
         foreach ($attributes as $key => $value) {

tests/Feature/AdminBatchLoadSocialInstitutesTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class AdminBatchLoadSocialInstitutesTest extends TestCase
@@ -113,7 +114,7 @@ protected function makeUser(array $attributes = []): User
             'email' => uniqid('admin', true).'@example.com',
             'password' => bcrypt('secret'),
             'avatar' => 'avatar5.png',
-            'confirmation_token' => str_random(10),
+            'confirmation_token' => Str::random(10),
         ]);
 
         foreach ($attributes as $key => $value) {

tests/Feature/AdminExplainSqlTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class AdminExplainSqlTest extends TestCase
@@ -46,7 +47,7 @@ protected function makeUser(array $attributes = []): User
             'email' => uniqid().'@example.com',
             'password' => bcrypt('secret'),
             'avatar' => 'avatar5.png',
-            'confirmation_token' => str_random(10),
+            'confirmation_token' => Str::random(10),
         ]);
 
         foreach ($attributes as $key => $value) {

tests/Feature/BiogMainNameSearchTest.php

@@ -320,10 +320,10 @@ public function test_empty_query_returns_paginated_list(): void
         $result = BiogMainRepository::namesByQuery($request, 20);
 
         // 空查詢應該返回 JSON 字串（原有邏輯）
-        $this->assertInternalType('string', $result);
+        $this->assertIsString($result);
 
         $decoded = json_decode($result, true);
-        $this->assertInternalType('array', $decoded);
+        $this->assertIsArray($decoded);
         $this->assertArrayHasKey('data', $decoded);
         $this->assertGreaterThanOrEqual(3, count($decoded['data']));
     }

tests/Feature/OperationsProposalControllerTest.php

@@ -126,7 +126,7 @@ public function testApproveCreateProposalInsertsRow()
 
         $flash = session('flash_notification', collect())->toArray();
         $this->assertNotEmpty($flash);
-        $this->assertContains('已核准', $flash[0]['message'] ?? '');
+        $this->assertStringContainsString('已核准', $flash[0]['message'] ?? '');
 
         $operation->refresh();
         $payload = json_decode($operation->resource_data, true);

tests/Unit/MergePreviewControllerTest.php

@@ -65,9 +65,9 @@ public function testCalculateMergedPersonCombinesAttributesAndNotes()
         $this->assertSame('Active', $values['c_status']);
         $this->assertSame('MergeAdmin', $values['c_modified_by']);
         $this->assertSame('20250102', $values['c_modified_date']);
-        $this->assertContains('Primary note', $values['c_notes']);
-        $this->assertContains('Secondary note', $values['c_notes']);
-        $this->assertContains('[merged #123 and #456 on 20250102 with reason] duplicate record', $values['c_notes']);
+        $this->assertStringContainsString('Primary note', $values['c_notes']);
+        $this->assertStringContainsString('Secondary note', $values['c_notes']);
+        $this->assertStringContainsString('[merged #123 and #456 on 20250102 with reason] duplicate record', $values['c_notes']);
 
         $this->assertArrayHasKey('c_notes', $updates);
         $this->assertArrayHasKey('c_modified_by', $updates);