las93 / venus3

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

bundles/lib/Form.php

Braces +12 added lines, -24 removed lines

@@ -144,27 +144,22 @@ 
 	    if ($mType instanceof Container) {
 	        
 	        $this->_aElement[$sName] = $mType;
-	    }
-		else if ($mType === 'text' || $mType === 'submit' || $mType === 'password' || $mType === 'file' || $mType === 'tel'
+	    } else if ($mType === 'text' || $mType === 'submit' || $mType === 'password' || $mType === 'file' || $mType === 'tel'
 	        || $mType === 'url' || $mType === 'email' || $mType === 'search' || $mType === 'date' || $mType === 'time'
 	        || $mType === 'datetime' || $mType === 'month' || $mType === 'week' || $mType === 'number' || $mType === 'range'
 	        || $mType === 'color') {
 
 			$this->_aElement[$sName] = new Input($sName, $mType, $sLabel, $mValue);
-		}
-		elseif ($mType === 'textarea') {
+		} elseif ($mType === 'textarea') {
 
 			$this->_aElement[$sName] = new Textarea($sName, $sLabel, $mValue);
-		}
-		else  if ($mType === 'select') {
+		} else  if ($mType === 'select') {
 
 			$this->_aElement[$sName] = new Select($sName, $mOptions, $sLabel, $mValue);
-		}
-		else  if ($mType === 'label') {
+		} else  if ($mType === 'label') {
 
 			$this->_aElement[$sName] = new Label($sName);
-		}
-		else  if ($mType === 'list_checkbox') {
+		} else  if ($mType === 'list_checkbox') {
 
 			$i = 0;
 			
@@ -174,23 +169,19 @@ 
 			
 				$this->_aElement[$sName.'_'.$i++] = new Checkbox($sName, $sValue, $mKey, $mOptions);
 			}
-		}
-		else  if ($mType === 'checkbox') {
+		} else  if ($mType === 'checkbox') {
 
 			$this->_aElement[$sName] = new Checkbox($sName, $sLabel, $mValue, $mOptions);
-		}
-		else  if ($mType === 'radio') {
+		} else  if ($mType === 'radio') {
 
 			$this->_aElement[$sName.rand(100000,999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
-		}
-		else  if ($mType === 'date') {
+		} else  if ($mType === 'date') {
 
 			$aDay = array();
 
 			for ($i = 1 ; $i <= 31 ; $i++) {
 
-				if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
-				else { $aDay[$i] = $i; }
+				if ($i < 10) { $aDay['0'.$i] = '0'.$i; } else { $aDay[$i] = $i; }
 			}
 
 			$this->_aElement[$sName.'_day'] = new Select($sName, $aDay);
@@ -331,8 +322,7 @@ 
 	                if ($sValue instanceof Form) {
 	                    
 	                    ;
-	                }
-	                else {
+	                } else {
 	                 
     	                $sMethodNameInEntity = 'get_'.$sKey;
     	                $mValue = $oCompleteEntity->$sMethodNameInEntity();
@@ -340,8 +330,7 @@ 
     	                if ($sValue instanceof \Venus\lib\Form\Radio && method_exists($this->_aElement[$sExKey], 'setValueChecked')) {
     	
     	                    $this->_aElement[$sExKey]->setValueChecked($mValue);
-    	                }
-    	                else if (isset($mValue) && method_exists($this->_aElement[$sKey], 'setValue')) {
+    	                } else if (isset($mValue) && method_exists($this->_aElement[$sKey], 'setValue')) {
     	
     	                    $this->_aElement[$sKey]->setValue($mValue);
     	                }
@@ -359,8 +348,7 @@ 
 	        if ($sValue instanceof Container) {
 	        
 	            $oForm->form[$sKey] = $sValue;
-	        }
-	        else {
+	        } else {
 	            
 	            $oForm->form[$sKey] = $sValue->fetch();
 	        }

bundles/lib/Upload.php

Braces +2 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
 
 		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;}
+		if ($this->_sName) { $sName = $sPath.$this->_sName.'.'.$this->_sExtension; } else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension;}
 
 		if ($this->_bProportion == true && ($this->_iWidth || $this->_iHeight)) {
 
@@ -129,8 +128,7 @@ 
 			imagecopyresampled($rNewImgTrueColor , $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
 
 			imagejpeg($rNewImgTrueColor , $sName, 100);
-		}
-		else {
+		} else {
 
 			$bResultat = move_uploaded_file($_FILES[$sFile]['tmp_name'], $sName);