las93 / venus3

bundles/core/UrlManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @access public
 	 * @param  string $sCode code of the url between "routes" and "route" in Route.conf
 	 * @param  array $aParams parameters to create the url
-	 * @return void
+	 * @return string
 	 *
 	 * @tutorial	If I have this route I could make my URL:
 	 *

Braces +2 added lines, -4 removed lines

@@ -96,12 +96,10 @@
 
 										if (preg_match('#'.$sType.'#', $aParams[$sName])) {
 
-											if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); }
-											else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
+											if ($aParams[$sName]) { $sRoute = str_replace('[/:'.$sName.']', '/'.$aParams[$sName], $sRoute); } else { $sRoute = str_replace('[/:'.$sName.']', '', $sRoute); }
 											$sRoute = str_replace('[:'.$sName.']', $aParams[$sName], $sRoute);
 											continue;
-										}
-										else if (isset($oRoute->defaults_constraints) 
+										} else if (isset($oRoute->defaults_constraints) 
 											&& isset($oRoute->defaults_constraints->{$sName}) 
 											&& preg_match('#'.$sType.'#', $oRoute->defaults_constraints->{$sName})) {
 

bundles/ext/facebook/base_facebook.php

Doc Comments +6 added lines, -2 removed lines

@@ -503,7 +503,7 @@ 
    * Get the UID of the connected user, or 0
    * if the Facebook user is not connected.
    *
-   * @return string the UID if available.
+   * @return integer the UID if available.
    */
   public function getUser() {
     if ($this->user !== null) {
@@ -757,6 +757,7 @@ 
    * either logged in to Facebook or has granted an offline access permission.
    *
    * @param string $code An authorization code.
+   * @param string $redirect_uri
    * @return mixed An access token exchanged for the authorization code, or
    *               false if an access token could not be generated.
    */
@@ -1135,7 +1136,7 @@ 
   /**
    * Build the URL for given domain alias, path and parameters.
    *
-   * @param $name string The name of the domain
+   * @param string $name string The name of the domain
    * @param $path string Optional path (without a leading slash)
    * @param $params array Optional query parameters
    *
@@ -1402,6 +1403,9 @@ 
     return self::endsWith($big, '.'.$small);
   }
 
+  /**
+   * @param string $small
+   */
   protected static function endsWith($big, $small) {
     $len = strlen($small);
     if ($len === 0) {

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

Doc Comments +3 added lines

@@ -150,6 +150,9 @@
     return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
   }
 
+  /**
+   * @param string $key
+   */
   protected function constructSessionVariableName($key) {
     $parts = array('fb', $this->getAppId(), $key);
     if ($this->sharedSessionID) {

bundles/lib/Cache/Mock.php

Doc Comments +5 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 	 * @param  string $sName name of the session
 	 * @param  int $iFlags flags
 	 * @param  int $iTimeout expiration of cache
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
 	{ 
@@ -52,7 +52,7 @@ 
 	 * @param  mixed $mValue value of this sesion var
 	 * @param  int $iFlag unused
 	 * @param  int $iExpire expiration of cache
-	 * @return \Venus\lib\Cache\Apc
+	 * @return boolean
 	 */
 	public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
 	{ 
@@ -63,7 +63,7 @@ 
 	 * flush the cache
 	 *
 	 * @access public
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function flush()
 	{
@@ -75,7 +75,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sName name of the session
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function delete(string $sName)
 	{
@@ -88,9 +88,8 @@ 
 	 * @access public
 	 * @param  string $sName name of the session
 	 * @param  mixed $mValue value of this sesion var
-	 * @param  int $iFlag unused
 	 * @param  int $iExpire expiration of cache
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function add($sName, $mValue, $iExpire = false)
 	{ 

bundles/lib/Date.php

Doc Comments -2 removed lines

@@ -192,8 +192,6 @@
 	 * set name of image
 	 *
 	 * @access public
-	 * @param  int $iWeek number of week
-	 * @param  int $iYear year
 	 * @return array
 	 */
 	public static function getActualMiddleWeek() : array

Braces +9 added lines, -33 removed lines

@@ -43,11 +43,9 @@ 
 	{
 		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-		else { $iWeekInSeconds = 0; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
 		$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
 		$iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
@@ -78,18 +76,7 @@ 
 	{
 		if ($sLanguage == 'fr') {
 
-			if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
-			else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
-			else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
-			else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
-			else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
-			else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
-			else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
-			else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
-			else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
-			else if ($sMonth == 10) { return 'Octobre'; }
-			else if ($sMonth == 11) { return 'Novembre'; }
-			else if ($sMonth == 12) { return 'Décembre'; }
+			if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; } else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; } else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; } else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; } else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; } else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; } else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; } else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; } else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; } else if ($sMonth == 10) { return 'Octobre'; } else if ($sMonth == 11) { return 'Novembre'; } else if ($sMonth == 12) { return 'Décembre'; }
 		}
 	}
 
@@ -105,13 +92,7 @@ 
 	{
 		if ($sLanguage == 'fr') {
 
-			if ($sDay == 0) { return 'dimanche'; }
-			else if ($sDay == 1) { return 'lundi'; }
-			else if ($sDay == 2) { return 'mardi'; }
-			else if ($sDay == 3) { return 'mercredi'; }
-			else if ($sDay == 4) { return 'jeudi'; }
-			else if ($sDay == 5) { return 'vendredi'; }
-			else if ($sDay == 6) { return 'samedi'; }
+			if ($sDay == 0) { return 'dimanche'; } else if ($sDay == 1) { return 'lundi'; } else if ($sDay == 2) { return 'mardi'; } else if ($sDay == 3) { return 'mercredi'; } else if ($sDay == 4) { return 'jeudi'; } else if ($sDay == 5) { return 'vendredi'; } else if ($sDay == 6) { return 'samedi'; }
 		}
 	}
 
@@ -138,8 +119,7 @@ 
 			if ($iMonth == $aToday['mois']) {
 
 				if ($iDay > $aToday['jour']) { $iYears--; }
-			}
-			else {
+			} else {
 
 				$iYears--;
 			}
@@ -160,18 +140,15 @@ 
 	{
 		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-		else { $iWeekInSeconds = 0; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
 		if (date('N') > 2) {
 
 			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
 			$iTimestampLastDay = $iTimestamp + 604800;
-		}
-		else {
+		} else {
 
 			$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
 			$iTimestampLastDay = $iTimestamp + 604800;
@@ -228,7 +205,6 @@ 
 		if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
 		if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
 		if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-		if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-		else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+		if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; } else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
 	}
 }

bundles/lib/Form.php

Doc Comments +1 added lines, -2 removed lines

@@ -304,7 +304,7 @@ 
 	 * get global object form
 	 *
 	 * @access public
-	 * @return object
+	 * @return \stdClass
 	 */
 	public function getFormInObject()
 	{
@@ -411,7 +411,6 @@ 
 	 * set the entity to synchronize with the formular
 	 *
 	 * @access public
-	 * @param  string $sSeparator separator between the fields
 	 * @param  int $iId id of the primary key
 	 * @return \Venus\lib\Form
 	 */

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/Form/Container.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 * get the Value
 	 *
 	 * @access public
-	 * @return object
+	 * @return \stdClass
 	 */
 	public function createView()
 	{

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

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 	 *
 	 * @access public
 	 * @param  string $sType type of input;
-	 * @return bool
+	 * @return string
 	 */
 	public function isClicked(string $sType) : string
 	{

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/Form/Radio.php

Doc Comments +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sValue Value of input;
-	 * @return \Venus\lib\Form\Input
+	 * @return Radio
 	 */
 	public function setValue(string $sValue) : Input
 	{
@@ -120,7 +120,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sValueChecked Value of input;
-	 * @return \Venus\lib\Form\Input
+	 * @return Radio
 	 */
 	public function setValueChecked(string $sValueChecked) : Input
 	{
@@ -144,7 +144,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $sLabel Label of input;
-	 * @return \Venus\lib\Form\Input
+	 * @return Radio
 	 */
 	public function setLabel(string $sLabel) : Input
 	{