knut7 / framework

src/Ballybran/Helpers/Security/Val.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
     public function digit(string $data)
     {
-        if ( false == ctype_digit($data) ) {
+        if (false == ctype_digit($data)) {
             return "Your string " . $data . " must be a digit";
         }
     }

src/Ballybran/Helpers/Security/Validate.php

Spacing +9 added lines, -9 removed lines

@@ -151,7 +151,7 @@ 
     public function text()
     {
         if (!is_string($this->_postData[$this->_currentItem])) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Text');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Text');
         }
 
         return $this;
@@ -161,7 +161,7 @@ 
     {
         $email = filter_var($this->_postData[$this->_currentItem], FILTER_SANITIZE_EMAIL);
         if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Email');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Email');
         }
 
         return $this;
@@ -170,7 +170,7 @@ 
     public function numeric()
     {
         if (!is_numeric($this->_postData[$this->_currentItem])) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Numeric');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Numeric');
         }
 
         return $this;
@@ -179,7 +179,7 @@ 
     public function int()
     {
         if (!intval($this->_postData[$this->_currentItem])) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Int');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Int');
         }
 
         return $this;
@@ -188,7 +188,7 @@ 
     public function long()
     {
         if (!floatval($this->_postData[$this->_currentItem])) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Long');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Long');
         }
 
         return $this;
@@ -197,7 +197,7 @@ 
     public function domain()
     {
         if (!filter_var($this->_postData[$this->_currentItem], FILTER_VALIDATE_DOMAIN)) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Domain');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Domain');
         }
 
         return $this;
@@ -206,7 +206,7 @@ 
     public function url()
     {
         if (!filter_var($this->_postData[$this->_currentItem], FILTER_VALIDATE_URL)) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Url');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Url');
         }
 
         return $this;
@@ -215,7 +215,7 @@ 
     public function ip()
     {
         if (!filter_var($this->_postData[$this->_currentItem], FILTER_VALIDATE_IP)) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Ip');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Ip');
         }
 
         return $this;
@@ -224,7 +224,7 @@ 
     public function date()
     {
         if (!is_string($this->_postData[$this->_currentItem])) {
-            throw new \InvalidArgumentException('the value ('.$this->_postData[$this->_currentItem].') entered must have a Date');
+            throw new \InvalidArgumentException('the value (' . $this->_postData[$this->_currentItem] . ') entered must have a Date');
         }
 
         return $this;

src/Ballybran/Helpers/Log/StdoutLogger.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
     /**
      * @param string $message
      */
-    public function write( $message, string $type = null)
+    public function write($message, string $type = null)
     {
-        return $this->message =$message;
+        return $this->message = $message;
     }
 }

src/Ballybran/Helpers/Log/FileLoggerFactory.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 namespace Ballybran\Helpers\Log;
 
 
-class FileLoggerFactory implements iLoggerFactory{
+class FileLoggerFactory implements iLoggerFactory {
 
     /**
      * @var string
@@ -26,7 +26,7 @@ 
     private $filePath;
     private $dir;
 
-    public function __construct(string $filePath, $dir= null)
+    public function __construct(string $filePath, $dir = null)
     {
         if ($dir != null) {
 

src/Ballybran/Helpers/Log/iLogger.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@
 namespace Ballybran\Helpers\Log;
 
 
-interface iLogger{
+interface iLogger {
 
-    public function write( $message, string $type = null);
+    public function write($message, string $type = null);
 }

src/Ballybran/Helpers/Log/StdoutLoggerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 namespace Ballybran\Helpers\Log;
 
-class StdoutLoggerFactory implements iLoggerFactory{
+class StdoutLoggerFactory implements iLoggerFactory {
 
 
     public function createLogger(): iLogger

src/Ballybran/Helpers/Firewall/Firewall.php

Spacing +4 added lines, -4 removed lines

@@ -169,15 +169,15 @@ 
     public function ipToHex($ipAddress)
     {
         $hex = '';
-        if ( false !== strpos($ipAddress, ',') ) {
+        if (false !== strpos($ipAddress, ',')) {
             $splitIp = explode(',', $ipAddress);
             $ipAddress = trim($splitIp[0]);
         }
         $isIpV6 = false;
         $isIpV4 = false;
-        if ( false !== filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ) {
+        if (false !== filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             $isIpV6 = true;
-        } else if (false !== filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ) {
+        } else if (false !== filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
             $isIpV4 = true;
         }
         if (!$isIpV4 && !$isIpV6) {
@@ -195,7 +195,7 @@ 
         else {
             $parts = explode(':', $ipAddress);
             // If this is mixed IPv6/IPv4, convert end to IPv6 value
-            if ( false !== filter_var($parts[count($parts) - 1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ) {
+            if (false !== filter_var($parts[count($parts) - 1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
                 $partsV4 = explode('.', $parts[count($parts) - 1]);
                 for ($i = 0; $i < 4; $i++) {
                     $partsV4[$i] = str_pad(dechex($partsV4[$i]), 2, '0', STR_PAD_LEFT);

Braces +19 added lines, -7 removed lines

@@ -240,11 +240,18 @@ 
         $QRange1 = $temp[0];
         $QRange2 = $temp[1];
 
-        if ($QRange2 == "") return array($QRange1); //special case, they didn't put a second quad parameter
+        if ($QRange2 == "") {
+            return array($QRange1);
+        }
+        //special case, they didn't put a second quad parameter
 
         //basic error handling to see if it is generally a valid IP in the form N.N.N.N
-        if (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $QRange1) != 1) return array(-1);
-        if (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $QRange2) != 1) return array(-1);
+        if (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $QRange1) != 1) {
+            return array(-1);
+        }
+        if (preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $QRange2) != 1) {
+            return array(-1);
+        }
 
         $quad1 = explode(".", $QRange1);
         $quad2 = explode(".", $QRange2);
@@ -252,12 +259,16 @@ 
         reset($quad1);
         while (list ($key, $val) = each($quad1)) {
             $quad1[$key] = intval($val);
-            if ($quad1[$key] < 0 || $quad1[$key] > 255) return array(-2);
+            if ($quad1[$key] < 0 || $quad1[$key] > 255) {
+                return array(-2);
+            }
         }
         reset($quad2);
         while (list ($key, $val) = each($quad2)) {
             $quad2[$key] = intval($val);
-            if ($quad2[$key] < 0 || $quad2[$key] > 255) return array(-2);
+            if ($quad2[$key] < 0 || $quad2[$key] > 255) {
+                return array(-2);
+            }
         }
 
         $startIP_long = sprintf("%u", ip2long($QRange1));
@@ -272,8 +283,9 @@ 
 
             //this is a total hack. there must be a better way.
             $thisQuad = explode(".", $temp);
-            if ($thisQuad[3] > 0 && $thisQuad[3] < 255)
-                $ip[$k++] = $temp;
+            if ($thisQuad[3] > 0 && $thisQuad[3] < 255) {
+                            $ip[$k++] = $temp;
+            }
         }
 
         return $ip;

src/Ballybran/Helpers/Http/Client/ClientRest.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
         curl_setopt($curl, CURLOPT_POST, true);
         curl_setopt($curl, CURLOPT_POSTFIELDS, $curl_post_data);
         $curl_response = curl_exec($curl);
-        if ( false === $curl_response ) {
+        if (false === $curl_response) {
             $info = curl_getinfo($curl);
             curl_close($curl);
             die('error occured during curl exec. Additioanl info: ' . var_export($info));
@@ -107,7 +107,7 @@ 
         $data = array("status" => 'R');
         curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
         $response = curl_exec($ch);
-        if ( false === $response ) {
+        if (false === $response) {
             $info = curl_getinfo($ch);
             curl_close($ch);
             die('error occured during curl exec. Additioanl info: ' . var_export($info));
@@ -135,7 +135,7 @@ 
         );
         curl_setopt($ch, CURLOPT_POSTFIELDS, $curl_post_data);
         $curl_response = curl_exec($ch);
-        if ( false === $curl_response ) {
+        if (false === $curl_response) {
             $info = curl_getinfo($ch);
             curl_close($ch);
             die('error occured during curl exec. Additioanl info: ' . var_export($info));

src/Ballybran/Helpers/Http/Cookie.php

Indentation +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
     }
 
     public function setValue($value){
-         $this->data['value']= $value;
+            $this->data['value']= $value;
 
     }
 

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
      *
      * @return Cookie
      */
-    public function createCookie( $name, int $maxage = 0, string $path = '', string $domain = '', bool $secure = false,bool $HTTPOnly = false): Cookie
+    public function createCookie($name, int $maxage = 0, string $path = '', string $domain = '', bool $secure = false, bool $HTTPOnly = false): Cookie
     {
         $this->setName($name)
         ->setMaxage($maxage)
@@ -75,7 +75,7 @@ 
         $ob = ini_get('output_buffering');
 
         // Abort the method if headers have already been sent, except when output buffering has been enabled
-        if (headers_sent() && false === (bool)$ob  || 'off' == strtolower($ob) ) {
+        if (headers_sent() && false === (bool)$ob || 'off' == strtolower($ob)) {
             return $this;
         }
 
@@ -129,13 +129,13 @@ 
      */
     public function setName($name) : Cookie
     {
-        if(is_array($name)) {
+        if (is_array($name)) {
 
             foreach ($name as $k => $v) {
                 $this->data['name'] = $k . '=' . rawurlencode($v);
             }
-        }else {
-            $this->data['name'] = $name . '='. rawurlencode($name);
+        } else {
+            $this->data['name'] = $name . '=' . rawurlencode($name);
         }
 
         return $this;
@@ -188,7 +188,7 @@ 
             }
             // Remove port information.
             $port = strpos($domain, ':');
-            if ( false !== $port ) {
+            if (false !== $port) {
                 $this->data['domain'] = substr($domain, 0, $port);
             }
         }
@@ -256,8 +256,8 @@ 
         return $this->data['value'];
     }
 
-    public function setValue($value){
-         $this->data['value']= $value;
+    public function setValue($value) {
+         $this->data['value'] = $value;
 
     }
 

Braces +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
             foreach ($name as $k => $v) {
                 $this->data['name'] = $k . '=' . rawurlencode($v);
             }
-        }else {
+        } else {
             $this->data['name'] = $name . '='. rawurlencode($name);
         }