Update title when labels are removed

Author: Nyholm

src/Subscriber/AutoUpdateTitleWithLabelSubscriber.php

@@ -44,6 +44,12 @@ public function onPullRequest(GitHubEvent $event)
             return;
         }
 
+        $repository = $event->getRepository();
+        $number = $data['number'];
+
+        $lock = $this->lockFactory->createLock($repository->getFullName().'#'.$number);
+        $lock->acquire(true); // blocking. Lock will be released at __destruct
+
         $originalTitle = $prTitle = trim($data['pull_request']['title']);
         $validLabels = [];
         foreach ($data['pull_request']['labels'] as $label) {
@@ -59,6 +65,11 @@ public function onPullRequest(GitHubEvent $event)
             }
         }
 
+        // Remove any other labels in the title.
+        foreach ($this->labelExtractor->extractLabels($prTitle, $repository) as $label) {
+            $prTitle = str_ireplace('['.$label.']', '', $prTitle);
+        }
+
         sort($validLabels);
         $prPrefix = '';
         foreach ($validLabels as $label) {
@@ -71,12 +82,6 @@ public function onPullRequest(GitHubEvent $event)
             return;
         }
 
-        $repository = $event->getRepository();
-        $number = $data['number'];
-
-        $lock = $this->lockFactory->createLock($repository->getFullName().'#'.$number);
-        $lock->acquire(true); // blocking. Lock will be released at __destruct
-
         // Refetch the current title just to make sure it has not changed
         if ($prTitle === ($this->pullRequestApi->show($repository, $number)['title'] ?? '')) {
             return;

tests/Subscriber/AutoUpdateTitleWithLabelSubscriberTest.php

@@ -129,4 +129,24 @@ public function testOnPullRequestLabeledTwice()
         $responseData = $event->getResponseData();
         $this->assertEmpty($responseData);
     }
+
+    public function testRemoveLabel()
+    {
+        $event = new GitHubEvent([
+            'action' => 'labeled',
+            'number' => 1234,
+            'pull_request' => [
+                'title' => '[Console][FrameworkBundle] [Random] Foo normal title',
+                'labels' => [
+                    ['name' => 'Console', 'color' => 'dddddd'],
+                ],
+            ],
+        ], $this->repository);
+
+        $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
+        $responseData = $event->getResponseData();
+        $this->assertCount(2, $responseData);
+        $this->assertSame(1234, $responseData['pull_request']);
+        $this->assertSame('[Console] [Random] Foo normal title', $responseData['new_title']);
+    }
 }