[11.10] Add optional expires_at parameter to project members (#713)

Co-authored-by: Philipp Kolmann <[email protected]>

Author: pkolmann

src/Api/Projects.php

@@ -586,32 +586,44 @@ public function allMember($project_id, int $user_id)
     }
 
     /**
-     * @param int|string $project_id
-     * @param int        $user_id
-     * @param int        $access_level
+     * @param int|string  $project_id
+     * @param int         $user_id
+     * @param int         $access_level
+     * @param string|null $expires_at
      *
      * @return mixed
      */
-    public function addMember($project_id, int $user_id, int $access_level)
+    public function addMember($project_id, int $user_id, int $access_level, string $expires_at = null)
     {
-        return $this->post($this->getProjectPath($project_id, 'members'), [
+        $params = [
             'user_id' => $user_id,
             'access_level' => $access_level,
-        ]);
+        ];
+        if (null !== $expires_at) {
+            $params['expires_at'] = $expires_at;
+        }
+
+        return $this->post($this->getProjectPath($project_id, 'members'), $params);
     }
 
     /**
-     * @param int|string $project_id
-     * @param int        $user_id
-     * @param int        $access_level
+     * @param int|string  $project_id
+     * @param int         $user_id
+     * @param int         $access_level
+     * @param string|null $expires_at
      *
      * @return mixed
      */
-    public function saveMember($project_id, int $user_id, int $access_level)
+    public function saveMember($project_id, int $user_id, int $access_level, string $expires_at = null)
     {
-        return $this->put($this->getProjectPath($project_id, 'members/'.self::encodePath($user_id)), [
+        $params = [
             'access_level' => $access_level,
-        ]);
+        ];
+        if (null !== $expires_at) {
+            $params['expires_at'] = $expires_at;
+        }
+
+        return $this->put($this->getProjectPath($project_id, 'members/'.self::encodePath($user_id)), $params);
     }
 
     /**

tests/Api/ProjectsTest.php

@@ -1171,6 +1171,28 @@ public function shouldAddMember(): void
         $this->assertEquals($expectedArray, $api->addMember(1, 2, 3));
     }
 
+    /**
+     * @test
+     */
+    public function shouldAddMemberWithExpiration(): void
+    {
+        // tomorrow
+        $expiration = \date('Y-m-d', \time() + 86400);
+        $expectedArray = [
+            'user_id' => 3,
+            'access_level' => 3,
+            'expires_at' => $expiration,
+        ];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('post')
+            ->with('projects/1/members', ['user_id' => 3, 'access_level' => 3, 'expires_at' => $expiration])
+            ->will($this->returnValue($expectedArray));
+
+        $this->assertEquals($expectedArray, $api->addMember(1, 3, 3, $expiration));
+    }
+
     /**
      * @test
      */
@@ -1187,6 +1209,28 @@ public function shouldSaveMember(): void
         $this->assertEquals($expectedArray, $api->saveMember(1, 2, 4));
     }
 
+    /**
+     * @test
+     */
+    public function shouldSaveMemberWithExpiration(): void
+    {
+        // tomorrow
+        $expiration = \date('Y-m-d', \time() + 86400);
+        $expectedArray = [
+            'user_id' => 3,
+            'access_level' => 4,
+            'expires_at' => $expiration,
+        ];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('put')
+            ->with('projects/1/members/3', ['access_level' => 4, 'expires_at' => $expiration])
+            ->will($this->returnValue($expectedArray));
+
+        $this->assertEquals($expectedArray, $api->saveMember(1, 3, 4, $expiration));
+    }
+
     /**
      * @test
      */