[Notifier] Remove Assert class and introduce validation traits

jschaedl · jschaedl · commit 5dfc57b96001 · 2020-03-06T17:58:54.000+01:00
diff --git a/src/Symfony/Component/Notifier/Recipient/Assert.php b/src/Symfony/Component/Notifier/Recipient/Assert.php
diff --git a/src/Symfony/Component/Notifier/Recipient/EmailRecipient.php b/src/Symfony/Component/Notifier/Recipient/EmailRecipient.php
@@ -18,11 +18,13 @@
  */
 class EmailRecipient implements EmailRecipientInterface
 {
+    use EmailValidationTrait;
+
     private $email;
 
     public function __construct(string $email)
     {
-        Assert::email($email);
+        self::ensureEmailIsValid($email);
 
         $this->email = $email;
     }
diff --git a/src/Symfony/Component/Notifier/Recipient/EmailValidationTrait.php b/src/Symfony/Component/Notifier/Recipient/EmailValidationTrait.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Recipient;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+
+/**
+ * @author Jan Schädlich <jan.schaedlich@sensiolabs.de>
+ */
+trait EmailValidationTrait
+{
+    private static function ensureEmailIsValid(string $email): void
+    {
+        if ('' === $email) {
+            throw new InvalidArgumentException('The email must be set.');
+        }
+
+        if (!preg_match('/^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/', $email)) {
+            throw new InvalidArgumentException('The email is not valid.');
+        }
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Recipient/PhoneValidationTrait.php b/src/Symfony/Component/Notifier/Recipient/PhoneValidationTrait.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Recipient;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+
+/**
+ * @author Jan Schädlich <jan.schaedlich@sensiolabs.de>
+ */
+trait PhoneValidationTrait
+{
+    private static function ensurePhoneIsValid(string $phone): void
+    {
+        if ('' === $phone) {
+            throw new InvalidArgumentException('The phone number must be set (no spaces, international code like in +3312345678).');
+        }
+
+        if (!preg_match('/^\+[0-9]*/', $phone)) {
+            throw new InvalidArgumentException('The phone number is not valid (no spaces, international code like in +3312345678).');
+        }
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Recipient/Recipient.php b/src/Symfony/Component/Notifier/Recipient/Recipient.php
@@ -19,13 +19,16 @@
  */
 class Recipient implements EmailRecipientInterface, SmsRecipientInterface
 {
+    use EmailValidationTrait;
+    use PhoneValidationTrait;
+
     private $email;
     private $phone;
 
     public function __construct(string $email, string $phone)
     {
-        Assert::email($email);
-        Assert::phone($phone);
+        self::ensureEmailIsValid($email);
+        self::ensurePhoneIsValid($phone);
 
         $this->email = $email;
         $this->phone = $phone;
diff --git a/src/Symfony/Component/Notifier/Recipient/SmsRecipient.php b/src/Symfony/Component/Notifier/Recipient/SmsRecipient.php
@@ -11,18 +11,22 @@
 
 namespace Symfony\Component\Notifier\Recipient;
 
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+
 /**
  * @author Jan Schädlich <jan.schaedlich@sensiolabs.de>
  *
  * @experimental in 5.1
  */
 class SmsRecipient implements SmsRecipientInterface
 {
+    use PhoneValidationTrait;
+
     private $phone;
 
     public function __construct(string $phone)
     {
-        Assert::phone($phone);
+        self::ensurePhoneIsValid($phone);
 
         $this->phone = $phone;
     }

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,13 @@`
`18`	`18`	`*/`
`19`	`19`	`class EmailRecipient implements EmailRecipientInterface`
`20`	`20`	`{`
	`21`	`+ use EmailValidationTrait;`
	`22`	`+`
`21`	`23`	`private $email;`
`22`	`24`
`23`	`25`	`public function __construct(string $email)`
`24`	`26`	`{`
`25`		`- Assert::email($email);`
	`27`	`+ self::ensureEmailIsValid($email);`
`26`	`28`
`27`	`29`	`$this->email = $email;`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,22 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Notifier\Recipient;`
`13`	`13`
	`14`	`+use Symfony\Component\Notifier\Exception\InvalidArgumentException;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @author Jan Schädlich <jan.schaedlich@sensiolabs.de>`
`16`	`18`	`*`
`17`	`19`	`* @experimental in 5.1`
`18`	`20`	`*/`
`19`	`21`	`class SmsRecipient implements SmsRecipientInterface`
`20`	`22`	`{`
	`23`	`+ use PhoneValidationTrait;`
	`24`	`+`
`21`	`25`	`private $phone;`
`22`	`26`
`23`	`27`	`public function __construct(string $phone)`
`24`	`28`	`{`
`25`		`- Assert::phone($phone);`
	`29`	`+ self::ensurePhoneIsValid($phone);`
`26`	`30`
`27`	`31`	`$this->phone = $phone;`
`28`	`32`	`}`