Resolved conflicts due to missing changes upstream.

Take particular note of the changes to $roleSlugs. There was a mismatch between the phpdoc, tests, and api docs. This commit went with the array due to both the test and api doc specifying the array type. The php doc was updated to reflect the array change.

Author: blobaugh

lib/UserManagement.php

@@ -222,13 +222,13 @@ public function deleteUser($userId)
      * @param string $userId User ID
      * @param string $organizationId Organization ID
      * @param string|null $roleSlug Role Slug
-     * @param string|null $roleSlugs Role Slugs
+     * @param array|null $roleSlugs Role Slugs
      *
      * @throws Exception\WorkOSException
      *
      * @return Resource\OrganizationMembership
      */
-    public function createOrganizationMembership($userId, $organizationId, ?string $roleSlug = null, ?string $roleSlugs = null)
+    public function createOrganizationMembership($userId, $organizationId, ?string $roleSlug = null, ?array $roleSlugs = null)
     {
         $path = "user_management/organization_memberships";
 
@@ -309,13 +309,13 @@ public function deleteOrganizationMembership($organizationMembershipId)
      *
      * @param string $organizationMembershipId Organization Membership ID
      * @param string|null $role_slug The unique slug of the role to grant to this membership.
-     * @param string|null $role_slugs The unique slugs of the roles to grant to this membership.
+     * @param array|null $role_slugs The unique slugs of the roles to grant to this membership.
      *
      * @throws Exception\WorkOSException
      *
      * @return Resource\OrganizationMembership
      */
-    public function updateOrganizationMembership($organizationMembershipId, ?string $roleSlug = null, ?string $roleSlugs = null)
+    public function updateOrganizationMembership($organizationMembershipId, ?string $roleSlug = null, ?array $roleSlugs = null)
     {
         $path = "user_management/organization_memberships/{$organizationMembershipId}";
 

tests/WorkOS/UserManagementTest.php

@@ -1039,6 +1039,35 @@ public function testCreateOrganizationMembershipWithRoleSlugs()
         $this->assertSame($organizationMembership, $response->toArray());
     }
 
+    public function testCreateOrganizationMembershipWithNullRoleParams()
+    {
+        $userId = "user_01H7X1M4TZJN5N4HG4XXMA1234";
+        $orgId = "org_01EHQMYV6MBK39QC5PZXHY59C3";
+        $path = "user_management/organization_memberships";
+
+        $result = $this->organizationMembershipResponseFixture();
+
+        // When both roleSlug and roleSlugs are null, neither should be in params
+        $params = [
+            "organization_id" => $orgId,
+            "user_id" => $userId,
+        ];
+
+        $this->mockRequest(
+            Client::METHOD_POST,
+            $path,
+            null,
+            $params,
+            true,
+            $result
+        );
+
+        $organizationMembership = $this->organizationMembershipFixture();
+
+        $response = $this->userManagement->createOrganizationMembership($userId, $orgId, null, null);
+        $this->assertSame($organizationMembership, $response->toArray());
+    }
+
     public function testGetOrganizationMembership()
     {
         $organizationMembershipId = "om_01E4ZCR3C56J083X43JQXF3JK5";
@@ -1207,16 +1236,10 @@ public function testUpdateOrganizationMembership()
         $this->assertSame($this->organizationMembershipFixture(), $response->toArray());
     }
 
-<<<<<<< HEAD
     public function testUpdateOrganizationMembershipWithRoleSlugs()
     {
         $organizationMembershipId = "om_01E4ZCR3C56J083X43JQXF3JK5";
         $roleSlugs = ["admin"];
-=======
-    public function testUpdateOrganizationMembershipWithNullRoleSlug()
-    {
-        $organizationMembershipId = "om_01E4ZCR3C56J083X43JQXF3JK5";
->>>>>>> 560a945 (Fix PHP 8.4 deprecation: Add explicit nullable type hints)
         $path = "user_management/organization_memberships/{$organizationMembershipId}";
 
         $result = $this->organizationMembershipResponseFixture();
@@ -1225,27 +1248,36 @@ public function testUpdateOrganizationMembershipWithNullRoleSlug()
             Client::METHOD_PUT,
             $path,
             null,
-<<<<<<< HEAD
             ["role_slugs" => $roleSlugs],
-=======
-            ["role_slug" => null],
->>>>>>> 560a945 (Fix PHP 8.4 deprecation: Add explicit nullable type hints)
             true,
             $result
         );
 
-<<<<<<< HEAD
         $response = $this->userManagement->updateOrganizationMembership($organizationMembershipId, null, $roleSlugs);
         $this->assertSame($this->organizationMembershipFixture(), $response->toArray());
     }
 
+    public function testUpdateOrganizationMembershipWithNullRoleParams()
+    {
+        $organizationMembershipId = "om_01E4ZCR3C56J083X43JQXF3JK5";
+        $path = "user_management/organization_memberships/{$organizationMembershipId}";
+
+        $result = $this->organizationMembershipResponseFixture();
+
+        // When both roleSlug and roleSlugs are null, params should be empty array
+        $this->mockRequest(
+            Client::METHOD_PUT,
+            $path,
+            null,
+            [],
+            true,
+            $result
+        );
 
-=======
-        $response = $this->userManagement->updateOrganizationMembership($organizationMembershipId, null);
+        $response = $this->userManagement->updateOrganizationMembership($organizationMembershipId, null, null);
         $this->assertSame($this->organizationMembershipFixture(), $response->toArray());
     }
 
->>>>>>> 560a945 (Fix PHP 8.4 deprecation: Add explicit nullable type hints)
     public function testDeactivateOrganizationMembership()
     {
         $organizationMembershipId = "om_01E4ZCR3C56J083X43JQXF3JK5";
@@ -1328,6 +1360,43 @@ public function testSendInvitation()
         $this->assertSame($response->toArray(), $expected);
     }
 
+    public function testSendInvitationWithNullOptionalParams()
+    {
+        $path = "user_management/invitations";
+
+        $result = $this->invitationResponseFixture();
+
+        // The implementation includes null values in params
+        $params = [
+            "email" => "[email protected]",
+            "organization_id" => null,
+            "expires_in_days" => null,
+            "inviter_user_id" => null,
+            "role_slug" => null
+        ];
+
+        $this->mockRequest(
+            Client::METHOD_POST,
+            $path,
+            null,
+            $params,
+            true,
+            $result
+        );
+
+        $response = $this->userManagement->sendInvitation(
+            "[email protected]",
+            null,
+            null,
+            null,
+            null
+        );
+
+        $expected = $this->invitationFixture();
+
+        $this->assertSame($response->toArray(), $expected);
+    }
+
     public function testGetInvitation()
     {
         $invitationId = "invitation_01E4ZCR3C56J083X43JQXF3JK5";