trim whitespace better

symfony-tools · Aug 18, 2024 · 7ad1f6b · 7ad1f6b
1 parent 5725510
commit 7ad1f6b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Subscriber/AutoUpdateTitleWithLabelSubscriber.php b/src/Subscriber/AutoUpdateTitleWithLabelSubscriber.php
@@ -76,8 +76,11 @@ public function onPullRequest(GitHubEvent $event)
             $prPrefix .= '['.$label.']';
         }
 
+        // Clean string from all HTML chars and remove whitespace at the beginning
+        $prTitle = preg_replace('@^[\h\s]+@u', '', html_entity_decode($prTitle));
+
         // Add back labels
-        $prTitle = trim($prPrefix.' '.trim(str_replace('&nbsp;', '', $prTitle)));
+        $prTitle = trim($prPrefix.' '.trim($prTitle));
         if ($originalTitle === $prTitle) {
             return;
         }

diff --git a/tests/Subscriber/AutoUpdateTitleWithLabelSubscriberTest.php b/tests/Subscriber/AutoUpdateTitleWithLabelSubscriberTest.php
@@ -112,4 +112,21 @@ public function testRemoveLabel()
         $this->assertSame(1234, $responseData['pull_request']);
         $this->assertSame('[Console] [Random] Foo normal title', $responseData['new_title']);
     }
+
+    public function testExtraBlankSpace()
+    {
+        $event = new GitHubEvent(['action' => 'labeled', 'number' => 57753, 'pull_request' => []], $this->repository);
+        $this->pullRequestApi->method('show')->willReturn([
+                'title' => '[ErrorHandler]&nbsp;restrict the maximum length of the X-Debug-Exception header',
+                'labels' => [
+                    ['name' => 'ErrorHandler', 'color' => 'dddddd'],
+                ],
+            ]);
+
+        $this->dispatcher->dispatch($event, GitHubEvents::PULL_REQUEST);
+        $responseData = $event->getResponseData();
+        $this->assertCount(2, $responseData);
+        $this->assertSame(57753, $responseData['pull_request']);
+        $this->assertSame('[ErrorHandler] restrict the maximum length of the X-Debug-Exception header', $responseData['new_title']);
+    }
 }