las93 / venus3

bundles/lib/Date.php

Spacing +10 added lines, -10 removed lines

@@ -41,12 +41,12 @@ 
 	 */
 	public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
 	{
-		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+		$iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
 		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
 		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
 		else { $iWeekInSeconds = 0; }
 
 		$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
@@ -158,12 +158,12 @@ 
 	 */
 	public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
 	{
-		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+		$iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
 		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
 		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
 		else { $iWeekInSeconds = 0; }
 
 		if (date('N') > 2) {
@@ -182,7 +182,7 @@ 
 		if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
 
 			$aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
-			$aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
+			$aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y') + 1).'$1', $aDates[1]);
 		}
 
 		return $aDates;
@@ -225,10 +225,10 @@ 
 		$oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
 		$iTimeStamp = time() - $oDateTime->getTimestamp();
 
-		if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
-		if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
-		if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-		if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-		else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+		if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp / 60).' '.$sMinutes.$sEndReturn; }
+		if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp / 3600).' '.$sHours.$sEndReturn; }
+		if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp / 86400).' '.$sDays.$sEndReturn; }
+		if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp / 2592000).' '.$sMonths.$sEndReturn; }
+		else { return $sStartReturn.' '.(int)($iTimeStamp / 31536000).' '.$sYears.$sEndReturn; }
 	}
 }

bundles/lib/Mail.php

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);
 		}

bundles/lib/Form.php

Spacing +3 added lines, -3 removed lines

@@ -181,13 +181,13 @@ 
 		}
 		else  if ($mType === 'radio') {
 
-			$this->_aElement[$sName.rand(100000,999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
+			$this->_aElement[$sName.rand(100000, 999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
 		}
 		else  if ($mType === 'date') {
 
 			$aDay = array();
 
-			for ($i = 1 ; $i <= 31 ; $i++) {
+			for ($i = 1; $i <= 31; $i++) {
 
 				if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
 				else { $aDay[$i] = $i; }
@@ -214,7 +214,7 @@ 
 
 			$aYear = array();
 
-			for ($i = 1900 ; $i <= 2013 ; $i++) {
+			for ($i = 1900; $i <= 2013; $i++) {
 
 				$aYear[$i] = $i;
 			}

bundles/lib/Log/AbstractLogger.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 namespace Venus\lib\Log;
 
 use \Venus\lib\Debug as Debug;
-use \Venus\lib\Log\LoggerInterface  as LoggerInterface ;
+use \Venus\lib\Log\LoggerInterface  as LoggerInterface;
 use \Venus\lib\Log\LogLevel as LogLevel;
 
 /**

bundles/lib/Upload.php

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
 
 		$sExtension = strtolower(substr(strrchr($_FILES[$sFile]['name'], '.'), 1));
 
-		if (count($this->_aAllowExtension) > 0 && !in_array($sExtension ,$this->_aAllowExtension)) {
+		if (count($this->_aAllowExtension) > 0 && !in_array($sExtension, $this->_aAllowExtension)) {
 
 			$this->_sError = "The extension is not good";
 			return false;
@@ -111,24 +111,24 @@ 
 		if ($this->_sExtension === null) { $this->setExtension($sExtension); }
 
 		if ($this->_sName) { $sName = $sPath.$this->_sName.'.'.$this->_sExtension; }
-		else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension;}
+		else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension; }
 
 		if ($this->_bProportion == true && ($this->_iWidth || $this->_iHeight)) {
 
 			$aImageSizes = getimagesize($_FILES[$sFile]['tmp_name']);
 
 			$fRatio = min($aImageSizes[0] / $this->_iWidth, $aImageSizes[1] / $this->_iHeight);
-    		$iHeight =  $aImageSizes[1] / $fRatio;
-    		$iWidth =  $aImageSizes[0] / $fRatio;
+    		$iHeight = $aImageSizes[1] / $fRatio;
+    		$iWidth = $aImageSizes[0] / $fRatio;
     		$fY = ($iHeight - $this->_iHeight) / 2 * $fRatio;
     		$fX = ($iWidth - $this->_iWidth) / 2 * $fRatio;
 
 			$rNewImage = imagecreatefromjpeg($_FILES[$sFile]['tmp_name']);
 
-			$rNewImgTrueColor = imagecreatetruecolor($this->_iWidth , $this->_iHeight);
-			imagecopyresampled($rNewImgTrueColor , $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
+			$rNewImgTrueColor = imagecreatetruecolor($this->_iWidth, $this->_iHeight);
+			imagecopyresampled($rNewImgTrueColor, $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
 
-			imagejpeg($rNewImgTrueColor , $sName, 100);
+			imagejpeg($rNewImgTrueColor, $sName, 100);
 		}
 		else {
 

bundles/lib/GoogleMap/Geocoding.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     public static function signUrlForGoogle(string $sUrlToSign, string $sClientId, string $sPrivateKey) : string
     {
         $aUrl = parse_url($sUrlToSign);
-        $aUrl['query'] .= '&client=' .$sClientId;
+        $aUrl['query'] .= '&client='.$sClientId;
 
         $aUrlToSign = $aUrl['path']."?".$aUrl['query'];
 
@@ -50,8 +50,8 @@ 
 
         $sEncodedSignature = str_replace(array('+', '/'), array('-', '_'), base64_encode($sSignature));
 
-        $sOriginalUrl = $aUrl['scheme']."://".$aUrl['host'].$aUrl['path'] . "?".$aUrl['query'];
+        $sOriginalUrl = $aUrl['scheme']."://".$aUrl['host'].$aUrl['path']."?".$aUrl['query'];
 
-        return $sOriginalUrl. '&signature='. $sEncodedSignature;
+        return $sOriginalUrl.'&signature='.$sEncodedSignature;
     }
 }

bundles/lib/Request/Headers.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function set(string $name, string $value = null) : Headers
     {
         if ($value !== null) {
-            header($name . ': ' . $value);
+            header($name.': '.$value);
         }
         else {
             header($name);

bundles/core/UrlManager.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 
 						$aRoutes = array();
 
-						foreach($oHost->routes as $sKey => $oRoute) {
+						foreach ($oHost->routes as $sKey => $oRoute) {
 
 							if ($sKey === $sCode) {
 
@@ -135,8 +135,8 @@ 
 			throw new \Exception();
 		}
 		
-		$sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
-			['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
+		$sStringToEncode = str_replace(['à', 'á', 'â', 'ã', 'ä', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý'],
+			['a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y'],
 				$sStringToEncode);
 
 		$sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));

bundles/core/Router.php

Spacing +4 added lines, -4 removed lines

@@ -194,7 +194,7 @@ 
     					}
     					else if (isset($oHost->routes)) {
     
-    						foreach($oHost->routes as $sKey => $oRoute) {
+    						foreach ($oHost->routes as $sKey => $oRoute) {
 
     							$mReturn = $this->_route($oRoute, $_SERVER['REQUEST_URI']);
 
@@ -328,7 +328,7 @@ 
 						$this->_sBaseUri = preg_replace('#^[^/]+#', '', $sHost);
 					}
 
-					foreach($oHost->routes as $sKey => $oRoute) {
+					foreach ($oHost->routes as $sKey => $oRoute) {
 
 						$this->_route($oRoute, $sRoute);
 					}
@@ -392,7 +392,7 @@ 
 
 			$sFinalRoute = preg_replace_callback(
 				'|\[/{0,1}:([a-zA-Z_]+)\]|',
-				function ($aMatches) use ($oRoute) {
+				function($aMatches) use ($oRoute) {
 					return "/{0,1}(?P<".$aMatches[1].">".$oRoute->constraints->{$aMatches[1]}.")";
 				},
 				$sRoute
@@ -432,7 +432,7 @@ 
 
 			// create the $_GET by the URL
 
-			foreach($aMatch as $mKey => $sResults) {
+			foreach ($aMatch as $mKey => $sResults) {
 
 				if (is_string($mKey)) {