las93 / venus3

bundles/lib/I18n.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
                 
                 $fCallBack = function($sValue) use ($oJson)
                 {    
-                    if (isset($oJson->$sValue)) { return $oJson->$sValue; }
-                    else { return ''; }
+                    if (isset($oJson->$sValue)) { return $oJson->$sValue; } else { return ''; }
                 };
             }
             

bundles/lib/Date.php

Braces +9 added lines, -33 removed lines

@@ -43,11 +43,9 @@ 
 	{
 		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-		else { $iWeekInSeconds = 0; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
 		$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
 		$iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
@@ -78,18 +76,7 @@ 
 	{
 		if ($sLanguage == 'fr') {
 
-			if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
-			else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
-			else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
-			else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
-			else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
-			else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
-			else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
-			else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
-			else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
-			else if ($sMonth == 10) { return 'Octobre'; }
-			else if ($sMonth == 11) { return 'Novembre'; }
-			else if ($sMonth == 12) { return 'Décembre'; }
+			if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; } else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; } else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; } else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; } else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; } else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; } else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; } else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; } else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; } else if ($sMonth == 10) { return 'Octobre'; } else if ($sMonth == 11) { return 'Novembre'; } else if ($sMonth == 12) { return 'Décembre'; }
 		}
 	}
 
@@ -105,13 +92,7 @@ 
 	{
 		if ($sLanguage == 'fr') {
 
-			if ($sDay == 0) { return 'dimanche'; }
-			else if ($sDay == 1) { return 'lundi'; }
-			else if ($sDay == 2) { return 'mardi'; }
-			else if ($sDay == 3) { return 'mercredi'; }
-			else if ($sDay == 4) { return 'jeudi'; }
-			else if ($sDay == 5) { return 'vendredi'; }
-			else if ($sDay == 6) { return 'samedi'; }
+			if ($sDay == 0) { return 'dimanche'; } else if ($sDay == 1) { return 'lundi'; } else if ($sDay == 2) { return 'mardi'; } else if ($sDay == 3) { return 'mercredi'; } else if ($sDay == 4) { return 'jeudi'; } else if ($sDay == 5) { return 'vendredi'; } else if ($sDay == 6) { return 'samedi'; }
 		}
 	}
 
@@ -138,8 +119,7 @@ 
 			if ($iMonth == $aToday['mois']) {
 
 				if ($iDay > $aToday['jour']) { $iYears--; }
-			}
-			else {
+			} else {
 
 				$iYears--;
 			}
@@ -160,18 +140,15 @@ 
 	{
 		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-		else { $iWeekInSeconds = 0; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
 		if (date('N') > 2) {
 
 			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
 			$iTimestampLastDay = $iTimestamp + 604800;
-		}
-		else {
+		} else {
 
 			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
 			$iTimestampLastDay = $iTimestamp + 604800;
@@ -228,7 +205,6 @@ 
 		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 < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; } else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
 	}
 }

bundles/lib/Form/Container.php

Braces +5 added lines, -10 removed lines

@@ -85,8 +85,7 @@ 
 	            
 	            $oNewForm = $mValue->createView();
 	            $oView->form_row[$sKey] = $oNewForm->form_row;
-	        }
-	        else {
+	        } else {
 	            
 	           $oView->form_row[$sKey] = $mValue;
 	        }
@@ -147,8 +146,7 @@ 
 		    }
 		
 		    $oEntity->save();
-		}
-		else if ($this->_oForm->getSynchronizeEntity() !== null && isset($aRequest) && count($aRequest) > 0) {
+		} else if ($this->_oForm->getSynchronizeEntity() !== null && isset($aRequest) && count($aRequest) > 0) {
 		
 		    $oEntity = new $this->_oForm->_sSynchronizeEntity;
 		
@@ -187,8 +185,7 @@ 
 	 */
 	public function isValid() : bool
 	{
-		if ($this->_bHandleRequestActivate === true) { return true; }
-		else { return false; }
+		if ($this->_bHandleRequestActivate === true) { return true; } else { return false; }
 	}
 
 	/**
@@ -202,8 +199,7 @@ 
 	    if (isset($_POST['validform'.$this->_oForm->getFormNumber()]) && $_POST['validform'.$this->_oForm->getFormNumber()] == 1) {
 	        
 	        return true;
-	    }
-		else { 
+	    } else { 
 		    
 		    return false;
 		}
@@ -218,8 +214,7 @@ 
 	 */
 	public function isClicked(string $sElementName) : bool
 	{
-	    if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; }
-		else { return false; }
+	    if (isset($_POST[$sElementName]) && $_POST[$sElementName]) { return true; } else { return false; }
 	}
 
 	/**

bundles/lib/Form/Textarea.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 		$this->setName($sName);
 		$this->setValue($sValue);
 
-		if ($sLabel !== null) { $this->setLabel($sLabel); }
-		else { $this->setLabel($sName); }
+		if ($sLabel !== null) { $this->setLabel($sLabel); } else { $this->setLabel($sName); }
 	}
 
 	/**

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

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/Vendor.php

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/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

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