Schlaefer / Saito

app/Lib/Saito/Cache/ItemCache.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
 
 		protected $_updated = false;
 
+		/**
+		 * @param string $name
+		 */
 		public function __construct($name, SaitoCacheEngineInterface $CacheEngine = null, $options = []) {
 			$this->_settings = $options + $this->_settings;
 			$this->_now = time();

Spacing +3 added lines, -3 removed lines

@@ -48,8 +48,8 @@ 
 
 			if ($this->_settings['maxItems']) {
 				$this->_gcFuzzy = $this->_settings['maxItemsFuzzy'];
-				$this->_gcMax = (int)($this->_settings['maxItems'] * (1 + $this->_gcFuzzy));
-				$this->_gcMin = (int)($this->_gcMax * (1 - $this->_gcFuzzy));
+				$this->_gcMax = (int) ($this->_settings['maxItems'] * (1 + $this->_gcFuzzy));
+				$this->_gcMin = (int) ($this->_gcMax * (1 - $this->_gcFuzzy));
 			}
 		}
 
@@ -193,7 +193,7 @@ 
 		 */
 		protected function _sort() {
 			// keep items which were last used/updated
-			uasort($this->_cache, function ($a, $b) {
+			uasort($this->_cache, function($a, $b) {
 				if ($a['metadata']['content_last_updated'] === $b['metadata']['content_last_updated']) {
 					return 0;
 				}

app/Lib/Saito/Posting/Decorator/UserPostingTrait.php

Doc Comments +7 added lines, -2 removed lines

@@ -8,10 +8,16 @@ 
 
 		protected $_CU;
 
+		/**
+		 * @return \Saito\User\ForumsUserInterface
+		 */
 		public function getCurrentUser() {
 			return $this->_CU;
 		}
 
+		/**
+		 * @param \Saito\User\ForumsUserInterface $CU
+		 */
 		public function setCurrentUser($CU) {
 			$this->_CU = $CU;
 		}
@@ -19,8 +25,7 @@ 
 		/**
 		 * Checks if answering an entry is allowed
 		 *
-		 * @param array $entry
-		 * @return boolean
+		 * @return string|false
 		 */
 		public function isAnsweringForbidden() {
 			if ($this->isLocked()) {

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 			$timeLimit = (\Configure::read('Saito.Settings.edit_period') * 60) + strtotime($posting->get('time'));
 			$isOverTimeLimit = time() > $timeLimit;
 
-			$isUsersPosting = (int)$User->getId() === (int)$posting->get('user_id');
+			$isUsersPosting = (int) $User->getId() === (int) $posting->get('user_id');
 
 			if ($User->isMod()) {
 				// Mods
@@ -123,7 +123,7 @@ 
 		 */
 		public function hasNewAnswers() {
 			if (!$this->isRoot()) {
-				throw new \RuntimeException('Posting with id ' . $this->get('id') . ' is no root posting.');
+				throw new \RuntimeException('Posting with id '.$this->get('id').' is no root posting.');
 			}
 			if (!isset($this->_CU['last_refresh'])) {
 				return false;

app/Lib/Saito/Test/ControllerTestCase.php

Doc Comments +3 added lines

@@ -63,6 +63,9 @@
 			}
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		protected function _loginUser($id) {
 			// see: http://stackoverflow.com/a/10411128/1372085
 			$this->_logoutUser();

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		public function assertRedirectedTo($url = '') {
 			$this->assertEquals(
 				$this->headers['Location'],
-				\Router::fullBaseUrl() . $this->controller->request->webroot . $url
+				\Router::fullBaseUrl().$this->controller->request->webroot.$url
 			);
 		}
 

app/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php

Doc Comments +3 added lines

@@ -76,6 +76,9 @@
 			return $out;
 		}
 
+		/**
+		 * @param \Saito\Posting\PostingInterface $node
+		 */
 		protected function _renderThreadLine($node, array $posting, $level) {
 			$id = $posting['Entry']['id'];
 			$useLineCache = $level > 0 && $this->_LineCache;

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 				$categoryId = $posting['Category']['id'];
 				if (!isset(self::$_catL10n[$categoryId])) {
 					$accession = $posting['Category']['accession'];
-					$catAcs = h(__d('nondynamic', 'category_acs_' . $accession . '_exp'));
+					$catAcs = h(__d('nondynamic', 'category_acs_'.$accession.'_exp'));
 					$catDesc = h($posting['Category']['description']);
 					$catTitle = h($posting['Category']['category']);
 					$category = <<<EOF

app/Lib/Saito/User/Cookie/CurrentUserCookie.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
 
 		protected $_Cookie;
 
+		/**
+		 * @param \CurrentUserComponent $CurrentUser
+		 */
 		public function write($CurrentUser) {
 			$cookie = [
 				'id' => $CurrentUser->getId(),

app/Lib/Saito/User/LastRefresh/LastRefreshAbstract.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		 * is last refresh newer than $timestamp
 		 *
 		 * @param mixed $timestamp int unix-timestamp or date as string
-		 * @return mixed bool or null if not determinable
+		 * @return null|boolean bool or null if not determinable
 		 */
 		public function isNewerThan($timestamp) {
 			if (is_string($timestamp)) {

app/Model/AppModel.php

Doc Comments +5 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 		 * Increments value of a field
 		 *
 		 * @param $id
-		 * @param $field
+		 * @param string $field
 		 * @param int $amount
 		 * @throws InvalidArgumentException
 		 */
@@ -197,6 +197,9 @@ 
 			$this->dispatchSaitoEvent($event, $data);
 		}
 
+		/**
+		 * @param string $event
+		 */
 		public function dispatchSaitoEvent($event, $data) {
 			if (!$this->_SEM) {
 				$this->_SEM = SaitoEventManager::getInstance();
@@ -225,7 +228,7 @@ 
 		 *
 		 * falls back to local definition if available
 		 *
-		 * @param $name
+		 * @param string $name
 		 * @return mixed
 		 * @throws UnexpectedValueException
 		 */

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
 
 		public function requireFields(&$data, array $required) {
 			return $this->_mapFields($data, $required,
-				function (&$data, $model, $field) {
+				function(&$data, $model, $field) {
 					if (!isset($data[$model][$field])) {
 						return false;
 					}
@@ -84,7 +84,7 @@ 
 
 		public function unsetFields(&$data, array $unset = ['id']) {
 			return $this->_mapFields($data, $unset,
-				function (&$data, $model, $field) {
+				function(&$data, $model, $field) {
 					if (isset($data[$model][$field])) {
 						unset($data[$model][$field]);
 					}
@@ -138,9 +138,9 @@ 
 				$operator = '-';
 				$amount *= -1;
 			}
-			$field = $this->alias . '.' . $field;
+			$field = $this->alias.'.'.$field;
 			$this->updateAll([$field => "$field $operator $amount"],
-				[$this->alias . '.id' => $id]);
+				[$this->alias.'.id' => $id]);
 		}
 
 		public function pipeMerger(array $data) {
@@ -213,7 +213,7 @@ 
 		protected static function _anonymizeIp($ip) {
 			$strlen = strlen($ip);
 			if ($strlen > 6) :
-				$divider = (int)floor($strlen / 4) + 1;
+				$divider = (int) floor($strlen / 4) + 1;
 				$ip = substr_replace($ip, '…', $divider, $strlen - (2 * $divider));
 			endif;
 
@@ -230,7 +230,7 @@ 
 		 * @throws UnexpectedValueException
 		 */
 		protected function _setting($name) {
-			$setting = Configure::read('Saito.Settings.' . $name);
+			$setting = Configure::read('Saito.Settings.'.$name);
 			if ($setting !== null) {
 				return $setting;
 			}

app/Model/Bookmark.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
 
 /**
  *
- * @param int $entry_id
- * @param int $user_id
+ * @param int $entryId
+ * @param int $userId
  * @return bool
  */
 		public function isBookmarked($entryId, $userId) {

Spacing +4 added lines, -4 removed lines

@@ -70,8 +70,8 @@ 
 
 		public function validateUniqueBookmark() {
 			$fields = array(
-				$this->alias . '.user_id' => $this->data['Bookmark']['user_id'],
-				$this->alias . '.entry_id' => $this->data['Bookmark']['entry_id'],
+				$this->alias.'.user_id' => $this->data['Bookmark']['user_id'],
+				$this->alias.'.entry_id' => $this->data['Bookmark']['entry_id'],
 			);
 			return $this->isUnique($fields, false);
 		}
@@ -88,8 +88,8 @@ 
 				array(
 					'contain' => false,
 					'conditions' => array(
-						$this->alias . '.entry_id' => $entryId,
-						$this->alias . '.user_id' => $userId,
+						$this->alias.'.entry_id' => $entryId,
+						$this->alias.'.user_id' => $userId,
 					)
 				)
 			);

app/Model/Entry.php

Doc Comments +1 added lines, -1 removed lines

@@ -518,7 +518,7 @@
 		/**
 		 * trees for multiple tids
 		 *
-		 * @param $ids
+		 * @param integer[] $ids
 		 * @param null $order
 		 * @param null $fieldlist
 		 * @return array|bool false if no threads or array with Posting

Spacing +13 added lines, -13 removed lines

@@ -211,7 +211,7 @@ 
 				'category_id' => $User->Categories->getAllowed()
 			];
 
-			$_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
+			$_cacheKey = 'Entry.recentEntries-'.md5(serialize($options));
 			$_cachedEntry = Cache::read($_cacheKey, 'entries');
 			if ($_cachedEntry) {
 				Stopwatch::stop('Model->User->getRecentEntries()');
@@ -261,7 +261,7 @@ 
 				]
 			);
 			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+				throw new UnexpectedValueException('Posting not found. Posting-Id: '.$id);
 			}
 			return $entry['Entry']['tid'];
 		}
@@ -271,7 +271,7 @@ 
  */
 		public function get($id) {
 			return $this->find('entry',
-					['conditions' => [$this->alias . '.id' => $id]]);
+					['conditions' => [$this->alias.'.id' => $id]]);
 		}
 
 /**
@@ -290,7 +290,7 @@ 
 				]
 			);
 			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+				throw new UnexpectedValueException('Posting not found. Posting-Id: '.$id);
 			}
 			return $entry['Entry']['pid'];
 		}
@@ -508,7 +508,7 @@ 
 
 			$tree = $this->treesForThreads([$tid], null, $fields);
 
-			if ((int)$tid !== (int)$id) {
+			if ((int) $tid !== (int) $id) {
 				$tree = $this->treeGetSubtree($tree, $id);
 			}
 
@@ -551,7 +551,7 @@ 
 				$threads = [];
 				$entries = $this->treeBuild($entries);
 				foreach ($entries as $thread) {
-					$id = (int)$thread['Entry']['tid'];
+					$id = (int) $thread['Entry']['tid'];
 					$threads[$id] = $thread;
 				}
 			}
@@ -607,7 +607,7 @@ 
 			}
 
 			$root = $this->get($entry['Entry']['tid']);
-			if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
+			if ((int) $root['User']['id'] !== $this->CurrentUser->getId()) {
 				throw new ForbiddenException;
 			}
 
@@ -691,7 +691,7 @@ 
 
 			$_idsToDelete = $this->getIdsForNode($id);
 			$success = $this->deleteAll(
-				[$this->alias . '.id' => $_idsToDelete],
+				[$this->alias.'.id' => $_idsToDelete],
 				true,
 				true
 			);
@@ -723,8 +723,8 @@ 
  */
 		public function getIdsForNode($id) {
 			$subthread = $this->treeForNode($id);
-			$func = function (&$tree, &$entry) {
-				$tree['ids'][] = (int)$entry['Entry']['id'];
+			$func = function(&$tree, &$entry) {
+				$tree['ids'][] = (int) $entry['Entry']['id'];
 			};
 			Entry::mapTreeElements($subthread, $func);
 			sort($subthread['ids']);
@@ -841,7 +841,7 @@ 
 				}
 
 				// propagate pinned property from target to source
-				$isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
+				$isTargetPinned = (bool) $targetEntry[$this->alias]['locked'];
 				if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
 					$this->id = $targetEntry[$this->alias]['tid'];
 					$this->_threadLock($isTargetPinned);
@@ -1036,8 +1036,8 @@ 
 				$oldEntry = $this->find('first',
 					['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
 
-				if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
-					$categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
+				if ($oldEntry && (int) $oldEntry[$this->alias]['pid'] === 0) {
+					$categoryChanged = (int) $this->data[$this->alias]['category_id'] !== (int) $oldEntry[$this->alias]['category_id'];
 					if ($categoryChanged) {
 						$success = $success && $this->_threadChangeCategory(
 								$oldEntry[$this->alias]['tid'],