Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v8.0.4',
-  'full_app_version' => 'v8.0.4 - build 17400-gb0b5a9669',
-  'build_version' => '17400',
+  'full_app_version' => 'v8.0.4 - build 17611-gfab1a6c33',
+  'build_version' => '17611',
   'prerelease_version' => '',
-  'hash_version' => 'gb0b5a9669',
-  'full_hash' => 'v8.0.4-202-gb0b5a9669',
+  'hash_version' => 'gfab1a6c33',
+  'full_hash' => 'v8.0.5-413-gfab1a6c33',
   'branch' => 'master',
 );

tests/Feature/Users/Api/UsersForSelectListTest.php

@@ -86,13 +86,13 @@ public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySuppo
         $this->settings->enableMultipleFullCompanySupport();
 
         $jedi = Company::factory()->has(User::factory()->count(3)->sequence(
-            ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'],
-            ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'],
-            ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'],
+            ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker', 'email' => '[email protected]'],
+            ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi', 'email' => '[email protected]'],
+            ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker', 'email' => '[email protected]'],
         ))->create();
 
         Company::factory()
-            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']))
+            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader', 'email' => '[email protected]']))
             ->create();
 
         Passport::actingAs($jedi->users->first());
@@ -104,7 +104,7 @@ public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySuppo
         $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')));
         $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Anakin')));
 
-        $response = $this->getJson(route('api.users.selectlist', ['search' => 'v']))->assertOk();
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'dvader']))->assertOk();
         $this->assertEquals(0, collect($response->json('results'))->count());
     }
 }