ricardosierra / validate

src/Validate/Email.php

Spacing +17 added lines, -17 removed lines

@@ -95,7 +95,7 @@ 
 
     public static function isSame(string $to, string $from)
     {
-        return (self::toDatabase($to)===self::toDatabase($from));
+        return (self::toDatabase($to) === self::toDatabase($from));
     }
 
     /**
@@ -105,7 +105,7 @@ 
      */
     public static function validate(string $email): boolean
     {
-        if ((boolean) filter_var($email, FILTER_VALIDATE_EMAIL)===false) {
+        if ((boolean) filter_var($email, FILTER_VALIDATE_EMAIL) === false) {
             return false;
         }
         
@@ -173,7 +173,7 @@ 
     public function setEmailFrom(string $email): void
     {
         if (!self::validate($email)) {
-            $this->set_error('Invalid address : ' . $email);
+            $this->set_error('Invalid address : '.$email);
             $this->edebug($this->ErrorInfo);
             if ($this->exceptions) {
                 throw new Exception($this->ErrorInfo);
@@ -188,7 +188,7 @@ 
      */
     public function setConnectionTimeout($seconds): void
     {
-        if ($seconds > 0) {
+        if ($seconds>0) {
             $this->max_connection_timeout = (int) $seconds;
         }
     }
@@ -199,14 +199,14 @@ 
      */
     public function setStreamTimeout($seconds): void
     {
-        if ($seconds > 0) {
+        if ($seconds>0) {
             $this->stream_timeout = (int) $seconds;
         }
     }
 
     public function setStreamTimeoutWait($seconds): void
     {
-        if ($seconds >= 0) {
+        if ($seconds>=0) {
             $this->stream_timeout_wait = (int) $seconds;
         }
     }
@@ -269,7 +269,7 @@ 
      */
     public function isError(): boolean
     {
-        return ($this->error_count > 0);
+        return ($this->error_count>0);
     }
 
     /**
@@ -302,11 +302,11 @@ 
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n \t ",
                     trim($str)
-                ) . "\n";
+                )."\n";
         }
     }
 
@@ -337,7 +337,7 @@ 
              * suppress error output from stream socket client...
              * Thanks Michael.
              */
-            $this->stream = @stream_socket_client("tcp://" . $host . ":" . $this->port, $errno, $errstr, $timeout);
+            $this->stream = @stream_socket_client("tcp://".$host.":".$this->port, $errno, $errstr, $timeout);
             if ($this->stream === false) {
                 if ($errno == 0) {
                     $this->set_error("Problem initializing the socket");
@@ -347,7 +347,7 @@ 
                     }
                     return false;
                 } else {
-                    $this->edebug($host . ":" . $errstr);
+                    $this->edebug($host.":".$errstr);
                 }
             } else {
                 stream_set_timeout($this->stream, $this->stream_timeout);
@@ -372,7 +372,7 @@ 
             return false;
         }
 
-        $this->_streamQuery("HELO " . self::parse_email($this->from));
+        $this->_streamQuery("HELO ".self::parse_email($this->from));
         $this->_streamResponse();
         $this->_streamQuery("MAIL FROM: <{$this->from}>");
         $this->_streamResponse();
@@ -385,7 +385,7 @@ 
         $this->_streamQuery("QUIT");
         fclose($this->stream);
         
-        $code = !empty($code2)?$code2:$code;
+        $code = !empty($code2) ? $code2 : $code;
         switch ($code) {
             case '250':
             /**
@@ -426,7 +426,7 @@ 
     protected function _streamQuery($query)
     {
         $this->edebug($query);
-        return stream_socket_sendto($this->stream, $query . self::CRLF);
+        return stream_socket_sendto($this->stream, $query.self::CRLF);
     }
 
     /**
@@ -444,12 +444,12 @@ 
             $this->edebug("Timed out while waiting for data! (timeout {$this->stream_timeout} seconds)");
         }
 
-        if ($reply === false && $status['timed_out'] && $timed < $this->stream_timeout_wait) {
-            return $this->_streamResponse($timed + $this->stream_timeout);
+        if ($reply === false && $status['timed_out'] && $timed<$this->stream_timeout_wait) {
+            return $this->_streamResponse($timed+$this->stream_timeout);
         }
 
 
-        if ($reply !== false && $status['unread_bytes'] > 0) {
+        if ($reply !== false && $status['unread_bytes']>0) {
             $reply .= stream_get_line($this->stream, $status['unread_bytes'], self::CRLF);
         }
         $this->edebug($reply);

src/Validate/Password.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
      */
     public static function isSame(string $fromDatabase, string $fromUser)
     {
-        return (self::toDatabase($fromDatabase)===self::toDatabase($fromUser));
+        return (self::toDatabase($fromDatabase) === self::toDatabase($fromUser));
     }
 
     public static function generate(
@@ -88,11 +88,11 @@ 
         $keyspace = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%'
     ) {
         $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        if ($max < 1) {
+        $max = mb_strlen($keyspace, '8bit')-1;
+        if ($max<1) {
             throw new Exception('$keyspace must be at least two characters long');
         }
-        for ($i = 0; $i < $length; ++$i) {
+        for ($i = 0; $i<$length; ++$i) {
             $str .= $keyspace[random_int(0, $max)];
         }
         return $str;

src/Validate/Url.php

Spacing +33 added lines, -33 removed lines

@@ -31,7 +31,7 @@ 
 
     public static function isSame(string $to, string $from)
     {
-        return (self::toDatabase($to)===self::toDatabase($from));
+        return (self::toDatabase($to) === self::toDatabase($from));
     }
 
 
@@ -152,7 +152,7 @@ 
      */
     public static function isMailto($link)
     {
-        if (stripos($link, 'mailto:')===false) {
+        if (stripos($link, 'mailto:') === false) {
             return false;
         } else {
             return true;
@@ -249,7 +249,7 @@ 
             if ($base === false) {
                 $base = '';
             }
-            $r['path'] = $base . '/' . $r['path'];
+            $r['path'] = $base.'/'.$r['path'];
         }
         $r['path'] = self::urlRemoveDotSegments($r['path']);
         return self::joinUrl($r);
@@ -279,7 +279,7 @@ 
         }
         $outPath = implode('/', $outSegs);
         if ($path[0] == '/') {
-            $outPath = '/' . $outPath;
+            $outPath = '/'.$outPath;
         }
 
         // compare last multi-byte character against '/'
@@ -298,17 +298,17 @@ 
      * Code distributed under OSI BSD (http://www.opensource.org/licenses/bsd-license.php)
      *
      */
-    public static function splitUrl($url, $decode=true)
+    public static function splitUrl($url, $decode = true)
     {
         $parts = [];
         $m = [];
         $xunressub     = 'a-zA-Z\d\-._~\!$&\'()*+,;=';
-        $xpchar        = $xunressub . ':@%';
+        $xpchar        = $xunressub.':@%';
 
         $xscheme       = '([a-zA-Z][a-zA-Z\d+-.]*)';
 
-        $xuserinfo     = '((['  . $xunressub . '%]*)' .
-                        '(:([' . $xunressub . ':%]*))?)';
+        $xuserinfo     = '((['.$xunressub.'%]*)'.
+                        '(:(['.$xunressub.':%]*))?)';
 
         $xipv4         = '(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})';
 
@@ -317,31 +317,31 @@ 
         $xhost_name    = '([a-zA-Z%]+)';
         // $xhost_name    = '([a-zA-Z\d-.%]+)'; @todo alterado pq tava dando erro nesse parser
 
-        $xhost         = '(' . $xhost_name . '|' . $xipv4 . '|' . $xipv6 . ')';
+        $xhost         = '('.$xhost_name.'|'.$xipv4.'|'.$xipv6.')';
         $xport         = '(\d*)';
-        $xauthority    = '((' . $xuserinfo . '@)?' . $xhost .
-                        '?(:' . $xport . ')?)';
+        $xauthority    = '(('.$xuserinfo.'@)?'.$xhost.
+                        '?(:'.$xport.')?)';
 
-        $xslash_seg    = '(/[' . $xpchar . ']*)';
-        $xpath_authabs = '((//' . $xauthority . ')((/[' . $xpchar . ']*)*))';
-        $xpath_rel     = '([' . $xpchar . ']+' . $xslash_seg . '*)';
-        $xpath_abs     = '(/(' . $xpath_rel . ')?)';
-        $xapath        = '(' . $xpath_authabs . '|' . $xpath_abs .
-                        '|' . $xpath_rel . ')';
+        $xslash_seg    = '(/['.$xpchar.']*)';
+        $xpath_authabs = '((//'.$xauthority.')((/['.$xpchar.']*)*))';
+        $xpath_rel     = '(['.$xpchar.']+'.$xslash_seg.'*)';
+        $xpath_abs     = '(/('.$xpath_rel.')?)';
+        $xapath        = '('.$xpath_authabs.'|'.$xpath_abs.
+                        '|'.$xpath_rel.')';
 
-        $xqueryfrag    = '([' . $xpchar . '/?' . ']*)';
+        $xqueryfrag    = '(['.$xpchar.'/?'.']*)';
 
-        $xurl          = '^(' . $xscheme . ':)?' .  $xapath . '?' .
-                        '(\?' . $xqueryfrag . ')?(#' . $xqueryfrag . ')?$';
+        $xurl          = '^('.$xscheme.':)?'.$xapath.'?'.
+                        '(\?'.$xqueryfrag.')?(#'.$xqueryfrag.')?$';
     
     
         // Split the URL into components.
-        if (!preg_match('!' . $xurl . '!', $url, $m)) {
+        if (!preg_match('!'.$xurl.'!', $url, $m)) {
             return false;
         }
     
         if (!empty($m[2])) {
-            $parts['scheme']  = strtolower($m[2]);
+            $parts['scheme'] = strtolower($m[2]);
         }
     
         if (!empty($m[7])) {
@@ -352,11 +352,11 @@ 
             }
         }
         if (!empty($m[10])) {
-            $parts['pass']    = $m[11];
+            $parts['pass'] = $m[11];
         }
     
         if (!empty($m[13])) {
-            $h=$parts['host'] = $m[13];
+            $h = $parts['host'] = $m[13];
         } elseif (!empty($m[14])) {
             $parts['host']    = $m[14];
         } elseif (!empty($m[16])) {
@@ -380,7 +380,7 @@ 
             $parts['query']   = $m[28];
         }
         if (!empty($m[29])) {
-            $parts['fragment']= $m[30];
+            $parts['fragment'] = $m[30];
         }
     
         if (!$decode) {
@@ -414,7 +414,7 @@ 
      * Code distributed under OSI BSD (http://www.opensource.org/licenses/bsd-license.php)
      *
      */
-    public static function joinUrl($parts, $encode=true)
+    public static function joinUrl($parts, $encode = true)
     {
         if ($encode) {
             if (isset($parts['user'])) {
@@ -436,7 +436,7 @@ 
             }
 
             if (isset($parts['query'])) {
-                $parts['query']    = rawurlencode($parts['query']);
+                $parts['query'] = rawurlencode($parts['query']);
             }
 
             if (isset($parts['fragment'])) {
@@ -446,25 +446,25 @@ 
     
         $url = '';
         if (!empty($parts['scheme'])) {
-            $url .= $parts['scheme'] . ':';
+            $url .= $parts['scheme'].':';
         }
         if (isset($parts['host'])) {
             $url .= '//';
             if (isset($parts['user'])) {
                 $url .= $parts['user'];
                 if (isset($parts['pass'])) {
-                    $url .= ':' . $parts['pass'];
+                    $url .= ':'.$parts['pass'];
                 }
                 $url .= '@';
             }
             if (preg_match('!^[\da-f]*:[\da-f.:]+$!ui', $parts['host'])) {
-                $url .= '[' . $parts['host'] . ']';
+                $url .= '['.$parts['host'].']';
             } // IPv6
             else {
                 $url .= $parts['host'];
             }             // IPv4 or name
             if (isset($parts['port'])) {
-                $url .= ':' . $parts['port'];
+                $url .= ':'.$parts['port'];
             }
             if (!empty($parts['path']) && $parts['path'][0] != '/') {
                 $url .= '/';
@@ -474,10 +474,10 @@ 
             $url .= $parts['path'];
         }
         if (isset($parts['query'])) {
-            $url .= '?' . $parts['query'];
+            $url .= '?'.$parts['query'];
         }
         if (isset($parts['fragment'])) {
-            $url .= '#' . $parts['fragment'];
+            $url .= '#'.$parts['fragment'];
         }
         return $url;
     }