las93 / venus3

bundles/lib/Request.php

Doc Comments +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 	 * if the request is ajax
 	 *
 	 * @access public
-	 * @param  string $sName name of the template
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public static function isXmlHttpRequest()
 	{

Braces +9 added lines, -21 removed lines

@@ -69,8 +69,7 @@ 
 			if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
 
 				return true;
-			}
-			else {
+			} else {
 
 				return false;
 			}
@@ -85,8 +84,7 @@ 
 	 */
 	public static function isHttpRequest()
 	{
-		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) { return true; }
-		else { return false; }
+		if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) { return true; } else { return false; }
 	}
 
 	/**
@@ -97,8 +95,7 @@ 
 	 */
 	public static function isHttpsRequest()
 	{
-		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') { return true; }
-		else { return false; }
+		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') { return true; } else { return false; }
 	}
 
 	/**
@@ -111,8 +108,7 @@ 
 	{
 		$sSapiType = php_sapi_name();
 
-		if (substr($sSapiType, 0, 3) == 'cgi' || defined('STDIN')) { return true; }
-		else { return false; }
+		if (substr($sSapiType, 0, 3) == 'cgi' || defined('STDIN')) { return true; } else { return false; }
 	}
 
 	/**
@@ -137,8 +133,7 @@ 
 	 */
 	public static function getParameters()
 	{
-		if (isset($_GET)) { return $_GET; }
-		else { return array(); }
+		if (isset($_GET)) { return $_GET; } else { return array(); }
 	}
 
 	/**
@@ -149,8 +144,7 @@ 
 	 */
 	public static function getPostParameters()
 	{
-		if (isset($_POST)) { return $_POST; }
-		else { return array(); }
+		if (isset($_POST)) { return $_POST; } else { return array(); }
 	}
 
 	/**
@@ -161,8 +155,7 @@ 
 	 */
 	public function isPost()
 	{
-		if (isset($_POST) && count($_POST) > 0) { return true; }
-		else { return false; }
+		if (isset($_POST) && count($_POST) > 0) { return true; } else { return false; }
 	}
 
 	/**
@@ -214,11 +207,7 @@ 
 	 */
 	public static function setStatus($iCode)
 	{
-		if ($iCode === 200) { header('HTTP/1.1 200 Ok');  }
-		else if ($iCode === 201) { header('HTTP/1.1 201 Created');  }
-		else if ($iCode === 204) { header("HTTP/1.0 204 No Content");  }
-		else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); }
-		else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
+		if ($iCode === 200) { header('HTTP/1.1 200 Ok');  } else if ($iCode === 201) { header('HTTP/1.1 201 Created');  } else if ($iCode === 204) { header("HTTP/1.0 204 No Content");  } else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); } else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
 	}
 
     /**
@@ -236,8 +225,7 @@ 
      */
     public function getLanguages() : array
     {
-        if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); }
-        else { return array(); }
+        if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); } else { return array(); }
     }
 
 	/**

bundles/lib/Upload.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	 *
 	 * @access public
 	 * @param  string $sFile
-	 * @return bool|object
+	 * @return null|boolean
 	 */
 	public function upload(string $sFile)
 	{

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

bundles/tests/Demo/app/Controller/Exemple1Test.php

Braces +2 added lines, -4 removed lines

@@ -56,12 +56,10 @@
             if ($content) {
 
                 $this->assertTrue(true);
-            }
-            else {
+            } else {
                 $this->assertTrue(false);
             }
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             $this->assertTrue(false);
         }
 

bundles/lib/Ldap.php

Braces +1 added lines, -2 removed lines

@@ -113,8 +113,7 @@
 	 */
 	public function unbind() : bool
 	{
-	    if ($this->_bConnected) { return $this->_bConnected = ldap_unbind($this->_rConnect); }
-	    else { return true; }
+	    if ($this->_bConnected) { return $this->_bConnected = ldap_unbind($this->_rConnect); } else { return true; }
 	}
 
 	/**

bundles/lib/Image.php

Braces +2 added lines, -4 removed lines

@@ -57,8 +57,7 @@ 
         if ($bKeepDimension === false) {
         
             imagecopyresampled($rNewImage, $rActualImage, 0, 0, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
-        }
-        else {
+        } else {
         
             if ($aSize[0] > $aSize[1]) {
 
@@ -68,8 +67,7 @@ 
                 $iHeight = round($iWidth * $fCoef);
                 $iDestY = round(($iWidth - $iHeight) / 2);
                 $iDestX = 0;
-            }
-            else {
+            } else {
 
                 $rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
                 imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);

bundles/lib/Cache.php

Braces +7 added lines, -17 removed lines

@@ -60,11 +60,7 @@ 
 	 */
 	public static function setCacheType(string $sCacheName)
 	{
-		if ($sCacheName === 'file') { self::$_sTypeOfCache = 'file'; }
-		else if ($sCacheName === 'memcache') { self::$_sTypeOfCache = 'memcache'; }
-		else if ($sCacheName === 'apc') { self::$_sTypeOfCache = 'apc'; }
-		else if ($sCacheName === 'redis') { self::$_sTypeOfCache = 'redis'; }
-		else { self::$_sTypeOfCache = 'mock'; }
+		if ($sCacheName === 'file') { self::$_sTypeOfCache = 'file'; } else if ($sCacheName === 'memcache') { self::$_sTypeOfCache = 'memcache'; } else if ($sCacheName === 'apc') { self::$_sTypeOfCache = 'apc'; } else if ($sCacheName === 'redis') { self::$_sTypeOfCache = 'redis'; } else { self::$_sTypeOfCache = 'mock'; }
 	}
 
 	/**
@@ -132,31 +128,26 @@ 
 			if (!isset(self::$_aCache['file'])) { self::$_aCache['file'] = new CacheFile; }
 
 			return self::$_aCache['file'];
-		}
-		else if (self::$_sTypeOfCache === 'memcache') {
+		} else if (self::$_sTypeOfCache === 'memcache') {
   		  
 			if (!isset(self::$_aCache['memcache'])) { 
 			    
 			    $oDbConf = Config::get('Memcache')->configuration;
 			    
-			    if (isset($oDbConf->port)) { $sPort = $oDbConf->port; }
-			    else { $sPort = null; }
+			    if (isset($oDbConf->port)) { $sPort = $oDbConf->port; } else { $sPort = null; }
 			    
-			    if (isset($oDbConf->timeout)) { $iTimeout = $oDbConf->timeout; }
-			    else { $iTimeout = null; }
+			    if (isset($oDbConf->timeout)) { $iTimeout = $oDbConf->timeout; } else { $iTimeout = null; }
 			    
 			    self::$_aCache['memcache'] = new CacheMemcache($oDbConf->host, $sPort, $iTimeout); 
 			}
 
 			return self::$_aCache['memcache'];
-		}
-		else if (self::$_sTypeOfCache === 'apc') {
+		} else if (self::$_sTypeOfCache === 'apc') {
 
 			if (!isset(self::$_aCache['apc'])) { self::$_aCache['apc'] = new Apc; }
 
 			return self::$_aCache['apc'];
-		}
-		else if (self::$_sTypeOfCache === 'redis') {
+		} else if (self::$_sTypeOfCache === 'redis') {
 		    
 			if (!isset(self::$_aCache['redis'])) {
 			    
@@ -165,8 +156,7 @@ 
 			}
 
 			return self::$_aCache['redis'];
-		}
-		else if (self::$_sTypeOfCache === 'mock') {
+		} else if (self::$_sTypeOfCache === 'mock') {
 		    
 			if (!isset(self::$_aCache['mock'])) { self::$_aCache['mock'] = new Mock; }
 

bundles/lib/Response.php

Braces +1 added lines, -3 removed lines

@@ -227,9 +227,7 @@
 	 */
 	public function translate($mContent)
 	{
-		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); }
-		else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); }
-		else { return Json::translate($mContent); }
+		if (self::$_sKindOfReturn === 'yaml') { return Yaml::translate($mContent); } else if (self::$_sKindOfReturn === 'mock') { return Mock::translate($mContent); } else { return Json::translate($mContent); }
 	}
 
 	/**

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