Update README.md (mettle#291)

JonoB · web-flow · commit 6652906992cd · 2024-04-19T12:58:22.000+01:00
diff --git a/.env.example b/.env.example
@@ -9,9 +9,9 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=sendportal_dev
+DB_USERNAME=homestead
+DB_PASSWORD=secret
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,19 +20,19 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: password
-          MYSQL_USER: homestead
+          MYSQL_DATABASE: sendportal_testing
+          MYSQL_USER: laravel
           MYSQL_PASSWORD: secret
-          MYSQL_DATABASE: sendportal_dev
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
       postgres:
         image: postgres
         env:
-          POSTGRES_USER: homestead
+          POSTGRES_DB: sendportal_testing
+          POSTGRES_USER: laravel
           POSTGRES_PASSWORD: secret
-          POSTGRES_DB: sendportal_dev
         ports:
           - 5432:5432
         options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -46,10 +46,8 @@ jobs:
         env:
           DB_CONNECTION: mysql
           DB_HOST: mysql
-          DB_PORT: 3306
       - name: Run Testsuite against Postgres
         run: vendor/bin/phpunit
         env:
           DB_CONNECTION: pgsql
           DB_HOST: postgres
-          DB_PORT: 5432
diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
@@ -0,0 +1 @@
+{"php":"8.1.12","version":"3.13.0","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"no_empty_statement":true,"no_useless_return":true,"not_operator_with_successor_space":true,"explicit_string_variable":true,"simple_to_complex_string_variable":true,"array_indentation":true,"blank_line_before_statement":{"statements":["case","default","declare","do","goto","if","include","include_once","require","require_once","switch","try"]}},"hashes":{"routes\/console.php":"043de8d2168ad1c2f19f1f32431ca640","routes\/api.php":"1cfef62d42fc585043690f50f0d7816f","routes\/web.php":"765479749fce08c21ce3c82878dc68e5","routes\/channels.php":"edadd8dfa4a96a42dde09f4ba1362bbd","database\/seeders\/DatabaseSeeder.php":"863fc820d5b1b26b07ff78678e75c600","database\/factories\/UserFactory.php":"14bb2790d699e4c12d3c921413397816","database\/factories\/InvitationFactory.php":"5d7806ef7213f9b8d0ccb1a67572c1c2","database\/factories\/ApiTokenFactory.php":"39a07fd93703811c1e8138c90f617cc5","database\/factories\/WorkspaceFactory.php":"8eb260ed12b4aeef9662731f5f927524","database\/migrations\/2014_10_12_000000_create_users_table.php":"6f6305c9621dc43a7e4e67692f74823a","database\/migrations\/2019_08_19_000000_create_failed_jobs_table.php":"2d2101455252f967fc9f40bdfd44c96f","database\/migrations\/2017_04_11_100000_create_invitations_table.php":"4498012dc9968cfbe113a08f39ee14da","database\/migrations\/2021_01_26_151747_remove_api_token_from_users_table.php":"768971eed7996a173e67e9367cab22ef","database\/migrations\/2019_08_24_114758_adjust_users_table.php":"8a5aee2cd552991b28f0d9633d54efe9","database\/migrations\/2017_04_11_000000_create_workspaces_table.php":"523915ba995bcc529a38261248825b82","database\/migrations\/2020_11_13_120125_create_api_tokens_table.php":"7ee00241a111ac86e6ce713f220dfa0c","database\/migrations\/2014_10_12_100000_create_password_resets_table.php":"6a565de52ad5c704c0a50d9da2dce231","app\/Providers\/EventServiceProvider.php":"34a080e907226081e6958d8e1611101e","app\/Providers\/AppServiceProvider.php":"238832fb41ec4d01ea13a4e3d8688b1f","app\/Providers\/BroadcastServiceProvider.php":"0ee72a104b9018e848f386a2d425bd36","app\/Providers\/HorizonServiceProvider.php":"7b22e94cc33bfe5edadd55ddbb24bbf8","app\/Providers\/AuthServiceProvider.php":"e6e625536689ce1bf6cfa9a02e66457f","app\/Providers\/RouteServiceProvider.php":"89a38040e0eb44cbd3c9fd286eb55f39","app\/Setup\/WritesToEnvironment.php":"b44dd1d8d356f69bb27369f59de68296","app\/Setup\/Migrations.php":"442db278c9932e2729addf6e619e01d6","app\/Setup\/Admin.php":"e4685eb3e4243ccf9131cd1a11bfe1a3","app\/Setup\/Env.php":"b93a8f6fe59cc983f49f3c8cc33bc064","app\/Setup\/Database.php":"39161becadde353e1bd8b8f4e2afebdb","app\/Setup\/Key.php":"611620a7586d5319931c3aab0801e66a","app\/Setup\/Url.php":"462d49f15cb5b38e81cd41b479f520c2","app\/Setup\/StepInterface.php":"95ef7030278de820339ab94bbbbbf231","app\/Models\/User.php":"4a2f6361032921bc17bbea9d540b3527","app\/Models\/ApiToken.php":"24bb163dec324c56b5a763f6e473671b","app\/Models\/Invitation.php":"5f1116032f469de07b258c28a04d2630","app\/Models\/Workspace.php":"d1ea509954f2474880e6074aada00b91","app\/Livewire\/Setup.php":"1e1c86301c8c7f0b2a128e90d5c203a6","app\/Http\/Middleware\/Authenticate.php":"1a28ab8a480d33b5e262412c084e77b2","app\/Http\/Middleware\/TrustProxies.php":"80202bd7bf4c31e901f1043346b82dad","app\/Http\/Middleware\/LocaleMiddleware.php":"1386bc4ac32df382c5631101b0f9339e","app\/Http\/Middleware\/VerifyCsrfToken.php":"707f8a5975d94d67dc2e9f5b6c561cef","app\/Http\/Middleware\/RequireWorkspace.php":"410b7682a4f21bfb81143d6469eaaa77","app\/Http\/Middleware\/EncryptCookies.php":"f6f49f8cb83225155ebe207c0eb24c18","app\/Http\/Middleware\/RedirectIfAuthenticated.php":"ddbd033d07f29b97941e2e021a78eab4","app\/Http\/Middleware\/OwnsRequestedWorkspace.php":"99b3eb77cb33c12f4630f0ff0bf0a84e","app\/Http\/Middleware\/OwnsCurrentWorkspace.php":"ddd644de44de55bed0d14a058534da5f","app\/Http\/Middleware\/CheckForMaintenanceMode.php":"13fecdea17d95ffe8f70fe3c56e0f497","app\/Http\/Middleware\/TrustHosts.php":"181bdfdfebffb2e8019806a7b3c061bd","app\/Http\/Middleware\/TrimStrings.php":"6147464a2cd11a9b32189c718f3e1fa5","app\/Http\/Controllers\/Auth\/ApiTokenController.php":"422df9c575b44baa0dd4554037164745","app\/Http\/Controllers\/Auth\/RegisterController.php":"64b03c166cb7e856f631bae916199add","app\/Http\/Controllers\/Auth\/VerificationController.php":"1b6f2e916bde69d3275883aae411f78d","app\/Http\/Controllers\/Auth\/ForgotPasswordController.php":"b06419407998c87cf5d89c8936f87810","app\/Http\/Controllers\/Auth\/ChangePasswordController.php":"057201b4f14d70c5d8450966943f7a9b","app\/Http\/Controllers\/Auth\/ConfirmPasswordController.php":"3ce0c3b0a4be919bdb39e7bd7e42a894","app\/Http\/Controllers\/Auth\/LoginController.php":"51e0c4938d8568990326a16f47993774","app\/Http\/Controllers\/Auth\/ResetPasswordController.php":"17de80faf8d3652db1277c64cd7cab1d","app\/Http\/Controllers\/Auth\/ProfileController.php":"462ff2a3b6ada8b9cb72b9000209e321","app\/Http\/Controllers\/SetupController.php":"40bc4b1d3b35aff81cec5c8d78c4754e","app\/Http\/Controllers\/Controller.php":"d2ab2e1e385a80aec6042dc23e7f86eb","app\/Http\/Controllers\/Workspaces\/WorkspaceUsersController.php":"dd2091a562bfc77ce849fff6720ebd86","app\/Http\/Controllers\/Workspaces\/WorkspaceInvitationsController.php":"62695e110bd391adeabdf9370d7e6336","app\/Http\/Controllers\/Workspaces\/SwitchWorkspaceController.php":"1ec0a5dc7c84a8409f4526a47a634497","app\/Http\/Controllers\/Workspaces\/PendingInvitationController.php":"0114fff979705de8bee82e163235482e","app\/Http\/Controllers\/Workspaces\/WorkspacesController.php":"a685eff29367597c4e6f6e706b005add","app\/Http\/Kernel.php":"b981843a2a2a59c3c0d9ea9694370134","app\/Http\/Resources\/Workspace.php":"d067a6f07bd550d4153c310c28715681","app\/Http\/Requests\/ApiTokens\/ApiTokenStoreRequest.php":"56c01901a407bb57f20dd618b4fdf89e","app\/Http\/Requests\/Workspaces\/CreateWorkspaceRequest.php":"c07da30174e0dd1a6815cffb3ca2c831","app\/Http\/Requests\/Workspaces\/WorkspaceUpdateRequest.php":"a1308a6bc8750c36ce811f1e8265b365","app\/Http\/Requests\/Workspaces\/WorkspaceInvitationStoreRequest.php":"71ada4990b3bd30b067d90e0ac67bad0","app\/Http\/Requests\/Workspaces\/WorkspaceStoreRequest.php":"1b397a607f55c196444bb5873f0c4224","app\/Http\/Requests\/ChangePasswordRequest.php":"425a965157b3e251d5fa51fb925f2697","app\/Http\/Requests\/ProfileUpdateRequest.php":"a910df5bf61b4ca7bbccb3f3bca9c082","app\/Exceptions\/Handler.php":"665c24eba27dfb276eac81356caedb56","app\/Console\/Commands\/InstallApplication.php":"c31897e6a3c43e30a5836f31b724f5cc","app\/Console\/Commands\/UpgradeApplication.php":"979a37cd757e85d83bb11eba093d0c1a","app\/Console\/Kernel.php":"df2152f06cd07c8e95e36e6afab01c76","app\/Traits\/ChecksInvitations.php":"66c0b922807da00a39471ab9281ce800","app\/Traits\/HasWorkspaces.php":"3b1f1c3bfb64c0485cdbe9c7e22bde30","app\/Traits\/HasSendportalCommandUtilities.php":"4d212d734d0fec6ad91ec58ce300cdc1","app\/Traits\/HasSendportalMigrationHandlers.php":"5c6a183868a086ed718dd85b7f9e1669","app\/Rules\/ValidInvitation.php":"e289a4ac9b5452ce039f9717fbbd57d4","app\/Repositories\/ApiTokenRepository.php":"2e749016d2e80736d99282762bc27e30","app\/Repositories\/WorkspacesRepository.php":"045fd3222c05c6ee10db83e5890c277d","app\/Services\/Workspaces\/AcceptInvitation.php":"b22d7bf8cb78c6b962728d43efcae37e","app\/Services\/Workspaces\/RemoveUserFromWorkspace.php":"e0b7cf22bd2106992f231e3541538a41","app\/Services\/Workspaces\/SendInvitation.php":"41e73e828863468e8433dd8631e2edbb","app\/Services\/Workspaces\/CreateWorkspace.php":"056f398e6a43ed813289dc41c01c5cdd","app\/Services\/Workspaces\/AddWorkspaceMember.php":"910c9a8d07a0579f7012f4c2183f9a9f","server.php":"323b10ec66fb238f6e9897ab36c825b3","config\/sendportal-host.php":"39ddd885f8fd2f326ad15646cf9a69f5","config\/filesystems.php":"137ee6ce65c76f00f676a9d2a3786a36","config\/queue.php":"db0dbed09037496aeb217ae090bbae29","config\/auth.php":"c6d98a3371702805b1143939f0180717","config\/mail.php":"1ef213740cec34cd746079abc9ba275a","config\/view.php":"24e00ccca17634d028fbbfdafd9e7461","config\/horizon.php":"09cf662fcfc7ea53b81b1e0d41deed68","config\/app.php":"a4fe6d4478eb85079fd59964ec1a8869","config\/cache.php":"c266e9b2172f63354184e1be8bf9763e","config\/broadcasting.php":"bf5b67dc7929b3c338925e1ff5b2c43c","config\/hashing.php":"993f7bd4607853d3905cbdb68e27331d","config\/services.php":"601a15384d0786875b6e009f1aff45e4","config\/database.php":"dc3e83d71b2e91970f1c99d2b4b337b5","config\/session.php":"a0eb60b59d22b34e253bd25ea0869932","config\/logging.php":"2d16257864aa0d12378e82882cfd17c3","config\/sendportal.php":"41cd7d8566ea01a15b9f4a25f5083b3f","config\/cors.php":"c50ff880307bd72e3271f2ec32b78f5e","tests\/TestSupportTrait.php":"c0c6eb36887e08a46d48abc2632e7f50","tests\/Unit\/ExampleTest.php":"27eacc0fde35be1db9c989b11cbbf18f","tests\/TestCase.php":"8dbce99cc4820fc4b8ece1da1b8c26af","tests\/CreatesApplication.php":"cb2f21cebfcc89f2c0d910dcc8c98815","tests\/Feature\/Auth\/AuthConfigEnabledTest.php":"d796b680b592b0ee04cfd56e937c8756","tests\/Feature\/Auth\/WorkspaceApiTokenTest.php":"e216eefbd964ce3b36aa08d27987d90c","tests\/Feature\/Auth\/AuthConfigDisabledTest.php":"812a8b8bc4d4aa7d03a43c868342d8f3","tests\/Feature\/Invitations\/NewUserInvitationTest.php":"9e4d109041157b17d4874d6fa38aa4dd","tests\/Feature\/Invitations\/ExistingUserInvitationTest.php":"dd43ce86c0349f4163e18a7b047a89db","tests\/Feature\/Setup\/SetupControllerTest.php":"5efe56576a1ff70bdd6c731c15ab649b","tests\/Feature\/Setup\/SetupTest.php":"4038362c0007e17d90b4ab55406213a2","tests\/Feature\/Workspaces\/WorkspaceRequiredTest.php":"897d8d05c84dd75e88d69ceb0df4f4f4","tests\/Feature\/Workspaces\/WorkspacesControllerTest.php":"a687a0f5ee70e97ad5e1c7f554c71296","tests\/Feature\/Workspaces\/SwitchWorkspaceTest.php":"c2916a1f420563106e637f028efcd3f7","tests\/Feature\/Workspaces\/WorkspaceInvitationsControllerTest.php":"5b48ebdf6d2206b925579e4d84a682a1","tests\/Feature\/Workspaces\/WorkspaceUserControllerTest.php":"597c1f354a2582ad09296999b379f7d0"}}
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->exclude('node_modules')
+    ->exclude('bower_components')
+    ->exclude('public')
+    ->exclude('bootstrap')
+    ->exclude('resources')
+    ->exclude('storage')
+    ->in(__DIR__)
+    ->name('*.php')
+    ->notName('*.blade.php');
+
+$config = new PhpCsFixer\Config();
+
+return $config
+    ->setRules([
+        '@PSR12' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => [
+            'imports_order' => [
+                'class',
+                'function',
+                'const'
+            ],
+            'sort_algorithm' => 'alpha'
+        ],
+        'no_unused_imports' => true,
+        'no_empty_statement' => true,
+        'no_useless_return' => true,
+        'not_operator_with_successor_space' => true,
+        'explicit_string_variable' => true,
+        'simple_to_complex_string_variable' => true,
+        'array_indentation' => true,
+        'blank_line_before_statement' => [
+            'statements' => [
+                'case',
+                'default',
+                'declare',
+                'do',
+                'goto',
+                'if',
+                'include',
+                'include_once',
+                'require',
+                'require_once',
+                'switch',
+                'try',
+            ]
+        ],
+    ])
+    ->setFinder($finder);
diff --git a/README.md b/README.md
@@ -31,4 +31,3 @@ SendPortal V3 requires:
 - MySQL (≥ 5.7) or PostgreSQL (≥ 9.4)
 
 If you are on an earlier version of PHP (7.3+) or Laravel (8+), please use [SendPortal V2](https://github.com/mettle/sendportal/releases/tag/v2.0.4)
-
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -20,8 +20,8 @@
 
 class RegisterController extends Controller
 {
-    use ChecksInvitations,
-        RegistersUsers;
+    use ChecksInvitations;
+    use RegistersUsers;
 
     /** @var AcceptInvitation */
     private $acceptInvitation;
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -9,5 +9,7 @@
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }
diff --git a/app/Traits/HasWorkspaces.php b/app/Traits/HasWorkspaces.php
@@ -91,11 +91,13 @@ public function currentWorkspace(): ?Workspace
         if ($this->activeWorkspace !== null) {
             return $this->activeWorkspace;
         }
+
         if ($this->current_workspace_id) {
             $this->switchToWorkspace(Workspace::find($this->current_workspace_id));
 
             return $this->activeWorkspace;
         }
+
         if ($this->activeWorkspace === null && $this->hasWorkspaces()) {
             $this->switchToWorkspace($this->workspaces()->first());
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
-         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="APP_DEBUG" value="true"/>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_DATABASE" value="sendportal-testing"/>
-        <env name="DB_USERNAME" value="root"/>
-        <env name="DB_PASSWORD" value="secret"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    <env name="APP_DEBUG" value="true"/>
+    <env name="APP_ENV" value="testing"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="DB_DATABASE" value="sendportal_testing"/>
+    <env name="DB_USERNAME" value="laravel"/>
+    <env name="DB_PASSWORD" value="secret"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/routes/api.php b/routes/api.php
@@ -10,10 +10,8 @@
     config('sendportal-host.throttle_middleware'),
     RequireWorkspace::class,
 ])->group(function () {
-
     // Auth'd API routes (workspace-level auth!).
     Sendportal::apiRoutes();
-
 });
 
 // Non-auth'd API routes.
diff --git a/tests/Feature/Auth/AuthConfigDisabledTest.php b/tests/Feature/Auth/AuthConfigDisabledTest.php
@@ -10,8 +10,8 @@
 
 class AuthConfigDisabledTest extends TestCase
 {
-    use RefreshDatabase,
-        WithFaker;
+    use RefreshDatabase;
+    use WithFaker;
 
     public function setUp(): void
     {
diff --git a/tests/Feature/Auth/AuthConfigEnabledTest.php b/tests/Feature/Auth/AuthConfigEnabledTest.php
@@ -10,8 +10,8 @@
 
 class AuthConfigEnabledTest extends TestCase
 {
-    use RefreshDatabase,
-        WithFaker;
+    use RefreshDatabase;
+    use WithFaker;
 
     public function setUp(): void
     {
diff --git a/tests/Feature/Auth/WorkspaceApiTokenTest.php b/tests/Feature/Auth/WorkspaceApiTokenTest.php
@@ -12,8 +12,8 @@
 
 class WorkspaceApiTokenTest extends TestCase
 {
-    use RefreshDatabase,
-        WithFaker;
+    use RefreshDatabase;
+    use WithFaker;
 
     /**
      * @test
diff --git a/tests/Feature/Setup/SetupTest.php b/tests/Feature/Setup/SetupTest.php
@@ -57,6 +57,6 @@ public function the_setup_command_should_stop_on_the_admin_step_if_there_are_not
         $step = $setup->get('steps')[$setup->get('active')];
 
         self::assertEquals(Admin::class, $step['handler']);
-        self::assertEquals(false, $step['completed']);
+        self::assertEquals(5, $step['completed']);
     }
 }
diff --git a/tests/Feature/Workspaces/WorkspaceRequiredTest.php b/tests/Feature/Workspaces/WorkspaceRequiredTest.php
@@ -11,8 +11,8 @@
 
 class WorkspaceRequiredTest extends TestCase
 {
-    use RefreshDatabase,
-        WithFaker;
+    use RefreshDatabase;
+    use WithFaker;
 
     /**
      * @test

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{"php":"8.1.12","version":"3.13.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"no_empty_statement":true,"no_useless_return":true,"not_operator_with_successor_space":true,"explicit_string_variable":true,"simple_to_complex_string_variable":true,"array_indentation":true,"blank_line_before_statement":{"statements":["case","default","declare","do","goto","if","include","include_once","require","require_once","switch","try"]}},"hashes":{"routes\/console.php":"043de8d2168ad1c2f19f1f32431ca640","routes\/api.php":"1cfef62d42fc585043690f50f0d7816f","routes\/web.php":"765479749fce08c21ce3c82878dc68e5","routes\/channels.php":"edadd8dfa4a96a42dde09f4ba1362bbd","database\/seeders\/DatabaseSeeder.php":"863fc820d5b1b26b07ff78678e75c600","database\/factories\/UserFactory.php":"14bb2790d699e4c12d3c921413397816","database\/factories\/InvitationFactory.php":"5d7806ef7213f9b8d0ccb1a67572c1c2","database\/factories\/ApiTokenFactory.php":"39a07fd93703811c1e8138c90f617cc5","database\/factories\/WorkspaceFactory.php":"8eb260ed12b4aeef9662731f5f927524","database\/migrations\/2014_10_12_000000_create_users_table.php":"6f6305c9621dc43a7e4e67692f74823a","database\/migrations\/2019_08_19_000000_create_failed_jobs_table.php":"2d2101455252f967fc9f40bdfd44c96f","database\/migrations\/2017_04_11_100000_create_invitations_table.php":"4498012dc9968cfbe113a08f39ee14da","database\/migrations\/2021_01_26_151747_remove_api_token_from_users_table.php":"768971eed7996a173e67e9367cab22ef","database\/migrations\/2019_08_24_114758_adjust_users_table.php":"8a5aee2cd552991b28f0d9633d54efe9","database\/migrations\/2017_04_11_000000_create_workspaces_table.php":"523915ba995bcc529a38261248825b82","database\/migrations\/2020_11_13_120125_create_api_tokens_table.php":"7ee00241a111ac86e6ce713f220dfa0c","database\/migrations\/2014_10_12_100000_create_password_resets_table.php":"6a565de52ad5c704c0a50d9da2dce231","app\/Providers\/EventServiceProvider.php":"34a080e907226081e6958d8e1611101e","app\/Providers\/AppServiceProvider.php":"238832fb41ec4d01ea13a4e3d8688b1f","app\/Providers\/BroadcastServiceProvider.php":"0ee72a104b9018e848f386a2d425bd36","app\/Providers\/HorizonServiceProvider.php":"7b22e94cc33bfe5edadd55ddbb24bbf8","app\/Providers\/AuthServiceProvider.php":"e6e625536689ce1bf6cfa9a02e66457f","app\/Providers\/RouteServiceProvider.php":"89a38040e0eb44cbd3c9fd286eb55f39","app\/Setup\/WritesToEnvironment.php":"b44dd1d8d356f69bb27369f59de68296","app\/Setup\/Migrations.php":"442db278c9932e2729addf6e619e01d6","app\/Setup\/Admin.php":"e4685eb3e4243ccf9131cd1a11bfe1a3","app\/Setup\/Env.php":"b93a8f6fe59cc983f49f3c8cc33bc064","app\/Setup\/Database.php":"39161becadde353e1bd8b8f4e2afebdb","app\/Setup\/Key.php":"611620a7586d5319931c3aab0801e66a","app\/Setup\/Url.php":"462d49f15cb5b38e81cd41b479f520c2","app\/Setup\/StepInterface.php":"95ef7030278de820339ab94bbbbbf231","app\/Models\/User.php":"4a2f6361032921bc17bbea9d540b3527","app\/Models\/ApiToken.php":"24bb163dec324c56b5a763f6e473671b","app\/Models\/Invitation.php":"5f1116032f469de07b258c28a04d2630","app\/Models\/Workspace.php":"d1ea509954f2474880e6074aada00b91","app\/Livewire\/Setup.php":"1e1c86301c8c7f0b2a128e90d5c203a6","app\/Http\/Middleware\/Authenticate.php":"1a28ab8a480d33b5e262412c084e77b2","app\/Http\/Middleware\/TrustProxies.php":"80202bd7bf4c31e901f1043346b82dad","app\/Http\/Middleware\/LocaleMiddleware.php":"1386bc4ac32df382c5631101b0f9339e","app\/Http\/Middleware\/VerifyCsrfToken.php":"707f8a5975d94d67dc2e9f5b6c561cef","app\/Http\/Middleware\/RequireWorkspace.php":"410b7682a4f21bfb81143d6469eaaa77","app\/Http\/Middleware\/EncryptCookies.php":"f6f49f8cb83225155ebe207c0eb24c18","app\/Http\/Middleware\/RedirectIfAuthenticated.php":"ddbd033d07f29b97941e2e021a78eab4","app\/Http\/Middleware\/OwnsRequestedWorkspace.php":"99b3eb77cb33c12f4630f0ff0bf0a84e","app\/Http\/Middleware\/OwnsCurrentWorkspace.php":"ddd644de44de55bed0d14a058534da5f","app\/Http\/Middleware\/CheckForMaintenanceMode.php":"13fecdea17d95ffe8f70fe3c56e0f497","app\/Http\/Middleware\/TrustHosts.php":"181bdfdfebffb2e8019806a7b3c061bd","app\/Http\/Middleware\/TrimStrings.php":"6147464a2cd11a9b32189c718f3e1fa5","app\/Http\/Controllers\/Auth\/ApiTokenController.php":"422df9c575b44baa0dd4554037164745","app\/Http\/Controllers\/Auth\/RegisterController.php":"64b03c166cb7e856f631bae916199add","app\/Http\/Controllers\/Auth\/VerificationController.php":"1b6f2e916bde69d3275883aae411f78d","app\/Http\/Controllers\/Auth\/ForgotPasswordController.php":"b06419407998c87cf5d89c8936f87810","app\/Http\/Controllers\/Auth\/ChangePasswordController.php":"057201b4f14d70c5d8450966943f7a9b","app\/Http\/Controllers\/Auth\/ConfirmPasswordController.php":"3ce0c3b0a4be919bdb39e7bd7e42a894","app\/Http\/Controllers\/Auth\/LoginController.php":"51e0c4938d8568990326a16f47993774","app\/Http\/Controllers\/Auth\/ResetPasswordController.php":"17de80faf8d3652db1277c64cd7cab1d","app\/Http\/Controllers\/Auth\/ProfileController.php":"462ff2a3b6ada8b9cb72b9000209e321","app\/Http\/Controllers\/SetupController.php":"40bc4b1d3b35aff81cec5c8d78c4754e","app\/Http\/Controllers\/Controller.php":"d2ab2e1e385a80aec6042dc23e7f86eb","app\/Http\/Controllers\/Workspaces\/WorkspaceUsersController.php":"dd2091a562bfc77ce849fff6720ebd86","app\/Http\/Controllers\/Workspaces\/WorkspaceInvitationsController.php":"62695e110bd391adeabdf9370d7e6336","app\/Http\/Controllers\/Workspaces\/SwitchWorkspaceController.php":"1ec0a5dc7c84a8409f4526a47a634497","app\/Http\/Controllers\/Workspaces\/PendingInvitationController.php":"0114fff979705de8bee82e163235482e","app\/Http\/Controllers\/Workspaces\/WorkspacesController.php":"a685eff29367597c4e6f6e706b005add","app\/Http\/Kernel.php":"b981843a2a2a59c3c0d9ea9694370134","app\/Http\/Resources\/Workspace.php":"d067a6f07bd550d4153c310c28715681","app\/Http\/Requests\/ApiTokens\/ApiTokenStoreRequest.php":"56c01901a407bb57f20dd618b4fdf89e","app\/Http\/Requests\/Workspaces\/CreateWorkspaceRequest.php":"c07da30174e0dd1a6815cffb3ca2c831","app\/Http\/Requests\/Workspaces\/WorkspaceUpdateRequest.php":"a1308a6bc8750c36ce811f1e8265b365","app\/Http\/Requests\/Workspaces\/WorkspaceInvitationStoreRequest.php":"71ada4990b3bd30b067d90e0ac67bad0","app\/Http\/Requests\/Workspaces\/WorkspaceStoreRequest.php":"1b397a607f55c196444bb5873f0c4224","app\/Http\/Requests\/ChangePasswordRequest.php":"425a965157b3e251d5fa51fb925f2697","app\/Http\/Requests\/ProfileUpdateRequest.php":"a910df5bf61b4ca7bbccb3f3bca9c082","app\/Exceptions\/Handler.php":"665c24eba27dfb276eac81356caedb56","app\/Console\/Commands\/InstallApplication.php":"c31897e6a3c43e30a5836f31b724f5cc","app\/Console\/Commands\/UpgradeApplication.php":"979a37cd757e85d83bb11eba093d0c1a","app\/Console\/Kernel.php":"df2152f06cd07c8e95e36e6afab01c76","app\/Traits\/ChecksInvitations.php":"66c0b922807da00a39471ab9281ce800","app\/Traits\/HasWorkspaces.php":"3b1f1c3bfb64c0485cdbe9c7e22bde30","app\/Traits\/HasSendportalCommandUtilities.php":"4d212d734d0fec6ad91ec58ce300cdc1","app\/Traits\/HasSendportalMigrationHandlers.php":"5c6a183868a086ed718dd85b7f9e1669","app\/Rules\/ValidInvitation.php":"e289a4ac9b5452ce039f9717fbbd57d4","app\/Repositories\/ApiTokenRepository.php":"2e749016d2e80736d99282762bc27e30","app\/Repositories\/WorkspacesRepository.php":"045fd3222c05c6ee10db83e5890c277d","app\/Services\/Workspaces\/AcceptInvitation.php":"b22d7bf8cb78c6b962728d43efcae37e","app\/Services\/Workspaces\/RemoveUserFromWorkspace.php":"e0b7cf22bd2106992f231e3541538a41","app\/Services\/Workspaces\/SendInvitation.php":"41e73e828863468e8433dd8631e2edbb","app\/Services\/Workspaces\/CreateWorkspace.php":"056f398e6a43ed813289dc41c01c5cdd","app\/Services\/Workspaces\/AddWorkspaceMember.php":"910c9a8d07a0579f7012f4c2183f9a9f","server.php":"323b10ec66fb238f6e9897ab36c825b3","config\/sendportal-host.php":"39ddd885f8fd2f326ad15646cf9a69f5","config\/filesystems.php":"137ee6ce65c76f00f676a9d2a3786a36","config\/queue.php":"db0dbed09037496aeb217ae090bbae29","config\/auth.php":"c6d98a3371702805b1143939f0180717","config\/mail.php":"1ef213740cec34cd746079abc9ba275a","config\/view.php":"24e00ccca17634d028fbbfdafd9e7461","config\/horizon.php":"09cf662fcfc7ea53b81b1e0d41deed68","config\/app.php":"a4fe6d4478eb85079fd59964ec1a8869","config\/cache.php":"c266e9b2172f63354184e1be8bf9763e","config\/broadcasting.php":"bf5b67dc7929b3c338925e1ff5b2c43c","config\/hashing.php":"993f7bd4607853d3905cbdb68e27331d","config\/services.php":"601a15384d0786875b6e009f1aff45e4","config\/database.php":"dc3e83d71b2e91970f1c99d2b4b337b5","config\/session.php":"a0eb60b59d22b34e253bd25ea0869932","config\/logging.php":"2d16257864aa0d12378e82882cfd17c3","config\/sendportal.php":"41cd7d8566ea01a15b9f4a25f5083b3f","config\/cors.php":"c50ff880307bd72e3271f2ec32b78f5e","tests\/TestSupportTrait.php":"c0c6eb36887e08a46d48abc2632e7f50","tests\/Unit\/ExampleTest.php":"27eacc0fde35be1db9c989b11cbbf18f","tests\/TestCase.php":"8dbce99cc4820fc4b8ece1da1b8c26af","tests\/CreatesApplication.php":"cb2f21cebfcc89f2c0d910dcc8c98815","tests\/Feature\/Auth\/AuthConfigEnabledTest.php":"d796b680b592b0ee04cfd56e937c8756","tests\/Feature\/Auth\/WorkspaceApiTokenTest.php":"e216eefbd964ce3b36aa08d27987d90c","tests\/Feature\/Auth\/AuthConfigDisabledTest.php":"812a8b8bc4d4aa7d03a43c868342d8f3","tests\/Feature\/Invitations\/NewUserInvitationTest.php":"9e4d109041157b17d4874d6fa38aa4dd","tests\/Feature\/Invitations\/ExistingUserInvitationTest.php":"dd43ce86c0349f4163e18a7b047a89db","tests\/Feature\/Setup\/SetupControllerTest.php":"5efe56576a1ff70bdd6c731c15ab649b","tests\/Feature\/Setup\/SetupTest.php":"4038362c0007e17d90b4ab55406213a2","tests\/Feature\/Workspaces\/WorkspaceRequiredTest.php":"897d8d05c84dd75e88d69ceb0df4f4f4","tests\/Feature\/Workspaces\/WorkspacesControllerTest.php":"a687a0f5ee70e97ad5e1c7f554c71296","tests\/Feature\/Workspaces\/SwitchWorkspaceTest.php":"c2916a1f420563106e637f028efcd3f7","tests\/Feature\/Workspaces\/WorkspaceInvitationsControllerTest.php":"5b48ebdf6d2206b925579e4d84a682a1","tests\/Feature\/Workspaces\/WorkspaceUserControllerTest.php":"597c1f354a2582ad09296999b379f7d0"}}
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,3 @@ SendPortal V3 requires:`
`31`	`31`	`- MySQL (≥ 5.7) or PostgreSQL (≥ 9.4)`
`32`	`32`
`33`	`33`	`If you are on an earlier version of PHP (7.3+) or Laravel (8+), please use [SendPortal V2](https://github.com/mettle/sendportal/releases/tag/v2.0.4)`
`34`		`-`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`
`21`	`21`	`class RegisterController extends Controller`
`22`	`22`	`{`
`23`		`- use ChecksInvitations,`
`24`		`- RegistersUsers;`
	`23`	`+ use ChecksInvitations;`
	`24`	`+ use RegistersUsers;`
`25`	`25`
`26`	`26`	`/** @var AcceptInvitation */`
`27`	`27`	`private $acceptInvitation;`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@`
`9`	`9`
`10`	`10`	`class Controller extends BaseController`
`11`	`11`	`{`
`12`		`- use AuthorizesRequests, DispatchesJobs, ValidatesRequests;`
	`12`	`+ use AuthorizesRequests;`
	`13`	`+ use DispatchesJobs;`
	`14`	`+ use ValidatesRequests;`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@ public function currentWorkspace(): ?Workspace`
`91`	`91`	`if ($this->activeWorkspace !== null) {`
`92`	`92`	`return $this->activeWorkspace;`
`93`	`93`	`}`
	`94`	`+`
`94`	`95`	`if ($this->current_workspace_id) {`
`95`	`96`	`$this->switchToWorkspace(Workspace::find($this->current_workspace_id));`
`96`	`97`
`97`	`98`	`return $this->activeWorkspace;`
`98`	`99`	`}`
	`100`	`+`
`99`	`101`	`if ($this->activeWorkspace === null && $this->hasWorkspaces()) {`
`100`	`102`	`$this->switchToWorkspace($this->workspaces()->first());`
`101`	`103`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`
`11`	`11`	`class AuthConfigDisabledTest extends TestCase`
`12`	`12`	`{`
`13`		`- use RefreshDatabase,`
`14`		`- WithFaker;`
	`13`	`+ use RefreshDatabase;`
	`14`	`+ use WithFaker;`
`15`	`15`
`16`	`16`	`public function setUp(): void`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`
`13`	`13`	`class WorkspaceApiTokenTest extends TestCase`
`14`	`14`	`{`
`15`		`- use RefreshDatabase,`
`16`		`- WithFaker;`
	`15`	`+ use RefreshDatabase;`
	`16`	`+ use WithFaker;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @test`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ public function the_setup_command_should_stop_on_the_admin_step_if_there_are_not`
`57`	`57`	`$step = $setup->get('steps')[$setup->get('active')];`
`58`	`58`
`59`	`59`	`self::assertEquals(Admin::class, $step['handler']);`
`60`		`- self::assertEquals(false, $step['completed']);`
	`60`	`+ self::assertEquals(5, $step['completed']);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`class WorkspaceRequiredTest extends TestCase`
`13`	`13`	`{`
`14`		`- use RefreshDatabase,`
`15`		`- WithFaker;`
	`14`	`+ use RefreshDatabase;`
	`15`	`+ use WithFaker;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* @test`