zytzagoo / smtp-validate-email

src/Validator.php

Spacing +36 added lines, -36 removed lines

@@ -254,8 +254,8 @@ 
             return false;
         }
 
-        $test     = 'catch-all-test-' . time();
-        $accepted = $this->rcpt($test . '@' . $domain);
+        $test     = 'catch-all-test-'.time();
+        $accepted = $this->rcpt($test.'@'.$domain);
         if ($accepted) {
             // Success on a non-existing address is a "catch-all"
             $this->domains_info[$domain]['catchall'] = true;
@@ -265,7 +265,7 @@ 
         // Log when we get disconnected while trying catchall detection
         $this->noop();
         if (!$this->connected()) {
-            $this->debug('Disconnected after trying a non-existing recipient on ' . $domain);
+            $this->debug('Disconnected after trying a non-existing recipient on '.$domain);
         }
 
         /**
@@ -323,7 +323,7 @@ 
         foreach ($this->domains as $domain => $users) {
             $mxs = $this->buildMxs($domain);
 
-            $this->debug('MX records (' . $domain . '): ' . print_r($mxs, true));
+            $this->debug('MX records ('.$domain.'): '.print_r($mxs, true));
             $this->domains_info[$domain]          = [];
             $this->domains_info[$domain]['users'] = $users;
             $this->domains_info[$domain]['mxs']   = $mxs;
@@ -343,7 +343,7 @@ 
     {
         $mxs = [];
 
-        $this->debug('Building MX records for domain: ' . $domain);
+        $this->debug('Building MX records for domain: '.$domain);
 
         // Query the MX records for the current domain
         [$hosts, $weights] = $this->mxQuery($domain);
@@ -376,7 +376,7 @@ 
                 }
             } catch (NoConnectionException $e) {
                 // Unable to connect to host, so these addresses are invalid?
-                $this->debug('Unable to connect. Exception caught: ' . $e->getMessage());
+                $this->debug('Unable to connect. Exception caught: '.$e->getMessage());
             }
         }
     }
@@ -429,7 +429,7 @@ 
         }
 
         // Try issuing MAIL FROM
-        if (!$this->mail($this->from_user . '@' . $this->from_domain)) {
+        if (!$this->mail($this->from_user.'@'.$this->from_domain)) {
             // MAIL FROM not accepted, we can't talk
             $this->setDomainResults($users, $domain, $this->no_comm_is_valid);
             return;
@@ -458,7 +458,7 @@ 
 
         // RCPT for each user
         foreach ($users as $user) {
-            $address                 = $user . '@' . $domain;
+            $address                 = $user.'@'.$domain;
             $this->results[$address] = $this->rcpt($address);
         }
 
@@ -497,7 +497,7 @@ 
     private function setDomainResults(array $users, string $domain, bool $val): void
     {
         foreach ($users as $user) {
-            $this->results[$user . '@' . $domain] = $val;
+            $this->results[$user.'@'.$domain] = $val;
         }
     }
 
@@ -523,13 +523,13 @@ 
      */
     protected function connect(string $host): void
     {
-        $remote_socket = $host . ':' . $this->connect_port;
+        $remote_socket = $host.':'.$this->connect_port;
         $errnum        = 0;
         $errstr        = '';
         $this->host    = $remote_socket;
 
         // Open connection
-        $this->debug('Connecting to ' . $this->host . ' (timeout: ' . $this->connect_timeout . ')');
+        $this->debug('Connecting to '.$this->host.' (timeout: '.$this->connect_timeout.')');
         // @codingStandardsIgnoreLine
         $this->socket = /** @scrutinizer ignore-unhandled */ @stream_socket_client(
             $this->host,
@@ -542,8 +542,8 @@ 
 
         // Check and throw if not connected
         if (!$this->connected()) {
-            $this->debug('Connect failed: ' . $errstr . ', error number: ' . $errnum . ', host: ' . $this->host);
-            throw new NoConnectionException('Cannot open a connection to remote host (' . $this->host . ')');
+            $this->debug('Connect failed: '.$errstr.', error number: '.$errnum.', host: '.$this->host);
+            throw new NoConnectionException('Cannot open a connection to remote host ('.$this->host.')');
         }
 
         $result = stream_set_timeout($this->socket, $this->connect_timeout);
@@ -551,7 +551,7 @@ 
             throw new NoTimeoutException('Cannot set timeout');
         }
 
-        $this->debug('Connected to ' . $this->host . ' successfully');
+        $this->debug('Connected to '.$this->host.' successfully');
     }
 
     /**
@@ -571,7 +571,7 @@ 
         }
 
         if ($this->connected()) {
-            $this->debug('Closing socket to ' . $this->host);
+            $this->debug('Closing socket to '.$this->host);
             fclose($this->socket);
         }
 
@@ -631,7 +631,7 @@ 
         } catch (UnexpectedResponseException $e) {
             // Connected, but got an unexpected response, so disconnect
             $result = false;
-            $this->debug('Unexpected response after connecting: ' . $e->getMessage());
+            $this->debug('Unexpected response after connecting: '.$e->getMessage());
             $this->disconnect(false);
         }
 
@@ -650,11 +650,11 @@ 
     {
         try {
             // Modern
-            $this->send('EHLO ' . $this->from_domain);
+            $this->send('EHLO '.$this->from_domain);
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['ehlo']);
         } catch (UnexpectedResponseException $e) {
             // Legacy
-            $this->send('HELO ' . $this->from_domain);
+            $this->send('HELO '.$this->from_domain);
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['helo']);
         }
     }
@@ -679,7 +679,7 @@ 
         }
 
         // Issue MAIL FROM, 5 minute timeout
-        $this->send('MAIL FROM:<' . $from . '>');
+        $this->send('MAIL FROM:<'.$from.'>');
 
         try {
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['mail']);
@@ -693,7 +693,7 @@ 
             $result = false;
 
             // Got something unexpected in response to MAIL FROM
-            $this->debug("Unexpected response to MAIL FROM\n:" . $e->getMessage());
+            $this->debug("Unexpected response to MAIL FROM\n:".$e->getMessage());
 
             // Hotmail has been known to do this + was closing the connection
             // forcibly on their end, so we're killing the socket here too
@@ -732,17 +732,17 @@ 
 
         // Issue RCPT TO, 5 minute timeout
         try {
-            $this->send('RCPT TO:<' . $to . '>');
+            $this->send('RCPT TO:<'.$to.'>');
             // Handle response
             try {
                 $this->expect($expected_codes, $this->command_timeouts['rcpt']);
                 $this->state['rcpt'] = true;
                 $valid               = true;
             } catch (UnexpectedResponseException $e) {
-                $this->debug('Unexpected response to RCPT TO: ' . $e->getMessage());
+                $this->debug('Unexpected response to RCPT TO: '.$e->getMessage());
             }
         } catch (Exception $e) {
-            $this->debug('Sending RCPT TO failed: ' . $e->getMessage());
+            $this->debug('Sending RCPT TO failed: '.$e->getMessage());
         }
 
         return $valid;
@@ -787,7 +787,7 @@ 
         if ($this->state['helo']) {
             $this->send('QUIT');
             $this->expect(
-                [self::SMTP_GENERIC_SUCCESS,self::SMTP_QUIT_SUCCESS],
+                [self::SMTP_GENERIC_SUCCESS, self::SMTP_QUIT_SUCCESS],
                 $this->command_timeouts['quit'],
                 true
             );
@@ -841,13 +841,13 @@ 
         // Must be connected
         $this->throwIfNotConnected();
 
-        $this->debug('send>>>: ' . $cmd);
+        $this->debug('send>>>: '.$cmd);
         // Write the cmd to the connection stream
-        $result = fwrite($this->socket, $cmd . self::CRLF);
+        $result = fwrite($this->socket, $cmd.self::CRLF);
 
         // Did it work?
         if (false === $result) {
-            throw new SendFailedException('Send failed on: ' . $this->host);
+            throw new SendFailedException('Send failed on: '.$this->host);
         }
 
         return $result;
@@ -876,7 +876,7 @@ 
 
         // Retrieve response
         $line = fgets($this->socket, 1024);
-        $this->debug('<<<recv: ' . $line);
+        $this->debug('<<<recv: '.$line);
 
         // Have we timed out?
         $info = stream_get_meta_data($this->socket);
@@ -931,7 +931,7 @@ 
              * No response in expect() probably means that the remote server
              * forcibly closed the connection so let's clean up on our end as well?
              */
-            $this->debug('No response in expect(): ' . $e->getMessage());
+            $this->debug('No response in expect(): '.$e->getMessage());
             $this->disconnect(false);
         }
 
@@ -1037,9 +1037,9 @@ 
 
         if ($this->debug) {
             if ('cli' !== PHP_SAPI) {
-                $str = '<br/><pre>' . htmlspecialchars($str) . '</pre>';
+                $str = '<br/><pre>'.htmlspecialchars($str).'</pre>';
             }
-            echo "\n" . $str;
+            echo "\n".$str;
         }
     }
 
@@ -1062,7 +1062,7 @@ 
      */
     private function stamp(string $msg): string
     {
-        return '[' . $this->getLogDate() . '] ' . $msg;
+        return '['.$this->getLogDate().'] '.$msg;
     }
 
     /**
@@ -1119,7 +1119,7 @@ 
             return \call_user_func_array([$this, $camelized], $args);
         }
 
-        trigger_error('Fatal error: Call to undefined method ' . self::class . '::' . $name . '()', E_USER_ERROR);
+        trigger_error('Fatal error: Call to undefined method '.self::class.'::'.$name.'()', E_USER_ERROR);
     }
 
     /**
@@ -1270,16 +1270,16 @@ 
         if (($bindAddress[0] !== '[') && filter_var($bindAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             // If given string does not start with [, but is valid ipv6, wrap it in [] and
             // assume port is 0
-            $ip = '[' . $bindAddress . ']';
+            $ip = '['.$bindAddress.']';
             $port = '0';
         } else {
             // If address starts with [ or does not appear to be ipv6, let parse_url() handle it
-            $parts = @parse_url('https://' . $bindAddress);
+            $parts = @parse_url('https://'.$bindAddress);
             $ip = $parts['host'] ?? $bindAddress;
             $port = $parts['port'] ?? '0';
         }
 
-        return $ip . ':' . $port;
+        return $ip.':'.$port;
     }
 
     /**