las93 / venus3

bundles/lib/PhpDoc.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 
 					$aParams['param'][$iIndex][] = $sValue;
 				}
-			}
-			else {
+			} else {
 
 				$aParams[$aOneMatch[1]] = array();
 

bundles/lib/Session.php

Indentation +7 added lines, -7 removed lines

@@ -49,8 +49,8 @@ 
   	 */
   	public function set(string $sName, $mValue) : Session
 	{
-    	$_SESSION[$sName] = $mValue;
-    	return $this;
+		$_SESSION[$sName] = $mValue;
+		return $this;
   	}
 
   	/**
@@ -84,7 +84,7 @@ 
   	 * @param  string $sName name of the session
   	 * @param  string $sValue value of this sesion var
   	 * @return \Venus\lib\Session
-	 */
+  	 */
  	 public function setFlashBag($sName, $sValue)
 	 {
   		if (!isset($_SESSION['flashbag'])) { $_SESSION['flashbag'] = array(); }
@@ -109,10 +109,10 @@ 
 		    
 			$aParams = session_get_cookie_params();
 		    
-		    setcookie(session_name(), '', time() - 42000,
-		        $aParams["path"], $aParams["domain"],
-		        $aParams["secure"], $aParams["httponly"]
-		    );
+			setcookie(session_name(), '', time() - 42000,
+				$aParams["path"], $aParams["domain"],
+				$aParams["secure"], $aParams["httponly"]
+			);
 		}
 
 		session_destroy();

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
   	 */
   	public function get(string $sName)
 	{
-  		if (isset($_SESSION[$sName])) { return $_SESSION[$sName]; }
-  		else { return false; }
+  		if (isset($_SESSION[$sName])) { return $_SESSION[$sName]; } else { return false; }
   	}
 
   	/**

bundles/lib/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * the from of mail
 	 * @access private
 	 * @var    string
-	*/
+	 */
 	private $_sFrom = "no-reply@iscreenway.com";
 
 	/**

Spacing +7 added lines, -7 removed lines

@@ -174,34 +174,34 @@
 	 */
 	public function send() : bool
 	{
-		$sHeaders = 'From: ' . $this->_sFrom . "\r\n";
+		$sHeaders = 'From: '.$this->_sFrom."\r\n";
 
 		if (empty($this->_aAttachments)) {
 			
 			if ($this->_sFormat == "HTML") {
 				
-				$sHeaders .= 'MIME-Version: 1.0' . "\r\n";
-				$sHeaders .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
+				$sHeaders .= 'MIME-Version: 1.0'."\r\n";
+				$sHeaders .= 'Content-type: text/html; charset=UTF-8'."\r\n";
 			}
 			
 			return mail(implode(',', $this->_aRecipient), $this->_sSubject, $this->_sMessage, $sHeaders);
 		}
 		else {
 
-			$sBoundary = "_" . md5(uniqid(rand()));
+			$sBoundary = "_".md5(uniqid(rand()));
 
 			$sAttached = "";
 
 			foreach ($this->_aAttachments as $aAttachment) {
 				
 				$sAttached_file = chunk_split(base64_encode($aAttachment["content"]));
-				$sAttached = "\n\n" . "--" . $sBoundary . "\nContent-Type: application; name=\"" . $aAttachment["name"] . "\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"" . $aAttachment["name"] . "\"\r\n\n" . $sAttached_file . "--" . $sBoundary . "--";
+				$sAttached = "\n\n"."--".$sBoundary."\nContent-Type: application; name=\"".$aAttachment["name"]."\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"".$aAttachment["name"]."\"\r\n\n".$sAttached_file."--".$sBoundary."--";
 			}
 
-			$sHeaders = 'From: ' . $this->_sFrom . "\r\n";
+			$sHeaders = 'From: '.$this->_sFrom."\r\n";
 			$sHeaders .= "MIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary=\"$sBoundary\"\r\n";
 
-			$sBody = "--" . $sBoundary . "\nContent-Type: " . ($this->_sFormat == "HTML" ? "text/html" : "text/plain") . "; charset=UTF-8\r\n\n" . $this->_sMessage . $sAttached;
+			$sBody = "--".$sBoundary."\nContent-Type: ".($this->_sFormat == "HTML" ? "text/html" : "text/plain")."; charset=UTF-8\r\n\n".$this->_sMessage.$sAttached;
 
 			return mail(implode(',', $this->_aRecipient), $this->_sSubject, $sBody, $sHeaders);
 		}

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 				$sKey = preg_replace("/^\\0(.*)\\0/", "", $sKey);
 				$aNew[$sKey] = self::object_to_array($mValues);
 			}
-		}
-		else {
+		} else {
 
 			$aNew = $mObject;
 		}

bundles/lib/Benchmark.php

Indentation +3 added lines, -3 removed lines

@@ -81,11 +81,11 @@ 
 	 */
 	public static function setPointInLog(string $sName = 'default')
 	{
-	    $oLogger = Debug::getInstance();
+		$oLogger = Debug::getInstance();
 		$oLogger->setLogger($oLogger);
 
 		$oLogger->getLogger()
-	         	->log('BENCHMARK: Time at this point '.(microtime(true) - self::$_fStart).' - '.$sName);
+			 	->log('BENCHMARK: Time at this point '.(microtime(true) - self::$_fStart).' - '.$sName);
 	}
 	
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setLogger(LoggerInterface $logger)
 	{
-	    if ($this->_oLogger === null) { $this->_oLogger = $logger; }
+		if ($this->_oLogger === null) { $this->_oLogger = $logger; }
 	}
 
 	/**

bundles/lib/Vendor.php

Indentation +26 added lines, -26 removed lines

@@ -30,13 +30,13 @@ 
  */
 class Vendor
 {
-    /**
-     * cache of the vendor available
-     * 
-     * @access private
-     * @var    array
-     */
-    private static $_aCache = null;
+	/**
+	 * cache of the vendor available
+	 * 
+	 * @access private
+	 * @var    array
+	 */
+	private static $_aCache = null;
     
 	/**
 	 * constructor - factory
@@ -54,31 +54,31 @@ 
 
 	public static function getVendor(string $sVendorName, $mParam = null, $mParam2 = null)
 	{
-	    if ($sVendorName === 'Apollina\Template') { 
+		if ($sVendorName === 'Apollina\Template') { 
 
-	        $oApollina = new $sVendorName($mParam, str_replace('lib', '', __DIR__), 
-	            str_replace('bundles'.DIRECTORY_SEPARATOR.'lib', CACHE_DIR, __DIR__), $mParam2);
+			$oApollina = new $sVendorName($mParam, str_replace('lib', '', __DIR__), 
+				str_replace('bundles'.DIRECTORY_SEPARATOR.'lib', CACHE_DIR, __DIR__), $mParam2);
 
-	        return $oApollina->addFunctionPath(__DIR__.DIRECTORY_SEPARATOR.'Functions', '\Venus\lib\Functions\\');
-	    }
-	    else if ($sVendorName === 'Attila\Orm') {
+			return $oApollina->addFunctionPath(__DIR__.DIRECTORY_SEPARATOR.'Functions', '\Venus\lib\Functions\\');
+		}
+		else if ($sVendorName === 'Attila\Orm') {
 
-	        $oDbConfig = Config::get('Db')->configuration;
+			$oDbConfig = Config::get('Db')->configuration;
 
-	        return new $sVendorName($oDbConfig->db, $oDbConfig->type, $oDbConfig->host, $oDbConfig->user, $oDbConfig->password, 
-	            $oDbConfig->db);
-	    }
-	    else if (isset($mParam) && isset($mParam2)) { 
+			return new $sVendorName($oDbConfig->db, $oDbConfig->type, $oDbConfig->host, $oDbConfig->user, $oDbConfig->password, 
+				$oDbConfig->db);
+		}
+		else if (isset($mParam) && isset($mParam2)) { 
 	        
-	        return new $sVendorName($mParam, $mParam2);
-	    }
-	    else if (isset($mParam)) { 
+			return new $sVendorName($mParam, $mParam2);
+		}
+		else if (isset($mParam)) { 
 	        
-	        return new $sVendorName($mParam);
-	    }
-	    else { 
+			return new $sVendorName($mParam);
+		}
+		else { 
 	        
-	        return new $sVendorName;
-	    }
+			return new $sVendorName;
+		}
 	}
 }

Braces +4 added lines, -8 removed lines

@@ -60,23 +60,19 @@
 	            str_replace('bundles'.DIRECTORY_SEPARATOR.'lib', CACHE_DIR, __DIR__), $mParam2);
 
 	        return $oApollina->addFunctionPath(__DIR__.DIRECTORY_SEPARATOR.'Functions', '\Venus\lib\Functions\\');
-	    }
-	    else if ($sVendorName === 'Attila\Orm') {
+	    } else if ($sVendorName === 'Attila\Orm') {
 
 	        $oDbConfig = Config::get('Db')->configuration;
 
 	        return new $sVendorName($oDbConfig->db, $oDbConfig->type, $oDbConfig->host, $oDbConfig->user, $oDbConfig->password, 
 	            $oDbConfig->db);
-	    }
-	    else if (isset($mParam) && isset($mParam2)) { 
+	    } else if (isset($mParam) && isset($mParam2)) { 
 	        
 	        return new $sVendorName($mParam, $mParam2);
-	    }
-	    else if (isset($mParam)) { 
+	    } else if (isset($mParam)) { 
 	        
 	        return new $sVendorName($mParam);
-	    }
-	    else { 
+	    } else { 
 	        
 	        return new $sVendorName;
 	    }

bundles/lib/Validator/Type.php

Indentation +32 added lines, -32 removed lines

@@ -30,41 +30,41 @@
  */
 class Type extends Common
 {
-    /**
-     * type
-     * @var type
-     */
-    private $_sType = '';
+	/**
+	 * type
+	 * @var type
+	 */
+	private $_sType = '';
     
-    /**
-     * constructor
-     *
-     * @access public
-     * @param  string $sType type
-     * @return Type
-     */
-    public function __construct(string $sType)
-    {
-        $this->_sType = $sType;
-    }
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @param  string $sType type
+	 * @return Type
+	 */
+	public function __construct(string $sType)
+	{
+		$this->_sType = $sType;
+	}
     
-    /**
-     * validate the Type
-     *
-     * @access public
-     * @param  string $sValue
-     * @return bool
-     */
-    public function validate(string $sValue = null) : bool
-    {
-        if ($this->_sType == 'DateTime') {
+	/**
+	 * validate the Type
+	 *
+	 * @access public
+	 * @param  string $sValue
+	 * @return bool
+	 */
+	public function validate(string $sValue = null) : bool
+	{
+		if ($this->_sType == 'DateTime') {
             
-            if (preg_match('#^[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}#', $sValue)) {
+			if (preg_match('#^[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}#', $sValue)) {
                 
-                return true;
-            }
-        }
+				return true;
+			}
+		}
         
-        return false;
-    }
+		return false;
+	}
 }

bundles/lib/Validator/NotBlank.php

Braces +1 added lines, -2 removed lines

@@ -39,7 +39,6 @@
 	 */
 	public function validate(string $sValue = null) : bool
 	{
-		if (trim($sValue) != '') { return true; }
-		else { return false; }
+		if (trim($sValue) != '') { return true; } else { return false; }
 	}
 }

bundles/lib/Di.php

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 		}
 		else if (isset($this->_aDependencyInjectorContener[md5($sNameOfDi)])) {
 		    
-		    return $this->_aDependencyInjectorContener[md5($sNameOfDi)];
+			return $this->_aDependencyInjectorContener[md5($sNameOfDi)];
 		}
 
 		return false;
@@ -76,8 +76,8 @@ 
 	 */
 	public function set(string $sNameOfDi, callable $cFunction, bool $bShared = false) : Di
 	{
-	    if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
-	    else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
+		if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
+		else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
 		return $this;
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -56,8 +56,7 @@ 
 		if (isset(self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)])) {
 
 			return self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)];
-		}
-		else if (isset($this->_aDependencyInjectorContener[md5($sNameOfDi)])) {
+		} else if (isset($this->_aDependencyInjectorContener[md5($sNameOfDi)])) {
 		    
 		    return $this->_aDependencyInjectorContener[md5($sNameOfDi)];
 		}
@@ -76,8 +75,7 @@ 
 	 */
 	public function set(string $sNameOfDi, callable $cFunction, bool $bShared = false) : Di
 	{
-	    if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
-	    else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
+	    if ($bShared === true) { self::$_aSharedDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; } else { $this->_aDependencyInjectorContener[md5($sNameOfDi)] = $cFunction; }
 		return $this;
 	}
 }

bundles/lib/Log/LoggerAwareInterface.php

Indentation +7 added lines, -7 removed lines

@@ -7,11 +7,11 @@
  */
 interface LoggerAwareInterface
 {
-    /**
-     * Sets a logger instance on the object
-     *
-     * @param LoggerInterface $logger
-     * @return null
-     */
-    public function setLogger(LoggerInterface $logger);
+	/**
+	 * Sets a logger instance on the object
+	 *
+	 * @param LoggerInterface $logger
+	 * @return null
+	 */
+	public function setLogger(LoggerInterface $logger);
 }