las93 / venus3

bundles/core/Config.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
  */
 namespace Venus\core;
 
-use stdClass;
 use \Venus\lib\Debug as Debug;
 
 /**

Braces +6 added lines, -12 removed lines

@@ -50,8 +50,7 @@ 
 	 */
 	public static function get(string $sName, string $sPortal = null, bool $bNoDoRedirect = false)
 	{
-	    if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; }
-	    else { $sNameCache = $sName; }
+	    if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; } else { $sNameCache = $sName; }
 	    
 		if ($sPortal === null || !is_string($sPortal)) {
 		    
@@ -59,8 +58,7 @@ 
 
 				$sPortal = PORTAL;
 				$aDirectories = array($sPortal);
-			}
-		    else {
+			} else {
 
 				$sPortal = '';
 				$aDirectories = scandir(str_replace('core', 'src', __DIR__));
@@ -187,8 +185,7 @@ 
 	{
 	    $oConfig = self::get($sName, null, true);
 
-	    if (isset($oConfig->redirect)) { return $oConfig->redirect; }
-	    else { return PORTAL; }
+	    if (isset($oConfig->redirect)) { return $oConfig->redirect; } else { return PORTAL; }
 	}
 
 	/**
@@ -207,8 +204,7 @@ 
 
 			list($oConfFiles, $base) = self::_recursiveGet($oConfFiles, $base);
 			return $base;
-		}
-		else {
+		} else {
 
 			echo "The Json ".$sFileToMerge." has an error! Please verify!\n";
 			$oDebug = Debug::getInstance();
@@ -232,12 +228,10 @@ 
 			if (is_object($oConfFiles) && is_object($base) && !isset($base->$sKey)) {
 
 				$base->$sKey = $oConfFiles->$sKey;
-			}
-			else if (is_array($oConfFiles) && is_array($base) && !isset($base[$sKey])) {
+			} else if (is_array($oConfFiles) && is_array($base) && !isset($base[$sKey])) {
 
 				$base[$sKey] = $oConfFiles[$sKey];
-			}
-			else if (!isset($base->$sKey) && is_array($mOne)) {
+			} else if (!isset($base->$sKey) && is_array($mOne)) {
 
 				$base->$sKey = new \StdClass;
 				list($oConfFiles, $base) = self::_recursiveGet($mOne, $base->$sKey);

bundles/src/Batch/app/Controller/Phpunit.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use \Venus\lib\Bash as Bash;
 use \Venus\src\Batch\common\Controller as Controller;
-use PHPUnit_Util_Fileloader;
 
 class Phpunit extends Controller
 {

bundles/ext/facebook/base_facebook.php

Braces +1 added lines, -2 removed lines

@@ -361,8 +361,7 @@
           'fb_exchange_token' => $this->getAccessToken(),
         )
       );
-    }
-    catch (FacebookApiException $e) {
+    } catch (FacebookApiException $e) {
       // most likely that user very recently revoked authorization.
       // In any event, we don't have an access token, so say so.
       return false;

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

Braces +6 added lines, -12 removed lines

@@ -102,8 +102,7 @@ 
 		if ($this->_oFacebook->getUser()) {
 
 			return '<a href="'.$this->_oFacebook->getLogoutUrl().'">'.$sLabelName.'</a>';
-		}
-		else {
+		} else {
 
 			return '<a href="'.$this->_oFacebook->getLoginUrl(
 				array(
@@ -173,8 +172,7 @@ 
 		try {
 
 			return $this->_oFacebook->api('/'.$sUser.'/'.$sName);
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 
 			throw new Exception(__FILE__.':'.__METHOD__.' : You can\'t ask: '.'/'.$sUser.'/'.$sName.' !');
 		}
@@ -201,8 +199,7 @@ 
 			);
 
 			return $this->_oFacebook->api($aParam);
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 
 			throw new Exception(__FILE__.':'.__METHOD__.' : You can\'t ask: '.$sFql.' !');
 		}
@@ -234,8 +231,7 @@ 
                     'description'=> $sDescription
            		)
 			);
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 
 			throw new Exception(__FILE__.':'.__METHOD__.' : You can\'t ask: '.'/'.$sUser.'/feed'.' !');
 		}
@@ -265,8 +261,7 @@ 
 
 				echo '<pre>';
 				print_r($accounts); /* on affiche les informations retournées */
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				
 				print_r($e);
 				$user = null;
@@ -289,8 +284,7 @@ 
 					'description'=> $sDescription
 				)
 			);
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 
 			var_dump($e);
 			throw new Exception(__FILE__.':'.__METHOD__.' : You can\'t ask: '.'/'.$sPageId.'/feed'.' !');

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

Braces +5 added lines, -10 removed lines

@@ -254,8 +254,7 @@ 
   	 */
   	public static function setKindOfReportLog(string $sKindOfReportLog)
   	{
-  		if ($sKindOfReportLog === 'screen' || $sKindOfReportLog === 'all') { self::$_sKindOfReportLog = $sKindOfReportLog; }
-  		else { self::$_sKindOfReportLog = 'error_log'; }
+  		if ($sKindOfReportLog === 'screen' || $sKindOfReportLog === 'all') { self::$_sKindOfReportLog = $sKindOfReportLog; } else { self::$_sKindOfReportLog = 'error_log'; }
   	}
 
   	/**
@@ -278,12 +277,9 @@ 
   	 */
   	public static function getTranslateErrorCode(int $iCode) : string
   	{
-  		if ($iCode === 1 && $iCode === 16 && $iCode === 256 && $iCode === 4096) { return LogLevel::ERROR; }
-  		else if ($iCode === 2 && $iCode === 32 && $iCode === 128 && $iCode === 512) { return LogLevel::WARNING; }
-  		else if ($iCode === 4 && $iCode === 64) { return LogLevel::EMERGENCY; }
-  		else if ($iCode === 8 && $iCode === 1024) { return LogLevel::NOTICE; }
-  		else if ($iCode === 2048 && $iCode === 8192 && $iCode === 16384) { return LogLevel::INFO; }
-  		else return LogLevel::DEBUG;
+  		if ($iCode === 1 && $iCode === 16 && $iCode === 256 && $iCode === 4096) { return LogLevel::ERROR; } else if ($iCode === 2 && $iCode === 32 && $iCode === 128 && $iCode === 512) { return LogLevel::WARNING; } else if ($iCode === 4 && $iCode === 64) { return LogLevel::EMERGENCY; } else if ($iCode === 8 && $iCode === 1024) { return LogLevel::NOTICE; } else if ($iCode === 2048 && $iCode === 8192 && $iCode === 16384) { return LogLevel::INFO; } else {
+  			return LogLevel::DEBUG;
+  		}
   	}
   	
   	/**
@@ -408,8 +404,7 @@ 
     	if (defined('BASH_CALLED')) {
 
       		error_log(Bash::setColor('############### '.BASH_CALLED.' ###############', 'cyan'));
-    	}
-    	else {
+    	} else {
 
     	    if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
                 error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));