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()
 	{

Indentation +40 added lines, -40 removed lines

@@ -47,11 +47,11 @@ 
 	 */
 	public function __construct()
 	{
-        $this->cookies = function() { return new Cookies(); };
-        $this->files = function() { return new Files(); };
-        $this->headers = function() { return new Headers(); };
-        $this->query = function() { return new Query(); };
-        $this->request = function() { return new RequestPost(); };
+		$this->cookies = function() { return new Cookies(); };
+		$this->files = function() { return new Files(); };
+		$this->headers = function() { return new Headers(); };
+		$this->query = function() { return new Query(); };
+		$this->request = function() { return new RequestPost(); };
 		$this->server = function() { return new Server(); };
 	}
 
@@ -120,13 +120,13 @@ 
 	 *
 	 * @access public
 	 * @return bool
-     * @deprecated  don't use this method because they return a false result
-     *              delete in the version 5
-     * @throws \Exception
+	 * @deprecated  don't use this method because they return a false result
+	 *              delete in the version 5
+	 * @throws \Exception
 	 */
 	public static function getPreferredLanguage()
 	{
-        throw new \Exception("Use getLanguages() method now!");
+		throw new \Exception("Use getLanguages() method now!");
 	}
 
 	/**
@@ -171,8 +171,8 @@ 
 	 * @access public
 	 * @param  string $name
 	 * @return mixed
-     * @deprecated  please use $this->request->get()
-     *              delete in the version 5
+	 * @deprecated  please use $this->request->get()
+	 *              delete in the version 5
 	 */
 	public function getPost(string $name)
 	{
@@ -187,22 +187,22 @@ 
 	 */
 	public static function getPut() 
 	{	    
-	    $aPut = array();
+		$aPut = array();
 	    
-	    $rPutResource = fopen("php://input", "r");
+		$rPutResource = fopen("php://input", "r");
 	    
-	    while ($sData = fread($rPutResource, 1024)) {
+		while ($sData = fread($rPutResource, 1024)) {
 
-	        $aSeparatePut = explode('&', $sData);
+			$aSeparatePut = explode('&', $sData);
 	        
-	        foreach($aSeparatePut as $sOne) {
+			foreach($aSeparatePut as $sOne) {
 	            
-	            $aOnePut = explode('=', $sOne);
-	            $aPut[$aOnePut[0]] = $aOnePut[1];
-	        }
-	    }
+				$aOnePut = explode('=', $sOne);
+				$aPut[$aOnePut[0]] = $aOnePut[1];
+			}
+		}
 	    
-	    return $aPut;
+		return $aPut;
 	}
 
 	/**
@@ -221,29 +221,29 @@ 
 		else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); }
 	}
 
-    /**
-     * get http method
-     * @return string
-     */
-    public function getMethod() : string
-    {
-        return $this->server->get('REQUEST_METHOD');
-    }
-
-    /**
-     * return languages accepted by the customer
-     * @return array
-     */
-    public function getLanguages() : array
-    {
-        if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); }
-        else { return array(); }
-    }
+	/**
+	 * get http method
+	 * @return string
+	 */
+	public function getMethod() : string
+	{
+		return $this->server->get('REQUEST_METHOD');
+	}
+
+	/**
+	 * return languages accepted by the customer
+	 * @return array
+	 */
+	public function getLanguages() : array
+	{
+		if (!self::isCliRequest()) { return explode(',', preg_replace('/^([^;]);?.*$/', '$1', $_SERVER['HTTP_ACCEPT_LANGUAGE'])); }
+		else { return array(); }
+	}
 
 	/**
 	 * get path info
 	 * @return string
-     */
+	 */
 	public function getPathInfo() : string
 	{
 		return $this->server->get('REQUEST_URI');

Spacing +4 added lines, -4 removed lines

@@ -195,7 +195,7 @@ 
 
 	        $aSeparatePut = explode('&', $sData);
 	        
-	        foreach($aSeparatePut as $sOne) {
+	        foreach ($aSeparatePut as $sOne) {
 	            
 	            $aOnePut = explode('=', $sOne);
 	            $aPut[$aOnePut[0]] = $aOnePut[1];
@@ -214,9 +214,9 @@ 
 	 */
 	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");  }
+		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'); }
 	}

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

Indentation +4 added lines, -4 removed lines

@@ -118,10 +118,10 @@
 			$aImageSizes = getimagesize($_FILES[$sFile]['tmp_name']);
 
 			$fRatio = min($aImageSizes[0] / $this->_iWidth, $aImageSizes[1] / $this->_iHeight);
-    		$iHeight =  $aImageSizes[1] / $fRatio;
-    		$iWidth =  $aImageSizes[0] / $fRatio;
-    		$fY = ($iHeight - $this->_iHeight) / 2 * $fRatio;
-    		$fX = ($iWidth - $this->_iWidth) / 2 * $fRatio;
+			$iHeight =  $aImageSizes[1] / $fRatio;
+			$iWidth =  $aImageSizes[0] / $fRatio;
+			$fY = ($iHeight - $this->_iHeight) / 2 * $fRatio;
+			$fX = ($iWidth - $this->_iWidth) / 2 * $fRatio;
 
 			$rNewImage = imagecreatefromjpeg($_FILES[$sFile]['tmp_name']);
 

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
 
 		$sExtension = strtolower(substr(strrchr($_FILES[$sFile]['name'], '.'), 1));
 
-		if (count($this->_aAllowExtension) > 0 && !in_array($sExtension ,$this->_aAllowExtension)) {
+		if (count($this->_aAllowExtension) > 0 && !in_array($sExtension, $this->_aAllowExtension)) {
 
 			$this->_sError = "The extension is not good";
 			return false;
@@ -111,24 +111,24 @@ 
 		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;}
+		else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension; }
 
 		if ($this->_bProportion == true && ($this->_iWidth || $this->_iHeight)) {
 
 			$aImageSizes = getimagesize($_FILES[$sFile]['tmp_name']);
 
 			$fRatio = min($aImageSizes[0] / $this->_iWidth, $aImageSizes[1] / $this->_iHeight);
-    		$iHeight =  $aImageSizes[1] / $fRatio;
-    		$iWidth =  $aImageSizes[0] / $fRatio;
+    		$iHeight = $aImageSizes[1] / $fRatio;
+    		$iWidth = $aImageSizes[0] / $fRatio;
     		$fY = ($iHeight - $this->_iHeight) / 2 * $fRatio;
     		$fX = ($iWidth - $this->_iWidth) / 2 * $fRatio;
 
 			$rNewImage = imagecreatefromjpeg($_FILES[$sFile]['tmp_name']);
 
-			$rNewImgTrueColor = imagecreatetruecolor($this->_iWidth , $this->_iHeight);
-			imagecopyresampled($rNewImgTrueColor , $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
+			$rNewImgTrueColor = imagecreatetruecolor($this->_iWidth, $this->_iHeight);
+			imagecopyresampled($rNewImgTrueColor, $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2);
 
-			imagejpeg($rNewImgTrueColor , $sName, 100);
+			imagejpeg($rNewImgTrueColor, $sName, 100);
 		}
 		else {
 

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

Indentation +18 added lines, -18 removed lines

@@ -39,31 +39,31 @@
 	 *
 	 * @access public
 	 * @return void
-     * @test
+	 * @test
 	 */
 
 	public function testShow()
-    {
-	    try {
+	{
+		try {
 
-            ob_start();
-            $exemple1 = new Exemple1;
-            $exemple1->show();
-            $content = ob_get_clean();
+			ob_start();
+			$exemple1 = new Exemple1;
+			$exemple1->show();
+			$content = ob_get_clean();
 
-            //var_dump(debug_backtrace());
+			//var_dump(debug_backtrace());
 
-            if ($content) {
+			if ($content) {
 
-                $this->assertTrue(true);
-            }
-            else {
-                $this->assertTrue(false);
-            }
-        }
-        catch(\Exception $e) {
-            $this->assertTrue(false);
-        }
+				$this->assertTrue(true);
+			}
+			else {
+				$this->assertTrue(false);
+			}
+		}
+		catch(\Exception $e) {
+			$this->assertTrue(false);
+		}
 
 	}
 }
\ No newline at end of file

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

Indentation +29 added lines, -29 removed lines

@@ -30,12 +30,12 @@ 
  */
 class Ldap
 {
-    /**
-     * connection at ldap server
-     * 
-     * @access private
-     * @var    resource
-     */
+	/**
+	 * connection at ldap server
+	 * 
+	 * @access private
+	 * @var    resource
+	 */
 	private $_rConnect;
 	
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	public function __construct()
 	{
-	    $oDbConf = Config::get('Ldap')->configuration;
+		$oDbConf = Config::get('Ldap')->configuration;
 
 		$this->_sBase = $oDbConf->base;
 
@@ -77,28 +77,28 @@ 
 	 * @access public
 	 * @return array
 	 */
-    public function getGroups() : array
-    {
-        $rSearch = ldap_search( $this->_rConnect , $this->_sBase , "objectclass=group" , array("cn") );
-        $aEntries = ldap_get_entries($this->_rConnect, $rSearch);
-        $aGroups = array();
+	public function getGroups() : array
+	{
+		$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"]);
-        }
-
-        return $aGroups;
-    }
-
-    /**
-     * Authentification in Ldap
-     * 
-     * @access public
-     * @param  string $sUser
-     * @param  string $sPassword
-     * @return \Venus\lib\Ldap
-     */
+			$aGroups[] = utf8_encode($aEntries[$i]["dn"]);
+		}
+
+		return $aGroups;
+	}
+
+	/**
+	 * Authentification in Ldap
+	 * 
+	 * @access public
+	 * @param  string $sUser
+	 * @param  string $sPassword
+	 * @return \Venus\lib\Ldap
+	 */
 	public function bind($sUser, $sPassword) : Ldap
 	{
 		return $this->_bConnected = ldap_bind($this->_rConnect, $sUser, $sPassword);
@@ -113,8 +113,8 @@ 
 	 */
 	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; }
 	}
 
 	/**

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

Indentation +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
   	public function set(string $sName, $mValue, int $iExpire = 0, string $sPath = '', string $sDomain = '', int $iSecure = false) : Cookie
 	{
   		$iExpire = time() + $iExpire;
-    	setcookie($sName, $mValue, $iExpire, $sPath, $sDomain, $iSecure);
-    	return $this;
+		setcookie($sName, $mValue, $iExpire, $sPath, $sDomain, $iSecure);
+		return $this;
   	}
 
   	/**
@@ -52,7 +52,7 @@ 
   	 */
   	public function get(string $sName)
 	{
-    	return $_COOKIE[$sName];
+		return $_COOKIE[$sName];
   	}
 
   	/**
@@ -64,6 +64,6 @@ 
   	 */
   	public function exists(string $sName) : bool
 	{
-    	return isset($_COOKIE[$sName]);
+		return isset($_COOKIE[$sName]);
   	}
 }

bundles/lib/Response/ResponseInterface.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  */
 interface ResponseInterface
 {
-    /**
+	/**
 	 * translate the content
 	 *
 	 * @access public

bundles/lib/Image.php

Indentation +44 added lines, -44 removed lines

@@ -34,61 +34,61 @@
 	 */	
 	private $_sLanguage = LANGUAGE;
 
-    /**
-     * set the language if you don't want take the default language of the configuration file
-     *
-     * @access public
-     * @param int $iImageUri
-     * @param  int $iWidth
-     * @param  int $iHeight
-     * @param bool $bKeepDimension
-     * @return void
-     */
+	/**
+	 * set the language if you don't want take the default language of the configuration file
+	 *
+	 * @access public
+	 * @param int $iImageUri
+	 * @param  int $iWidth
+	 * @param  int $iHeight
+	 * @param bool $bKeepDimension
+	 * @return void
+	 */
 	public static function showImageInSize(int $iImageUri, int $iWidth, int $iHeight, bool $bKeepDimension = false)
 	{	
-	    $aSize = getimagesize($iImageUri);
-	    $rActualImage = imagecreatefromjpeg($iImageUri);
+		$aSize = getimagesize($iImageUri);
+		$rActualImage = imagecreatefromjpeg($iImageUri);
 	    
-	    $ImageChoisie = imagecreatefromjpeg($_FILES['ImageNews']['tmp_name']);
-        $TailleImageChoisie = getimagesize($_FILES['ImageNews']['tmp_name']);
+		$ImageChoisie = imagecreatefromjpeg($_FILES['ImageNews']['tmp_name']);
+		$TailleImageChoisie = getimagesize($_FILES['ImageNews']['tmp_name']);
 
-        $rNewImage = imagecreatetruecolor($iWidth , $iHeight);
+		$rNewImage = imagecreatetruecolor($iWidth , $iHeight);
 
-        if ($bKeepDimension === false) {
+		if ($bKeepDimension === false) {
         
-            imagecopyresampled($rNewImage, $rActualImage, 0, 0, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
-        }
-        else {
+			imagecopyresampled($rNewImage, $rActualImage, 0, 0, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
+		}
+		else {
         
-            if ($aSize[0] > $aSize[1]) {
+			if ($aSize[0] > $aSize[1]) {
 
-                $rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
-                imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
-                $fCoef = $aSize[1] / $aSize[0];
-                $iHeight = round($iWidth * $fCoef);
-                $iDestY = round(($iWidth - $iHeight) / 2);
-                $iDestX = 0;
-            }
-            else {
+				$rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
+				imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
+				$fCoef = $aSize[1] / $aSize[0];
+				$iHeight = round($iWidth * $fCoef);
+				$iDestY = round(($iWidth - $iHeight) / 2);
+				$iDestX = 0;
+			}
+			else {
 
-                $rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
-                imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
-                $fCoef = $aSize[0] / $aSize[1];
-                $iWidth = round($iHeight * $fCoef);
-                $iDestX = round(($iHeight - $iWidth) / 2);
-                $iDestY = 0;
-            }
+				$rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
+				imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
+				$fCoef = $aSize[0] / $aSize[1];
+				$iWidth = round($iHeight * $fCoef);
+				$iDestX = round(($iHeight - $iWidth) / 2);
+				$iDestY = 0;
+			}
             
-            $rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
-            imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
-            imagecopyresampled($rNewImage, $rActualImage, $iDestX, $iDestY, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
-        }
+			$rWhite = imagecolorallocate($rNewImage, 255, 255, 255);
+			imagefilledrectangle($rNewImage, 0, 0, $iWidth, $iHeight, $rWhite);
+			imagecopyresampled($rNewImage, $rActualImage, $iDestX, $iDestY, 0, 0, $iWidth, $iHeight, $aSize[0], $aSize[1]);
+		}
         
-        imagedestroy($rActualImage);
-        $NomImageChoisie = explode('.', $rNewImage);
-        $NomImageExploitable = time();
+		imagedestroy($rActualImage);
+		$NomImageChoisie = explode('.', $rNewImage);
+		$NomImageExploitable = time();
       
-        header('Content-Type: image/jpeg');
-        imagejpeg($rNewImage , null, 100);
+		header('Content-Type: image/jpeg');
+		imagejpeg($rNewImage , null, 100);
 	}
 }

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

Indentation +8 added lines, -8 removed lines

@@ -137,15 +137,15 @@ 
   		  
 			if (!isset(self::$_aCache['memcache'])) { 
 			    
-			    $oDbConf = Config::get('Memcache')->configuration;
+				$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); 
+				self::$_aCache['memcache'] = new CacheMemcache($oDbConf->host, $sPort, $iTimeout); 
 			}
 
 			return self::$_aCache['memcache'];
@@ -160,8 +160,8 @@ 
 		    
 			if (!isset(self::$_aCache['redis'])) {
 			    
-			    $oDbConf = Config::get('Redis')->configuration;
-			    self::$_aCache['memcache'] = new Redis($oDbConf);
+				$oDbConf = Config::get('Redis')->configuration;
+				self::$_aCache['memcache'] = new Redis($oDbConf);
 			}
 
 			return self::$_aCache['redis'];

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

Indentation +28 added lines, -28 removed lines

@@ -40,28 +40,28 @@ 
 	 */
 	public function javascripts() : array {
 	    
-	    $sDefaultPath = 'http://'.$_SERVER['HTTP_HOST'].'/getJs?';
-	    $aJavascript = func_get_args();
-	    $aReturns = array();
+		$sDefaultPath = 'http://'.$_SERVER['HTTP_HOST'].'/getJs?';
+		$aJavascript = func_get_args();
+		$aReturns = array();
 	    
-	    foreach($aJavascript as $aJsCombination) {
+		foreach($aJavascript as $aJsCombination) {
 	        
-	        $sJsPath = $sDefaultPath;
+			$sJsPath = $sDefaultPath;
 	        
-	        foreach ($aJsCombination as $sJsToAdd) {
+			foreach ($aJsCombination as $sJsToAdd) {
 	            
-	            $sJsPath = $sJsToAdd.'&';
-	        }
+				$sJsPath = $sJsToAdd.'&';
+			}
 	    
-    	    if (defined('ASSET_VERSION') && ASSET_VERSION) {
+			if (defined('ASSET_VERSION') && ASSET_VERSION) {
     	        
-    	        $sJsPath = ASSET_VERSION;
-    	    }
+				$sJsPath = ASSET_VERSION;
+			}
 	        
-	        $aReturns[] = $sJsPath;
-	    }
+			$aReturns[] = $sJsPath;
+		}
 	    
-	    return $aReturns;
+		return $aReturns;
 	}
 	
 	/**
@@ -75,27 +75,27 @@ 
 	 */
 	public function stylesheets() : array {
 	    
-	    $sDefaultPath = 'http://'.$_SERVER['HTTP_HOST'].'/getCss?';
-	    $aCss = func_get_args();
-	    $aReturns = array();
+		$sDefaultPath = 'http://'.$_SERVER['HTTP_HOST'].'/getCss?';
+		$aCss = func_get_args();
+		$aReturns = array();
 	    
-	    foreach($aCss as $aCssCombination) {
+		foreach($aCss as $aCssCombination) {
 	        
-	        $sCssPath = $sDefaultPath;
+			$sCssPath = $sDefaultPath;
 	        
-	        foreach ($aCssCombination as $sCssToAdd) {
+			foreach ($aCssCombination as $sCssToAdd) {
 	            
-	            $sCssPath = $sCssToAdd.'&';
-	        }
+				$sCssPath = $sCssToAdd.'&';
+			}
 	    
-    	    if (defined('ASSET_VERSION') && ASSET_VERSION) {
+			if (defined('ASSET_VERSION') && ASSET_VERSION) {
     	        
-    	        $sJsPath = ASSET_VERSION;
-    	    }
+				$sJsPath = ASSET_VERSION;
+			}
 	        
-	        $aReturns[] = $sCssPath;
-	    }
+			$aReturns[] = $sCssPath;
+		}
 	    
-	    return $aReturns;
+		return $aReturns;
 	}
 }

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;