Update dependencies and refactor code for consistency and readability

Author: eldadfux

composer.json

@@ -37,7 +37,7 @@
   },
   "require-dev": {
       "phpunit/phpunit": "^9.3",
-      "laravel/pint": "1.2.*",
+      "laravel/pint": "1.25.*",
       "phpstan/phpstan": "1.9.x-dev"
   },
   "minimum-stability": "stable",

data/disposable-domains-manual.php

@@ -2,10 +2,10 @@
 
 /**
  * Manual Disposable Email Domains Configuration
- * 
+ *
  * This file contains manually managed disposable email domains.
  * You can add or remove domains here as needed.
- * 
+ *
  * Last updated: 2024-01-01 00:00:00
  * Source: Manual configuration
  */

data/disposable-domains.php

@@ -2,10 +2,10 @@
 
 /**
  * Disposable Email Domains
- * 
+ *
  * This file contains a list of known Disposable Email Domains.
  * Last updated: 2025-10-18 21:39:42
- * 
+ *
  * Format: Indexed array of domain names
  */
 

data/free-domains.php

@@ -2,10 +2,10 @@
 
 /**
  * Free Email Domains
- * 
+ *
  * This file contains a list of known Free Email Domains.
  * Last updated: 2025-10-18 21:39:43
- * 
+ *
  * Format: Indexed array of domain names
  */
 

import.php

@@ -307,7 +307,7 @@ function fetchSource(string $sourceKey, array $sourceConfig, string $type): arra
 function fetchMartensonDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -353,7 +353,7 @@ function fetchMartensonDomains(array $sourceConfig): array
 function fetchDisposableDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -400,7 +400,7 @@ function fetchDisposableDomains(array $sourceConfig): array
 function fetchWesbosDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -447,7 +447,7 @@ function fetchWesbosDomains(array $sourceConfig): array
 function fetchFakeFilterDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -493,7 +493,7 @@ function fetchFakeFilterDomains(array $sourceConfig): array
 function fetchAdamLovingDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -557,7 +557,7 @@ function loadManualDisposableDomains(array $sourceConfig): array
 function fetchKikobeatsDomains(array $sourceConfig): array
 {
     try {
-        $client = new \Utopia\Fetch\Client();
+        $client = new \Utopia\Fetch\Client;
 
         $response = $client->fetch(
             url: $sourceConfig['url'],
@@ -855,7 +855,7 @@ function showPreview(array $currentDomains, array $newDomains): void
 }
 
 // Setup CLI
-$cli = new CLI();
+$cli = new CLI;
 
 // Disposable domains command
 $cli

src/Emails/Email.php

@@ -64,22 +64,22 @@ class Email
     public function __construct(string $email)
     {
         $this->email = \mb_strtolower(\trim($email));
-        
+
         if (empty($this->email)) {
-            throw new Exception("Email address cannot be empty");
+            throw new Exception('Email address cannot be empty');
         }
 
         $this->parts = \explode('@', $this->email);
 
         if (count($this->parts) !== 2) {
-            throw new Exception("'{$email}' must be a valid email address");
+            throw new Exception('{$email} must be a valid email address');
         }
 
         $this->local = $this->parts[0];
         $this->domain = $this->parts[1];
 
         if (empty($this->local) || empty($this->domain)) {
-            throw new Exception("'{$email}' must be a valid email address");
+            throw new Exception('{$email} must be a valid email address');
         }
     }
 
@@ -142,7 +142,7 @@ public function hasValidLocal(): bool
         }
 
         // Check for valid characters in local part
-        if (!preg_match('/^[a-zA-Z0-9._+-]+$/', $this->local)) {
+        if (! preg_match('/^[a-zA-Z0-9._+-]+$/', $this->local)) {
             return false;
         }
 
@@ -170,7 +170,7 @@ public function hasValidDomain(): bool
         }
 
         // Check for valid domain format using filter_var
-        if (!filter_var('test@' . $this->domain, FILTER_VALIDATE_EMAIL)) {
+        if (! filter_var('test@'.$this->domain, FILTER_VALIDATE_EMAIL)) {
             return false;
         }
 
@@ -183,7 +183,7 @@ public function hasValidDomain(): bool
     public function isDisposable(): bool
     {
         if (self::$disposableDomains === null) {
-            self::$disposableDomains = include __DIR__ . '/../../data/disposable-domains.php';
+            self::$disposableDomains = include __DIR__.'/../../data/disposable-domains.php';
         }
 
         return in_array($this->domain, self::$disposableDomains);
@@ -195,7 +195,7 @@ public function isDisposable(): bool
     public function isFree(): bool
     {
         if (self::$freeDomains === null) {
-            self::$freeDomains = include __DIR__ . '/../../data/free-domains.php';
+            self::$freeDomains = include __DIR__.'/../../data/free-domains.php';
         }
 
         return in_array($this->domain, self::$freeDomains);
@@ -206,7 +206,7 @@ public function isFree(): bool
      */
     public function isCorporate(): bool
     {
-        return !$this->isFree() && !$this->isDisposable();
+        return ! $this->isFree() && ! $this->isDisposable();
     }
 
     /**
@@ -215,7 +215,7 @@ public function isCorporate(): bool
     public function getProvider(): string
     {
         $domainParts = explode('.', $this->domain);
-        
+
         if (count($domainParts) < 2) {
             return $this->domain;
         }
@@ -234,7 +234,7 @@ public function getProvider(): string
     public function getSubdomain(): string
     {
         $domainParts = explode('.', $this->domain);
-        
+
         if (count($domainParts) <= 2) {
             return '';
         }
@@ -247,7 +247,7 @@ public function getSubdomain(): string
      */
     public function hasSubdomain(): bool
     {
-        return !empty($this->getSubdomain());
+        return ! empty($this->getSubdomain());
     }
 
     /**

src/Emails/Validator/Email.php

@@ -16,8 +16,6 @@ class Email extends Validator
      * Get Description
      *
      * Returns validator description
-     *
-     * @return string
      */
     public function getDescription(): string
     {
@@ -29,17 +27,17 @@ public function getDescription(): string
      *
      * Validation will pass when $value is a valid email address
      *
-     * @param  mixed $value
-     * @return bool
+     * @param  mixed  $value
      */
     public function isValid($value): bool
     {
-        if (!is_string($value)) {
+        if (! is_string($value)) {
             return false;
         }
 
         try {
             $email = new EmailParser($value);
+
             return $email->isValid();
         } catch (\Exception $e) {
             return false;
@@ -50,8 +48,6 @@ public function isValid($value): bool
      * Is array
      *
      * Function will return true if object is array.
-     *
-     * @return bool
      */
     public function isArray(): bool
     {
@@ -62,8 +58,6 @@ public function isArray(): bool
      * Get Type
      *
      * Returns validator type.
-     *
-     * @return string
      */
     public function getType(): string
     {

src/Emails/Validator/EmailCorporate.php

@@ -16,8 +16,6 @@ class EmailCorporate extends Validator
      * Get Description
      *
      * Returns validator description
-     *
-     * @return string
      */
     public function getDescription(): string
     {
@@ -29,17 +27,17 @@ public function getDescription(): string
      *
      * Validation will pass when $value is a valid email address from a corporate domain
      *
-     * @param  mixed $value
-     * @return bool
+     * @param  mixed  $value
      */
     public function isValid($value): bool
     {
-        if (!is_string($value)) {
+        if (! is_string($value)) {
             return false;
         }
 
         try {
             $email = new Email($value);
+
             return $email->isValid() && $email->isCorporate();
         } catch (\Exception $e) {
             return false;
@@ -50,8 +48,6 @@ public function isValid($value): bool
      * Is array
      *
      * Function will return true if object is array.
-     *
-     * @return bool
      */
     public function isArray(): bool
     {
@@ -62,12 +58,9 @@ public function isArray(): bool
      * Get Type
      *
      * Returns validator type.
-     *
-     * @return string
      */
     public function getType(): string
     {
         return self::TYPE_STRING;
     }
 }
-

src/Emails/Validator/EmailDomain.php

@@ -16,8 +16,6 @@ class EmailDomain extends Validator
      * Get Description
      *
      * Returns validator description
-     *
-     * @return string
      */
     public function getDescription(): string
     {
@@ -29,17 +27,17 @@ public function getDescription(): string
      *
      * Validation will pass when $value is a valid email address with a valid domain
      *
-     * @param  mixed $value
-     * @return bool
+     * @param  mixed  $value
      */
     public function isValid($value): bool
     {
-        if (!is_string($value)) {
+        if (! is_string($value)) {
             return false;
         }
 
         try {
             $email = new Email($value);
+
             return $email->isValid() && $email->hasValidDomain();
         } catch (\Exception $e) {
             return false;
@@ -50,8 +48,6 @@ public function isValid($value): bool
      * Is array
      *
      * Function will return true if object is array.
-     *
-     * @return bool
      */
     public function isArray(): bool
     {
@@ -62,12 +58,9 @@ public function isArray(): bool
      * Get Type
      *
      * Returns validator type.
-     *
-     * @return string
      */
     public function getType(): string
     {
         return self::TYPE_STRING;
     }
 }
-