Schlaefer / Saito

app/Console/Command/DummyDataShell.php

Doc Comments +4 added lines

@@ -106,6 +106,10 @@
 			$this->out("Generated $i users.");
 		}
 
+		/**
+		 * @param integer $i
+		 * @param integer $off
+		 */
 		protected function _progress($i, $off) {
 			if ($i < 1) {
 				return;

Spacing +5 added lines, -5 removed lines

@@ -31,11 +31,11 @@ 
 		}
 
 		public function generate() {
-			$nPostings = (int)$this->in('Number of postings to generate?', null, 100);
+			$nPostings = (int) $this->in('Number of postings to generate?', null, 100);
 			if ($nPostings === 0) {
 				return;
 			}
-			$ratio = (int)$this->in('Average answers per thread?', null, 10);
+			$ratio = (int) $this->in('Average answers per thread?', null, 10);
 			$seed = $nPostings / $ratio;
 
 			new Saito\Markup\Settings([
@@ -64,7 +64,7 @@ 
 				}
 				$entry = $this->Entry->createPosting(['Entry' => $entry]);
 				if (empty($entry)) {
-					throw new RuntimeException('Could not create entry: ' . $entry);
+					throw new RuntimeException('Could not create entry: '.$entry);
 				}
 
 				$this->_progress($i, $nPostings);
@@ -79,7 +79,7 @@ 
 
 		public function user() {
 			$max = count($this->_users);
-			$n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
+			$n = (int) $this->in("Number of users to generate (max: $max)?", null, 0);
 			if ($n === 0) {
 				return;
 			}
@@ -112,7 +112,7 @@ 
 			}
 			$this->out('.', 0);
 			if ($i > 1 && !($i % 50)) {
-				$percent = (int)floor($i / $off * 100);
+				$percent = (int) floor($i / $off * 100);
 				$this->out(sprintf(' %3s%%', $percent), 1);
 			}
 		}

app/Console/Command/SiegeShell.php

Doc Comments +6 added lines

@@ -42,12 +42,18 @@
 			exec($command);
 		}
 
+		/**
+		 * @param string $urlFilePath
+		 */
 		protected function _cleanup($urlFilePath) {
 			if (file_exists($urlFilePath)) {
 				unlink($urlFilePath);
 			}
 		}
 
+		/**
+		 * @param string[] $out
+		 */
 		protected function _generateEntriesIndex(&$out) {
 			for ($i = 0; $i < 400; $i++) {
 				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);

Spacing +9 added lines, -9 removed lines

@@ -11,12 +11,12 @@ 
 		public function main() {
 			$out = [];
 			$base = rtrim($this->args[0], '/');
-			$in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
+			$in = $this->in('Base URL is: '.$base, ['y', 'n'], 'y');
 			if ($in !== 'y') {
 				$this->out('Aborting.');
 				return;
 			}
-			$out[] = 'HOST=' . $base;
+			$out[] = 'HOST='.$base;
 			$this->_generateEntriesIndex($out);
 			$this->_generateEntriesMix($out);
 			$this->_generateEntriesView($out);
@@ -34,11 +34,11 @@ 
 		}
 
 		protected function _siege(&$out) {
-			$urlFilePath = TMP . 'url.txt';
+			$urlFilePath = TMP.'url.txt';
 			$this->_cleanup($urlFilePath);
 			$this->createFile($urlFilePath, implode("\n", $out));
-			$command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
-			$this->out('<info>Running: ' . $command . '</info>', 1, 'info');
+			$command = 'siege -R '.APP.'..'.DS.".siegerc -f $urlFilePath";
+			$this->out('<info>Running: '.$command.'</info>', 1, 'info');
 			exec($command);
 		}
 
@@ -50,10 +50,10 @@ 
 
 		protected function _generateEntriesIndex(&$out) {
 			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
+				$out[] = $this->_prefix.'entries/index/page:'.rand(1, 2);
 			}
 			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
+				$out[] = $this->_prefix.'entries/index/page:'.rand(5, 10);
 			}
 		}
 
@@ -66,7 +66,7 @@ 
 					]);
 
 			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
+				$out[] = $this->_prefix.'entries/mix/'.$entry['Entry']['id'];
 			}
 		}
 
@@ -79,7 +79,7 @@ 
 					]);
 
 			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
+				$out[] = $this->_prefix.'entries/view/'.$entry['Entry']['id'];
 			}
 		}
 

app/Controller/AdminsController.php

Doc Comments +8 added lines

@@ -104,6 +104,10 @@ 
 			return $this->_countYearStats(['fields' => ['COUNT(DISTINCT `user_id`) AS `count`']]);
 		}
 
+		/**
+		 * @param string $model
+		 * @param string $field
+		 */
 		protected function _getYearStats($model, $field) {
 			return $this->_countYearStats(['fields' => ['COUNT(*) AS `count`']],
 					[], $model, $field);
@@ -147,6 +151,10 @@ 
 			return $this->_wrapData($data);
 		}
 
+		/**
+		 * @param string $model
+		 * @param string $field
+		 */
 		protected function _getMonthStats($model, $field) {
 			$results = $this->_countYearStats(
 					['fields' => ['COUNT(*) AS `count`']],

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 			// order here is output order in frontend
 			$_logsToRead = ['error', 'debug'];
 
-			$_logsToRead = glob(LOGS . '*.log');
+			$_logsToRead = glob(LOGS.'*.log');
 			if (!$_logsToRead) {
 				return;
 			}
@@ -142,7 +142,7 @@ 
 			$results = Hash::extract($results, '{n}.{n}');
 			$data = [];
 			foreach ($results as $d) {
-				$data[] = [(string)$d['date'], $d['count']];
+				$data[] = [(string) $d['date'], $d['count']];
 			}
 			return $this->_wrapData($data);
 		}
@@ -162,9 +162,9 @@ 
 			$diff = [];
 			$sum = 0;
 			foreach ($results as $reg) {
-				$sum += (int)$reg[0]['count'];
+				$sum += (int) $reg[0]['count'];
 				$cumulated[] = array($reg[0]['date'] * 1000, $sum);
-				$diff[] = array($reg[0]['date'] * 1000, (int)$reg[0]['count']);
+				$diff[] = array($reg[0]['date'] * 1000, (int) $reg[0]['count']);
 			}
 			return [
 					$this->_wrapData($diff, ['label' => __('New')]),

app/Controller/Component/Auth/Mlf2PasswordHasher.php

Doc Comments +3 added lines

@@ -15,6 +15,9 @@
 			return $hashWithSalt;
 		}
 
+		/**
+		 * @param integer $maxLength
+		 */
 		protected static function _generateRandomString($maxLength = null) {
 			$string = Security::generateAuthKey();
 			if ($maxLength) {

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 		public function hash($password) {
 			// compare to includes/functions.inc.php generate_pw_hash() mlf 2.3
 			$salt = self::_generateRandomString(10);
-			$saltedHash = sha1($password . $salt);
-			$hashWithSalt = $saltedHash . $salt;
+			$saltedHash = sha1($password.$salt);
+			$hashWithSalt = $saltedHash.$salt;
 			return $hashWithSalt;
 		}
 
@@ -28,7 +28,7 @@ 
 			// compare to includes/functions.inc.php is_pw_correct() mlf 2.3
 			$saltedHash = substr($hash, 0, 40);
 			$salt = substr($hash, 40, 10);
-			if (sha1($password . $salt) == $saltedHash) :
+			if (sha1($password.$salt) == $saltedHash) :
 				$out = true;
 			endif;
 			return $out;

app/Controller/Component/CurrentUserComponent.php

Doc Comments +1 added lines

@@ -268,6 +268,7 @@
 
 /**
  * write the settings to the session, so that they are available on next request
+ * @param Controller $controller
  */
 		protected function _writeSession(&$controller) {
 			if ($controller->action !== 'logout' && $controller->Auth->user()):

Braces +3 added lines, -1 removed lines

@@ -305,8 +305,10 @@
 
 			if ($this->isLoggedIn()):
 				$this->_Controller->Auth->allow();
-			else:
+			else {
+				:
 				$this->_Controller->Auth->deny();
+			}
 			endif;
 
 			$this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()

app/Controller/Component/SaitoEmailComponent.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
 			$this->_CakeEmail->config('saito');
 		}
 
+		/**
+		 * @param string $type
+		 */
 		public function getPredefinedSender($type) {
 			$this->_init();
 			return ['User' => [

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 				}
 			}
 
-			$this->_emailConfigExists = file_exists(APP . 'Config' . DS . 'email' . '.php');
+			$this->_emailConfigExists = file_exists(APP.'Config'.DS.'email'.'.php');
 
 			$this->_forumName = Configure::read('Saito.Settings.forum_name');
 
@@ -112,7 +112,7 @@ 
 		protected function _config($params = []) {
 			$defaults = [
 				'viewVars' => [
-					'webroot' => Router::fullBaseUrl() . $this->_webroot,
+					'webroot' => Router::fullBaseUrl().$this->_webroot,
 				],
 			];
 			$params = array_merge_recursive($defaults, $params);

app/Controller/EntriesController.php

Doc Comments +7 added lines, -1 removed lines

@@ -650,7 +650,7 @@ 
  * @param null $id
  * @param null $toggle
  *
- * @return translated
+ * @return null|string
  */
 		public function ajax_toggle($id = null, $toggle = null) {
 			$this->autoLayout = false;
@@ -781,6 +781,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $type
+		 */
 		protected function _incrementViews($entry, $type = null) {
 			if ($this->CurrentUser->isBot()) {
 				return;
@@ -947,6 +950,9 @@ 
 			$this->set('rootEntry', $_rootEntry);
 		}
 
+		/**
+		 * @param string $type
+		 */
 		protected function _setTitleFromEntry($entry, $type = null) {
 			if ($type === null) {
 				$template =	__(':subject | :category');

Spacing +23 added lines, -23 removed lines

@@ -43,8 +43,8 @@ 
 
 			$currentPage = 1;
 			if (isset($this->request->named['page']) && $this->request->named['page'] != 1) {
-				$currentPage = (int)$this->request->named['page'];
-				$this->set('title_for_layout', __('page') . ' ' . $currentPage);
+				$currentPage = (int) $this->request->named['page'];
+				$this->set('title_for_layout', __('page').' '.$currentPage);
 			}
 			if ($currentPage === 1 && $this->CurrentUser->isLoggedIn()
 				&& $this->CurrentUser['user_automaticaly_mark_as_read']
@@ -146,11 +146,11 @@ 
 		public function source($id = null) {
 			$this->autoRender = false;
 
-			$data = $this->requestAction('/entries/view/' . $id);
+			$data = $this->requestAction('/entries/view/'.$id);
 
 			$out = array();
 			$out[] = '<pre style="white-space: pre-wrap;">';
-			$out[] = $data['Entry']['subject'] . "\n";
+			$out[] = $data['Entry']['subject']."\n";
 			$out[] = $data['Entry']['text'];
 			$out[] = '</pre>';
 			return implode("\n", $out);
@@ -233,9 +233,9 @@ 
 
 							return json_encode(
 								[
-									'id' => (int)$newPosting['Entry']['id'],
-									'pid' => (int)$newPosting['Entry']['pid'],
-									'tid' => (int)$newPosting['Entry']['tid']
+									'id' => (int) $newPosting['Entry']['id'],
+									'pid' => (int) $newPosting['Entry']['pid'],
+									'tid' => (int) $newPosting['Entry']['tid']
 								]
 							);
 						} else {
@@ -336,8 +336,8 @@ 
 				}
 			}
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('is_inline', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_inline', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 			$this->_setAddViewVars();
 		}
@@ -439,7 +439,7 @@ 
 			);
 			$this->set('notis', $notis);
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('is_inline', false);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 
@@ -487,7 +487,7 @@ 
 				$this->redirect('/');
 			} else {
 				$this->Session->setFlash(__('delete_subtree_success'), 'flash/success');
-				$this->redirect('/entries/view/' . $entry['Entry']['pid']);
+				$this->redirect('/entries/view/'.$entry['Entry']['pid']);
 			}
 		} else {
 			$this->Session->setFlash(__('delete_tree_error'), 'flash/error');
@@ -587,16 +587,16 @@ 
 			else :
 				// validation errors
 				foreach ($errors as $field => $error) {
-					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+					$message = __d('nondynamic', $field).": ".__d('nondynamic', $error[0]);
 					$this->JsData->addAppJsMessage(
 						$message,
 						[
 							'type' => 'error',
 							'channel' => 'form',
-							'element' => '#Entry' . array_reduce(
+							'element' => '#Entry'.array_reduce(
 									explode('_', $field),
-									function ($carry, $item) {
-										return $carry . ucfirst($item);
+									function($carry, $item) {
+										return $carry.ucfirst($item);
 									},
 									''
 								)
@@ -626,7 +626,7 @@ 
 			$this->Entry->contain();
 			$data = $this->Entry->findById($id);
 
-			if (!$data || (int)$data['Entry']['pid'] !== 0) {
+			if (!$data || (int) $data['Entry']['pid'] !== 0) {
 				throw new NotFoundException();
 			}
 
@@ -635,7 +635,7 @@ 
 				$targetId = $this->request->data['Entry']['targetId'];
 				$this->Entry->id = $id;
 				if ($this->Entry->threadMerge($targetId)) {
-					$this->redirect('/entries/view/' . $id);
+					$this->redirect('/entries/view/'.$id);
 					return;
 				} else {
 					$this->Session->setFlash(__("Error"), 'flash/error');
@@ -676,10 +676,10 @@ 
 				//* let's toggle
 				$this->Entry->id = $id;
 				$this->request->data = $this->Entry->toggle($toggle);
-				return ($this->request->data == 0) ? __d('nondynamic', $toggle . '_set_entry_link') : __d('nondynamic', $toggle . '_unset_entry_link');
+				return ($this->request->data == 0) ? __d('nondynamic', $toggle.'_set_entry_link') : __d('nondynamic', $toggle.'_unset_entry_link');
 			}
 
-			$this->set('json_data', (string)$this->request->data);
+			$this->set('json_data', (string) $this->request->data);
 			$this->render('/Elements/json/json_data');
 		}
 
@@ -925,7 +925,7 @@ 
 						// … directly in entries/mix
 						|| $this->request->action === 'mix'
 						// … inline viewing … on entries/index.
-						|| ( $this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
+						|| ($this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
 				):
 					$showAnsweringPanel = true;
 				endif;
@@ -934,7 +934,7 @@ 
 		}
 
 		protected function _setRootEntry($entry) {
-			if ((int)$entry['Entry']['pid'] !== 0) {
+			if ((int) $entry['Entry']['pid'] !== 0) {
 				$_rootEntry = $this->Entry->find('first',
 					[
 						'contain' => false,
@@ -949,9 +949,9 @@ 
 
 		protected function _setTitleFromEntry($entry, $type = null) {
 			if ($type === null) {
-				$template =	__(':subject | :category');
+				$template = __(':subject | :category');
 			} else {
-				$template =	__(':subject (:type) | :category');
+				$template = __(':subject (:type) | :category');
 			}
 			$this->set('title_for_layout',
 					CakeText::insert($template,

Braces +9 added lines, -3 removed lines

@@ -242,7 +242,8 @@ 
 							$this->_stop();
 						}
 					// answering through POST request
-					else :
+					else {
+						:
 						if ($this->localReferer('action') === 'mix') {
 							// answer request came from mix ansicht
 							$this->redirect(
@@ -253,6 +254,7 @@ 
 									'#' => $this->Entry->id
 								]
 							);
+					}
 
 						} else {
 							// normal posting from entries/add or entries/view
@@ -267,7 +269,8 @@ 
 						}
 						return;
 					endif;
-				else :
+				else {
+					:
 					// Error while trying to save a post
 					if (count($this->Entry->validationErrors) === 0) {
 						$this->Session->setFlash(
@@ -276,6 +279,7 @@ 
 							),
 							'flash/error'
 						);
+				}
 					}
 				endif;
 
@@ -584,10 +588,12 @@ 
 				);
 				$entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
 				$this->set('entry', $entry);
-			else :
+			else {
+				:
 				// validation errors
 				foreach ($errors as $field => $error) {
 					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+			}
 					$this->JsData->addAppJsMessage(
 						$message,
 						[

app/Controller/SearchesController.php

Doc Comments +6 added lines

@@ -176,10 +176,16 @@
 			$this->set(compact('month', 'year'));
 		}
 
+		/**
+		 * @param string $string
+		 */
 		protected function _sanitize($string) {
 			return Sanitize::escape($string, $this->Entry->useDbConfig);
 		}
 
+		/**
+		 * @param string[] $params
+		 */
 		protected function _filterQuery($params) {
 			$this->request->query = array_intersect_key($this->request->query,
 					array_fill_keys($params, 1));

Spacing +4 added lines, -4 removed lines

@@ -79,8 +79,8 @@ 
 			$order = '`Entry`.`time` DESC';
 			$fields = '*';
 			if ($query['order'] === 'rank') {
-				$order = 'rating DESC, ' . $order;
-				$fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
+				$order = 'rating DESC, '.$order;
+				$fields = $fields.", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
 			}
 
 			// query
@@ -152,8 +152,8 @@ 
 						'Y-m-d H:i:s',
 						mktime(0, 0, 0, $month, 1, $year));
 
-				if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
-					if (!isset($categories[(int)$query['category_id']])) {
+				if (isset($query['category_id']) && (int) $query['category_id'] !== 0) {
+					if (!isset($categories[(int) $query['category_id']])) {
 						throw new NotFoundException;
 					}
 				} else {

app/Controller/StatusController.php

Doc Comments +6 added lines

@@ -28,6 +28,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $data
+		 */
 		protected function _statusAsEventStream($data) {
 			// time in ms to next request
 			$_retry = '10000';
@@ -40,6 +43,9 @@ 
 			return $_out;
 		}
 
+		/**
+		 * @param string $data
+		 */
 		protected function _statusAsJson($data) {
 			if ($this->request->is('ajax') === false) {
 				throw new BadRequestException();

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			$this->response->disableCache();
 			$_out = '';
 			$_out .= "retry: $_retry\n";
-			$_out .= 'data: ' . $data . "\n\n";
+			$_out .= 'data: '.$data."\n\n";
 			return $_out;
 		}