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:
 	 *

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 
 						$aRoutes = array();
 
-						foreach($oHost->routes as $sKey => $oRoute) {
+						foreach ($oHost->routes as $sKey => $oRoute) {
 
 							if ($sKey === $sCode) {
 
@@ -135,8 +135,8 @@ 
 			throw new \Exception();
 		}
 		
-		$sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
-			['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
+		$sStringToEncode = str_replace(['à', 'á', 'â', 'ã', 'ä', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý'],
+			['a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y'],
 				$sStringToEncode);
 
 		$sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));

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

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

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

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

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @param  int $iTimeout expiration of cache
 	 * @return mixed
 	 */
-	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
 	{ 
 	    return parent::get($sName);
 	}

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

Spacing +10 added lines, -10 removed lines

@@ -41,12 +41,12 @@ 
 	 */
 	public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
 	{
-		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+		$iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
 		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
 		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
 		else { $iWeekInSeconds = 0; }
 
 		$iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
@@ -158,12 +158,12 @@ 
 	 */
 	public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
 	{
-		$iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+		$iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
 		if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
 		else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+		if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
 		else { $iWeekInSeconds = 0; }
 
 		if (date('N') > 2) {
@@ -182,7 +182,7 @@ 
 		if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
 
 			$aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
-			$aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
+			$aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y') + 1).'$1', $aDates[1]);
 		}
 
 		return $aDates;
@@ -225,10 +225,10 @@ 
 		$oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
 		$iTimeStamp = time() - $oDateTime->getTimestamp();
 
-		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 < 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; }
 	}
 }

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
 	 */

Spacing +3 added lines, -3 removed lines

@@ -181,13 +181,13 @@ 
 		}
 		else  if ($mType === 'radio') {
 
-			$this->_aElement[$sName.rand(100000,999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
+			$this->_aElement[$sName.rand(100000, 999999)] = new Radio($sName, $sLabel, $mValue, $mOptions);
 		}
 		else  if ($mType === 'date') {
 
 			$aDay = array();
 
-			for ($i = 1 ; $i <= 31 ; $i++) {
+			for ($i = 1; $i <= 31; $i++) {
 
 				if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
 				else { $aDay[$i] = $i; }
@@ -214,7 +214,7 @@ 
 
 			$aYear = array();
 
-			for ($i = 1900 ; $i <= 2013 ; $i++) {
+			for ($i = 1900; $i <= 2013; $i++) {
 
 				$aYear[$i] = $i;
 			}

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

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
 	{

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
 	{