Revert "Revert "[11.5] Add from_project_id to Repositories::compare (#652)""

This reverts commit 55cb1b2.

Author: GrahamCampbell

src/Api/Repositories.php

@@ -403,20 +403,25 @@ public function postCommitBuildStatus($project_id, string $sha, string $state, a
     }
 
     /**
-     * @param int|string $project_id
-     * @param string     $fromShaOrMaster
-     * @param string     $toShaOrMaster
-     * @param bool       $straight
+     * @param int|string  $project_id
+     * @param string      $fromShaOrMaster
+     * @param string      $toShaOrMaster
+     * @param bool        $straight
+     * @param string|null $fromProjectId
      *
      * @return mixed
      */
-    public function compare($project_id, string $fromShaOrMaster, string $toShaOrMaster, bool $straight = false)
+    public function compare($project_id, string $fromShaOrMaster, string $toShaOrMaster, bool $straight = false, string $fromProjectId = null)
     {
         $params = [
             'from' => self::encodePath($fromShaOrMaster),
             'to' => self::encodePath($toShaOrMaster),
             'straight' => self::encodePath($straight ? 'true' : 'false'),
         ];
+        
+        if (null !== $fromProjectId) {
+            $params['from_project_id'] = self::encodePath($fromProjectId);
+        }
 
         return $this->get($this->getProjectPath($project_id, 'repository/compare'), $params);
     }

tests/Api/RepositoriesTest.php

@@ -541,6 +541,23 @@ public function shouldNotCompareStraight(): void
         $this->assertEquals($expectedArray, $api->compare(1, 'master', 'feature'));
     }
 
+    /**
+     * @test
+     */
+    public function shouldCompareWithFromProjectId(): void
+    {
+        $expectedArray = ['commit' => 'object'];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('projects/1/repository/compare', ['from' => 'master', 'to' => 'feature', 'straight' => 'true', 'from_project_id' => '123'])
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->compare(1, 'master', 'feature', true, '123'));
+    }
+
     /**
      * @test
      */