las93 / venus3

bundles/ext/facebook/base_facebook.php

Spacing +16 added lines, -16 removed lines

@@ -98,11 +98,11 @@ 
    * @return string The string representation of the error
    */
   public function __toString() {
-    $str = $this->getType() . ': ';
+    $str = $this->getType().': ';
     if ($this->code != 0) {
-      $str .= $this->code . ': ';
+      $str .= $this->code.': ';
     }
-    return $str . $this->message;
+    return $str.$this->message;
   }
 }
 
@@ -530,7 +530,7 @@ 
       if (array_key_exists('user_id', $signed_request)) {
         $user = $signed_request['user_id'];
 
-        if($user != $this->getPersistentData('user_id')){
+        if ($user != $this->getPersistentData('user_id')) {
           $this->clearAllPersistentData();
         }
 
@@ -576,7 +576,7 @@ 
    * @param array $params Provide custom parameters
    * @return string The URL for the login flow
    */
-  public function getLoginUrl($params=array()) {
+  public function getLoginUrl($params = array()) {
     $this->establishCSRFTokenState();
     $currentUrl = $this->getCurrentUrl();
 
@@ -605,7 +605,7 @@ 
    * @param array $params Provide custom parameters
    * @return string The URL for the logout flow
    */
-  public function getLogoutUrl($params=array()) {
+  public function getLogoutUrl($params = array()) {
     return $this->getUrl(
       'www',
       'logout.php',
@@ -627,7 +627,7 @@ 
    * @param array $params Provide custom parameters
    * @return string The URL for the logout flow
    */
-  public function getLoginStatusUrl($params=array()) {
+  public function getLoginStatusUrl($params = array()) {
     return $this->getUrl(
       'www',
       'extern/login_status.php',
@@ -937,7 +937,7 @@ 
    *
    * @return string The response text
    */
-  protected function makeRequest($url, $params, $ch=null) {
+  protected function makeRequest($url, $params, $ch = null) {
     if (!$ch) {
       $ch = curl_init();
     }
@@ -967,7 +967,7 @@ 
       self::errorLog('Invalid or no certificate authority found, '.
                      'using bundled information');
       curl_setopt($ch, CURLOPT_CAINFO,
-                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
+                  dirname(__FILE__).'/fb_ca_chain_bundle.crt');
       $result = curl_exec($ch);
     }
 
@@ -1020,7 +1020,7 @@ 
 
     if (strtoupper($data['algorithm']) !== self::SIGNED_REQUEST_ALGORITHM) {
       self::errorLog(
-        'Unknown algorithm. Expected ' . self::SIGNED_REQUEST_ALGORITHM);
+        'Unknown algorithm. Expected '.self::SIGNED_REQUEST_ALGORITHM);
       return null;
     }
 
@@ -1044,7 +1044,7 @@ 
   protected function makeSignedRequest($data) {
     if (!is_array($data)) {
       throw new InvalidArgumentException(
-        'makeSignedRequest expects an array. Got: ' . print_r($data, true));
+        'makeSignedRequest expects an array. Got: '.print_r($data, true));
     }
     $data['algorithm'] = self::SIGNED_REQUEST_ALGORITHM;
     $data['issued_at'] = time();
@@ -1141,7 +1141,7 @@ 
    *
    * @return string The URL for the given parameters
    */
-  protected function getUrl($name, $path='', $params=array()) {
+  protected function getUrl($name, $path = '', $params = array()) {
     $url = self::$DOMAIN_MAP[$name];
     if ($path) {
       if ($path[0] === '/') {
@@ -1150,7 +1150,7 @@ 
       $url .= $path;
     }
     if ($params) {
-      $url .= '?' . http_build_query($params, null, '&');
+      $url .= '?'.http_build_query($params, null, '&');
     }
 
     return $url;
@@ -1206,7 +1206,7 @@ 
    * @return string The current URL
    */
   protected function getCurrentUrl() {
-    $protocol = $this->getHttpProtocol() . '://';
+    $protocol = $this->getHttpProtocol().'://';
     $host = $this->getHttpHost();
     $currentUrl = $protocol.$host.$_SERVER['REQUEST_URI'];
     $parts = parse_url($currentUrl);
@@ -1232,10 +1232,10 @@ 
       isset($parts['port']) &&
       (($protocol === 'http://' && $parts['port'] !== 80) ||
        ($protocol === 'https://' && $parts['port'] !== 443))
-      ? ':' . $parts['port'] : '';
+      ? ':'.$parts['port'] : '';
 
     // rebuild
-    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+    return $protocol.$parts['host'].$port.$parts['path'].$query;
   }
 
   /**

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/ext/facebook/facebook.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
   }
 
   protected function getSharedSessionCookieName() {
-    return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
+    return self::FBSS_COOKIE_NAME.'_'.$this->getAppId();
   }
 
   protected function constructSessionVariableName($key) {

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

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
                 $this->assertTrue(false);
             }
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             $this->assertTrue(false);
         }
 

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

Spacing +3 added lines, -3 removed lines

@@ -79,11 +79,11 @@ 
 	 */
     public function getGroups() : array
     {
-        $rSearch = ldap_search( $this->_rConnect , $this->_sBase , "objectclass=group" , array("cn") );
+        $rSearch = ldap_search($this->_rConnect, $this->_sBase, "objectclass=group", array("cn"));
         $aEntries = ldap_get_entries($this->_rConnect, $rSearch);
         $aGroups = array();
 
-        for ( $i = 0 ; $i < $aEntries["count"] ; $i++ ) {
+        for ($i = 0; $i < $aEntries["count"]; $i++) {
             
             $aGroups[] = utf8_encode($aEntries[$i]["dn"]);
         }
@@ -191,7 +191,7 @@ 
 		    
 			$aResultSet[$i] = array_intersect_key($aEntries[$i], $aMask);
 
-			foreach($aResultSet[$i] as &$aValues) {
+			foreach ($aResultSet[$i] as &$aValues) {
 			    
 				unset($aValues['count']);
 			}

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

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	    $ImageChoisie = imagecreatefromjpeg($_FILES['ImageNews']['tmp_name']);
         $TailleImageChoisie = getimagesize($_FILES['ImageNews']['tmp_name']);
 
-        $rNewImage = imagecreatetruecolor($iWidth , $iHeight);
+        $rNewImage = imagecreatetruecolor($iWidth, $iHeight);
 
         if ($bKeepDimension === false) {
         
@@ -89,6 +89,6 @@ 
         $NomImageExploitable = time();
       
         header('Content-Type: image/jpeg');
-        imagejpeg($rNewImage , null, 100);
+        imagejpeg($rNewImage, null, 100);
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	 * @param  int $iTimeout expiration of cache
 	 * @return bool
 	 */
-	public static function get(string $sName, int &$iFlags = null, int $iTimeout = 0) : bool
+	public static function get(string $sName, int&$iFlags = null, int $iTimeout = 0) : bool
 	{
 		return self::_getCacheObject()->get($sName, $iFlags, $iTimeout);
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 	    $aJavascript = func_get_args();
 	    $aReturns = array();
 	    
-	    foreach($aJavascript as $aJsCombination) {
+	    foreach ($aJavascript as $aJsCombination) {
 	        
 	        $sJsPath = $sDefaultPath;
 	        
@@ -79,7 +79,7 @@ 
 	    $aCss = func_get_args();
 	    $aReturns = array();
 	    
-	    foreach($aCss as $aCssCombination) {
+	    foreach ($aCss as $aCssCombination) {
 	        
 	        $sCssPath = $sDefaultPath;
 	        

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

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
 
     	error_reporting($iLevel);
 
-    	set_error_handler(function ($iErrNo, $sErrStr, $sErrFile, $iErrLine)
+    	set_error_handler(function($iErrNo, $sErrStr, $sErrFile, $iErrLine)
     	{    
 			$aContext = array('file' => $sErrFile, 'line' => $iErrLine);
 			
@@ -216,7 +216,7 @@ 
   		self::_initLogFile();
   		self::$_bActivateException = true;
 
-  		set_exception_handler(function (\Exception $oException)
+  		set_exception_handler(function(\Exception $oException)
   		{
 			$aContext = array('file' => $oException->getFile(), 'line' => $oException->getLine());
 			self::getInstance()->critical($oException->getMessage(), $aContext);
@@ -412,7 +412,7 @@ 
     	else {
 
     	    if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
-                error_log(Bash::setColor('############### ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . ' ###############', 'cyan'));
+                error_log(Bash::setColor('############### '.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].' ###############', 'cyan'));
             }
     	}
   	}

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