API Update API to reflect changes to CLI interaction

# Conflicts:
#	composer.json
#	src/Tasks/ContentReviewEmails.php

src/Tasks/ContentReviewEmails.php

@@ -8,6 +8,7 @@ use SilverStripe\Control\Email\Email;
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\PolyExecution\PolyOutput;
 use SilverStripe\Model\List\ArrayList;
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\Model\List\SS_List;
@@ -32,7 +33,8 @@ class ContentReviewEmails extends BuildTask
 
     protected function execute(InputInterface $input, PolyOutput $output): int
     {
-        if (!$this->isValidEmail($senderEmail = SiteConfig::current_site_config()->ReviewFrom)) {
+        $senderEmail = SiteConfig::current_site_config()->ReviewFrom;
+        if (!Deprecation::withSuppressedNotice(fn() => $this->isValidEmail($senderEmail))) {
             $output->writeln(
                 sprintf(
                     '<error>Provided sender email address is invalid: "%s".</>',
@@ -122,7 +124,7 @@ class ContentReviewEmails extends BuildTask
         $siteConfig = SiteConfig::current_site_config();
         $owner = Member::get()->byID($ownerID);
 
-        if (!$this->isValidEmail($owner->Email)) {
+        if (!Deprecation::withSuppressedNotice(fn() => $this->isValidEmail($owner->Email))) {
             $this->invalid_emails[] = $owner->Name . ': ' . $owner->Email;
 
             return;
@@ -197,9 +199,11 @@ class ContentReviewEmails extends BuildTask
 
     /**
      * Check validity of email
+     * @deprecated 5.4.0 Use SilverStripe\Control\Email\Email::is_valid_address() instead.
      */
     protected function isValidEmail(?string $email): bool
     {
+        Deprecation::notice('5.4.0', 'Use ' . Email::class . '::is_valid_address() instead.');
         return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
     }
 }

tests/php/ContentReviewNotificationTest.php

@@ -12,6 +12,7 @@ use SilverStripe\ContentReview\Extensions\ContentReviewOwner;
 use SilverStripe\ContentReview\Extensions\SiteTreeContentReview;
 use SilverStripe\ContentReview\Tasks\ContentReviewEmails;
 use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Security\Group;
@@ -156,12 +157,14 @@ class ContentReviewNotificationTest extends SapphireTest
         $member = $this->objFromFixture(Member::class, 'author');
         $task = new ContentReviewEmails();
 
-        $this->assertTrue($method->invokeArgs($task, [$member->Email]));
-        $this->assertTrue($method->invokeArgs($task, ['correct.email@example.com']));
+        Deprecation::withSuppressedNotice(function () use ($method, $task, $member) {
+            $this->assertTrue($method->invokeArgs($task, [$member->Email]));
+            $this->assertTrue($method->invokeArgs($task, ['correct.email@example.com']));
 
-        $this->assertFalse($method->invokeArgs($task, [null]));
-        $this->assertFalse($method->invokeArgs($task, ['broken.email']));
-        $this->assertFalse($method->invokeArgs($task, ['broken@email']));
+            $this->assertFalse($method->invokeArgs($task, [null]));
+            $this->assertFalse($method->invokeArgs($task, ['broken.email']));
+            $this->assertFalse($method->invokeArgs($task, ['broken@email']));
+        });
     }
 
     /**