Added regex to parse comment body

Author: Nyholm

.github/workflows/find-reviewer.yml

@@ -78,6 +78,7 @@ jobs:
           --ignore-path "src/Symfony/Bundle/FrameworkBundle/*" \
           --ignore-path "src/**/Tests/*" \
           --ignore-path CHANGELOG*.md \
+          --ignore-path UPGRADE*.md \
           --pretty-print > output.json
 
           cat output.json

src/Command/SuggestReviewerCommand.php

@@ -39,7 +39,7 @@ protected function configure()
     {
         $this->addArgument('repository', InputArgument::REQUIRED, 'The full name to the repository, eg symfony/symfony-docs');
         $this->addArgument('number', InputArgument::REQUIRED, 'Pull request number');
-        $this->addArgument('type', InputArgument::REQUIRED, 'Typ is ether "suggest" or "demand".');
+        $this->addArgument('type', InputArgument::REQUIRED, 'Type is either "suggest" or "demand".');
         $this->addArgument('contributor_json', InputArgument::REQUIRED, 'The path to the issue body text file');
     }
 
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 return 0;
             }
 
-            $this->issueApi->commentOnIssue($repository, $pullRequestNumber, 'Im sorry. I could not find any suitable reviewer.');
+            $this->issueApi->commentOnIssue($repository, $pullRequestNumber, 'I\'m sorry. I could not find any suitable reviewer.');
 
             return 0;
         }

src/Subscriber/FindReviewerSubscriber.php

@@ -55,24 +55,13 @@ public function onComment(GitHubEvent $event)
         }
 
         // Search for "review"
-        $lines = explode(PHP_EOL, $data['comment']['body'] ?? '');
-        foreach ($lines as $line) {
-            if (false === strpos($line, $this->botUsername)) {
-                continue;
-            }
-
-            if (false === strpos($line, 'review')) {
-                continue;
-            }
-
+        if (preg_match('~\@carsonbot(\W[^(status)].*|\W)(\breviewer\b|\breview\b)~i', $data['comment']['body'] ?? '')) {
             $number = $data['issue']['number'];
             $this->pullRequestApi->findReviewer($event->getRepository(), $number, SuggestReviewerCommand::TYPE_DEMAND);
             $event->setResponseData([
                 'issue' => $number,
                 'suggest-review' => true,
             ]);
-
-            return;
         }
     }
 

tests/Subscriber/FindReviewerSubscriberTest.php

@@ -2,16 +2,13 @@
 
 namespace App\Tests\Subscriber;
 
-use App\Api\Milestone\GithubMilestoneApi;
 use App\Api\PullRequest\NullPullRequestApi;
 use App\Command\SuggestReviewerCommand;
 use App\Event\GitHubEvent;
 use App\GitHubEvents;
 use App\Model\Repository;
-use App\Service\SymfonyVersionProvider;
 use App\Service\TaskScheduler;
 use App\Subscriber\FindReviewerSubscriber;
-use App\Subscriber\MilestoneNewPRSubscriber;
 use App\Tests\ValidCommandProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -87,10 +84,10 @@ public function commentProvider()
         yield ['Some random', false];
         yield ['@carsonbot foobar', false];
         yield ['See the review please', false];
+        yield ["@carsonbot please\nfind a reviewer for me", false];
 
         foreach (ValidCommandProvider::get() as $data) {
-            yield [$data[0], $data[1] === FindReviewerSubscriber::class];
+            yield [$data[0], FindReviewerSubscriber::class === $data[1]];
         }
     }
-
 }

tests/ValidCommandProvider.php

@@ -4,7 +4,6 @@
 
 use App\Subscriber\FindReviewerSubscriber;
 use App\Subscriber\StatusChangeByCommentSubscriber;
-use App\Subscriber\StatusChangeByReviewSubscriber;
 
 /**
  * To be used in unit tests to make sure subscribers' commands don't conflict.