Schlaefer / Saito

app/Model/Setting.php

Doc Comments +3 added lines

@@ -92,6 +92,9 @@
 			return $settings;
 		}
 
+		/**
+		 * @param string $field
+		 */
 		protected function _normToSeconds(&$settings, $field) {
 			$settings[$field] = (int)$settings[$field] * 60;
 		}

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		}
 
 		protected function _normToSeconds(&$settings, $field) {
-			$settings[$field] = (int)$settings[$field] * 60;
+			$settings[$field] = (int) $settings[$field] * 60;
 		}
 
 		/**

app/Model/UserIgnore.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 		 * counts how many users ignore the user with ID $id
 		 *
 		 * @param $id
-		 * @return array
+		 * @return integer
 		 */
 		public function countIgnored($id) {
 			return count($this->getIgnored($id));

app/Plugin/Api/Lib/ApiControllerTestCase.php

Doc Comments +4 added lines

@@ -7,6 +7,10 @@
 			parent::setUp();
 		}
 
+		/**
+		 * @param string[] $types
+		 * @param string $url
+		 */
 		protected function _checkDisallowedRequestType($types, $url) {
 			foreach ($types as $requestType) {
 				try {

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php

Doc Comments +3 added lines

@@ -306,6 +306,9 @@
 
 		/**
 		 * @see http://www.php.net/manual/en/function.str-pad.php#111147
+		 * @param string $str
+		 * @param integer $padLen
+		 * @param integer $dir
 		 */
 		protected function _mbStrpad($str, $padLen, $padStr = ' ', $dir = STR_PAD_RIGHT) {
 			$strLen = mb_strlen($str);

Spacing +13 added lines, -13 removed lines

@@ -123,7 +123,7 @@ 
 
 			// @todo should be done in Setting model
 			$ad = explode('|', $this->_sOptions['video_domains_allowed']);
-			$trim = function ($v) {
+			$trim = function($v) {
 				return trim($v);
 			};
 			$this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
@@ -193,9 +193,9 @@ 
 				}
 			}
 
-			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
-									<param name="movie" value="' . $url . '"></param>
-									<embed src="' . $url . '" width="' . $width . '" height="' . $height . '" type="application/x-shockwave-flash" wmode="opaque" style="width:' . $width . 'px; height:' . $height . 'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
+			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="'.$width.'" height="'.$height.'">
+									<param name="movie" value="' . $url.'"></param>
+									<embed src="' . $url.'" width="'.$width.'" height="'.$height.'" type="application/x-shockwave-flash" wmode="opaque" style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
 			return $out;
 		}
 
@@ -258,12 +258,12 @@ 
 		protected function _parse($content, $attributes) {
 			$listPieces = explode('[*]', $content);
 			unset($listPieces[0]);
-			$listPieceProcessor = function ($li) {
-				return '<li>' . $li . '</li>' . "\n";
+			$listPieceProcessor = function($li) {
+				return '<li>'.$li.'</li>'."\n";
 			};
 			$listPieces = array_map($listPieceProcessor, $listPieces);
 
-			return '<ul>' . implode('', $listPieces) . '</ul>';
+			return '<ul>'.implode('', $listPieces).'</ul>';
 		}
 
 	}
@@ -280,14 +280,14 @@ 
 			}
 
 			$title = $this->_mbStrpad(
-				' ' . __('Spoiler') . ' ',
+				' '.__('Spoiler').' ',
 				$length,
 				'▇',
 				STR_PAD_BOTH
 			);
 
 			$json = json_encode(['string' => $content]);
-			$id = 'spoiler_' . rand(0, 9999999999999);
+			$id = 'spoiler_'.rand(0, 9999999999999);
 
 			$out = <<<EOF
 <div class="richtext-spoiler" style="display: inline;">
@@ -320,19 +320,19 @@ 
 			$result = null;
 			$repeat = ceil($strLen - $padStrLen + $padLen);
 			if ($dir == STR_PAD_RIGHT) {
-				$result = $str . str_repeat($padStr, $repeat);
+				$result = $str.str_repeat($padStr, $repeat);
 				$result = mb_substr($result, 0, $padLen);
 			} else {
 				if ($dir == STR_PAD_LEFT) {
-					$result = str_repeat($padStr, $repeat) . $str;
+					$result = str_repeat($padStr, $repeat).$str;
 					$result = mb_substr($result, -$padLen);
 				} else {
 					if ($dir == STR_PAD_BOTH) {
 						$length = ($padLen - $strLen) / 2;
 						$repeat = ceil($length / $padStrLen);
 						$result = mb_substr(str_repeat($padStr, $repeat), 0,
-								floor($length)) .
-							$str .
+								floor($length)).
+							$str.
 							mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
 					}
 				}

app/Plugin/Cron/Lib/Cron.php

Doc Comments +3 added lines

@@ -102,6 +102,9 @@
 			return $this->_lastRuns;
 		}
 
+		/**
+		 * @param string $msg
+		 */
 		protected function _log($msg) {
 			if (Configure::read('Saito.Globals.logInfo')) {
 				return CakeLog::write('saito.info', $msg);

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 				}
 				$jobsExecuted++;
 				$job->execute();
-				$this->_log('Run cron-job ' . $job->uid);
+				$this->_log('Run cron-job '.$job->uid);
 				$this->_lastRuns[$job->due][$job->uid] = $this->_now;
 			}
 			if ($jobsExecuted === 0) {

app/Plugin/SaitoHelp/Model/Datasource/SaitoHelpSource.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 			return $this->_schema;
 		}
 
+		/**
+		 * @param string $key
+		 */
 		public function resolveKey(Model $model, $key) {
 			if (strpos('.', $key) === false) {
 				return $model->alias . '.' . $key;

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 
 		public function resolveKey(Model $model, $key) {
 			if (strpos('.', $key) === false) {
-				return $model->alias . '.' . $key;
+				return $model->alias.'.'.$key;
 			}
 			return $key;
 		}
@@ -60,9 +60,9 @@ 
 			if ($plugin) {
 				$folderPath = CakePlugin::path($plugin);
 			} else {
-				$folderPath = ROOT . DS;
+				$folderPath = ROOT.DS;
 			}
-			$folderPath .= 'docs' . DS . 'help' . DS . $lang;
+			$folderPath .= 'docs'.DS.'help'.DS.$lang;
 
 			$folder = new Folder($folderPath);
 			$files = $folder->find("$id(-.*?)?\.md");
@@ -70,7 +70,7 @@ 
 				return false;
 			}
 			$name = $files[0];
-			$file = new File($folderPath . DS . $name, false, 0444);
+			$file = new File($folderPath.DS.$name, false, 0444);
 			$text = $file->read();
 			$file->close();
 			$result = [

app/Plugin/SimpleCaptcha/Model/Behavior/SimpleCaptchaBehavior.php

Doc Comments +3 added lines, -1 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * Setup instance
 	 *
-	 * @param type $Model
+	 * @param Model $Model
 	 * @param type $settings
 	 */
 	public function setup(Model $Model, $settings = array()) {
@@ -183,6 +183,8 @@ 
 	/**
 	 * build and log error message
 	 * 2009-12-18 ms
+	 * @param string $msg
+	 * @param string $internalMsg
 	 */
 	private function error($msg = null, $internalMsg = null) {
 		if (!empty($msg)) {

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 		$dummyField = $this->settings[$this->Model->alias]['dummyField'];
 		if (!empty($data[$dummyField])) {
 			# dummy field not empty - SPAM!
-			return $this->error('Illegal content', 'DummyField = \'' . $data[$dummyField] . '\'');
+			return $this->error('Illegal content', 'DummyField = \''.$data[$dummyField].'\'');
 		}
 		return true;
 	}
@@ -108,7 +108,7 @@ 
 		}
 
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'] )
+				&& ($data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'])
 		) {
 			return true;
 		}
@@ -127,7 +127,7 @@ 
 			return true;
 		}
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time() )
+				&& ($data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time())
 		) {
 			return true;
 		}
@@ -161,7 +161,7 @@ 
 			return true;
 		}
 		# wrong captcha content or session expired
-		return $this->error('Captcha incorrect', 'SubmittedResult = \'' . $data['captcha'] . '\'');
+		return $this->error('Captcha incorrect', 'SubmittedResult = \''.$data['captcha'].'\'');
 	}
 
 	/**
@@ -210,12 +210,12 @@ 
 		}
 
 		App::import('Component', 'RequestHandler');
-		$msg = 'Ip \'' . RequestHandlerComponent::getClientIP() . '\', Agent \'' . env('HTTP_USER_AGENT') . '\', Referer \'' . env('HTTP_REFERER') . '\', Host-Referer \'' . RequestHandlerComponent::getReferer() . '\'';
+		$msg = 'Ip \''.RequestHandlerComponent::getClientIP().'\', Agent \''.env('HTTP_USER_AGENT').'\', Referer \''.env('HTTP_REFERER').'\', Host-Referer \''.RequestHandlerComponent::getReferer().'\'';
 		if (!empty($this->error)) {
-			$msg .= ', ' . $this->error;
+			$msg .= ', '.$this->error;
 		}
 		if (!empty($this->internalError)) {
-			$msg .= ' (' . $this->internalError . ')';
+			$msg .= ' ('.$this->internalError.')';
 		}
 		$this->log($msg, 'captcha');
 		return true;

app/Plugin/Stopwatch/Lib/Stopwatch.php

Doc Comments +4 added lines, -1 removed lines

@@ -54,6 +54,9 @@ 
 		self::$_stopwatchCalls = 0;
 	}
 
+	/**
+	 * @param string $event
+	 */
 	static protected function _addEvent($x, $event = null) {
 		if (self::$_enableTimer === false) {
 			return;
@@ -264,7 +267,7 @@ 
 /**
  * Alias for self::stop
  *
- * @param type $text
+ * @param string $text
  */
 	public static function end($text) {
 		self::stop($text);

Spacing +8 added lines, -8 removed lines

@@ -100,10 +100,10 @@ 
 
 		switch ($event) {
 			case 'start':
-				$x = '* ' . $x;
+				$x = '* '.$x;
 				break;
 			case 'stop':
-				$x = '† ' . $x;
+				$x = '† '.$x;
 				break;
 		}
 
@@ -143,13 +143,13 @@ 
 		self::start('now');
 
 		$out = "";
-		$out .= 'Time to Cake: ' . sprintf('%05.3f', self::_timeToCake()) . " s\n";
-		$out .= 'Cake bootstrap: ' . sprintf('%05.3f', self::_timeFromCakeToStopwatch()) . " s\n";
+		$out .= 'Time to Cake: '.sprintf('%05.3f', self::_timeToCake())." s\n";
+		$out .= 'Cake bootstrap: '.sprintf('%05.3f', self::_timeFromCakeToStopwatch())." s\n";
 
 		$out .= "W\tU\tW_delta\tU_delta\tMem [MB]\n";
 		$_seriesIndex = 1;
 		foreach (self::$_events as $k => $v) {
-			$out .= '<span id="stopwatch-' . $_seriesIndex++ . '" class="stopwatch-row">';
+			$out .= '<span id="stopwatch-'.$_seriesIndex++.'" class="stopwatch-row">';
 			$out .= sprintf("%05.3f\t%05.3f\t%05.3f\t%05.3f\t%5.1f\t%s\n",
 				$v['wtime'],
 				$v['utime'],
@@ -196,7 +196,7 @@ 
 				$k);
 		}
 
-		$out .= "\n\n" . self::printStatistic();
+		$out .= "\n\n".self::printStatistic();
 
 		return $out;
 	}
@@ -238,7 +238,7 @@ 
 	}
 
 	public static function printStatistic() {
-		return self::$_stopwatchCalls . " calls with ca " . sprintf("%05.3f", self::$_stopwatchTime) . ' sec overhead.';
+		return self::$_stopwatchCalls." calls with ca ".sprintf("%05.3f", self::$_stopwatchTime).' sec overhead.';
 	}
 
 	public static function getWallTime($divider = null) {
@@ -258,7 +258,7 @@ 
 		self::end('getWallTime()');
 		$time = self::$_events[count(self::$_events) - 1]['wtime'] +
 			self::_timeToStopwatch();
-		return number_format( $time, 3, $decimal, $thousand);
+		return number_format($time, 3, $decimal, $thousand);
 	}
 
 /**

app/View/Helper/LayoutHelper.php

Doc Comments +3 added lines

@@ -151,6 +151,9 @@
 			return $this->Html->tag('span', $content, ['class' => 'infoText']);
 		}
 
+		/**
+		 * @param string $icon
+		 */
 		public function textWithIcon($text, $icon) {
 			return <<<EOF
 				<i class="saito-icon fa fa-$icon"></i>

Spacing +10 added lines, -10 removed lines

@@ -13,8 +13,8 @@ 
 		protected $_themeImgUrl = null;
 
 		public function beforeRender($viewFile) {
-			$this->_themeImgUrl = $this->request->webroot . 'theme' . DS . $this->theme .
-					DS . Configure::read('App.imageBaseUrl');
+			$this->_themeImgUrl = $this->request->webroot.'theme'.DS.$this->theme.
+					DS.Configure::read('App.imageBaseUrl');
 		}
 
 		public function beforeLayout($layoutFile) {
@@ -29,10 +29,10 @@ 
 		public function jQueryTag() {
 			$url = 'dist/';
 			$name = 'jquery';
-			if ((int)Configure::read('debug') === 0) {
-				$name = $name . '.min';
+			if ((int) Configure::read('debug') === 0) {
+				$name = $name.'.min';
 			}
-			return $this->Html->script($this->Html->assetUrl($url . $name,
+			return $this->Html->script($this->Html->assetUrl($url.$name,
 					['ext' => '.js', 'fullBase' => true]));
 		}
 
@@ -69,14 +69,14 @@ 
 				'title' => Configure::read('Saito.Settings.forum_name')
 			];
 			$html = [];
-			$html[] = '<meta name="application-name" content="' . h($options['title']) . '"/>';
+			$html[] = '<meta name="application-name" content="'.h($options['title']).'"/>';
 			if (isset($options['color'])) {
-				$html[] = '<meta name="msapplication-TileColor" content="' . $options['color'] . '"/>';
+				$html[] = '<meta name="msapplication-TileColor" content="'.$options['color'].'"/>';
 			}
 
 			$_basename = $options['baseName'];
 			$url = "{$this->_themeImgUrl}{$_basename}.png";
-			$html[] = '<meta name="msapplication-TileImage" content="' . $url . '"/>';
+			$html[] = '<meta name="msapplication-TileImage" content="'.$url.'"/>';
 			return implode("\n", $html);
 		}
 
@@ -225,7 +225,7 @@ 
 			$_content += ['first' => '', 'middle' => '', 'last' => ''];
 			$out = '';
 			foreach (['first', 'middle', 'last'] as $key) {
-				$out .= '<div class="heading-3-' . $key . '">';
+				$out .= '<div class="heading-3-'.$key.'">';
 				$out .= $options['escape'] ? h($_content[$key]) : $_content[$key];
 				$out .= '</div>';
 			}
@@ -235,7 +235,7 @@ 
 		public function linkToUserProfile($user, ForumsUserInterface $CurrentUser) {
 			if ($CurrentUser->isLoggedIn()) {
 				return $this->Html->link($user['username'],
-						'/users/view/' . $user['id']);
+						'/users/view/'.$user['id']);
 			} else {
 				return h($user['username']);
 			}