Schlaefer / Saito

app/Lib/Saito/Cache/CacheSupport.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 		public function __construct() {
 			foreach ($this->_buildInCaches as $_name) {
-				$name = 'Saito\Cache\\' . $_name;
+				$name = 'Saito\Cache\\'.$_name;
 				$this->add(new $name);
 			}
 			\CakeEventManager::instance()->attach($this);

Indentation +169 added lines, -169 removed lines

@@ -1,174 +1,174 @@
 <?php
 
-	namespace Saito\Cache;
-
-	\App::uses('CakeEvent', 'Event');
-	\App::uses('CakeEventListener', 'Event');
-
-	class CacheSupport extends \Object implements \CakeEventListener {
-
-		protected $_Caches = [];
-
-		protected $_buildInCaches = [
-			// php caches
-			'ApcCacheSupportCachelet',
-			'OpCacheSupportCachelet',
-			// application caches
-			'EntriesCacheSupportCachelet',
-			'CakeCacheSupportCachelet',
-			'SaitoCacheSupportCachelet',
-		];
-
-		protected $_metaKeys = [
-			'Thread' => ['EntriesCache', 'LineCache']
-		];
-
-		public function __construct() {
-			foreach ($this->_buildInCaches as $_name) {
-				$name = 'Saito\Cache\\' . $_name;
-				$this->add(new $name);
-			}
-			\CakeEventManager::instance()->attach($this);
-		}
-
-		public function implementedEvents() {
-			return ['Cmd.Cache.clear' => 'onClear'];
-		}
-
-		/**
-		 * Clears out cache by name in $event['cache'];
-		 *
-		 * @param $event
-		 */
-		public function onClear($event) {
-			$cache = $event->data['cache'];
-			$id = isset($event->data['id']) ? $event->data['id'] : null;
-			$this->clear($cache, $id);
-		}
-
-		/**
-		 * @param mixed	$cache cache to clear
-		 * 				null: all
-		 * 				string: name of specific cache
-		 * 				array: multiple name strings
-		 * @param null $id
-		 */
-		public function clear($cache = null, $id = null) {
-			if (is_string($cache) && isset($this->_metaKeys[$cache])) {
-				$cache = $this->_metaKeys[$cache];
-			}
-			if (is_array($cache)) {
-				foreach ($cache as $_c) {
-					$this->clear($_c, $id);
-				}
-				return;
-			}
-			if ($cache === null) {
-				foreach ($this->_Caches as $_Cache) {
-					$_Cache->clear();
-				}
-			} else {
-				if (isset($this->_Caches[$cache])) {
-					$this->_Caches[$cache]->clear($id);
-				}
-			}
-		}
-
-		public function add(CacheSupportCacheletInterface $cache, $id = null) {
-			if ($id === null) {
-				$id = $cache->getId();
-			}
-			if (!isset($this->_Caches[$id])) {
-				$this->_Caches[$id] = $cache;
-			}
-		}
-
-	}
-
-	interface CacheSupportCacheletInterface {
-
-		public function clear($id = null);
-
-		public function getId();
-
-	}
-
-	class SaitoCacheSupportCachelet extends CacheSupportCachelet {
-
-		public function clear($id = null) {
-			\Cache::clear(false, 'default');
-			\Cache::clear(false, 'short');
-		}
-
-	}
-
-	class ApcCacheSupportCachelet extends CacheSupportCachelet {
-
-		public function clear($id = null) {
-			if (function_exists('apc_store')) {
-				apc_clear_cache();
-				apc_clear_cache('user');
-				apc_clear_cache('opcode');
-			}
-		}
-
-	}
-
-	class OpCacheSupportCachelet extends CacheSupportCachelet {
-
-		public function clear($id = null) {
-			if (function_exists('opcache_reset')) {
-				opcache_reset();
-			}
-		}
-
-	}
-
-	class CakeCacheSupportCachelet extends CacheSupportCachelet {
-
-		protected $_title = 'Cake';
-
-		public function clear($id = null) {
-			\Cache::clearGroup('persistent');
-			\Cache::clearGroup('models');
-			\Cache::clearGroup('views');
-		}
-
-	}
-
-	class EntriesCacheSupportCachelet extends CacheSupportCachelet implements \CakeEventListener {
-
-		// only rename if you rename event cmds triggering this cache
-		protected $_title = 'EntriesCache';
-
-		protected $_CacheTree;
-
-		public function __construct() {
-			\CakeEventManager::instance()->attach($this);
-		}
-
-		public function implementedEvents() {
-			return [
-				'Model.Thread.change' => 'onThreadChanged',
-				'Model.Entry.replyToEntry' => 'onEntryChanged',
-				'Model.Entry.update' => 'onEntryChanged'
-			];
-		}
-
-		public function onThreadChanged($event) {
-			$this->clear();
-		}
+    namespace Saito\Cache;
+
+    \App::uses('CakeEvent', 'Event');
+    \App::uses('CakeEventListener', 'Event');
+
+    class CacheSupport extends \Object implements \CakeEventListener {
+
+        protected $_Caches = [];
+
+        protected $_buildInCaches = [
+            // php caches
+            'ApcCacheSupportCachelet',
+            'OpCacheSupportCachelet',
+            // application caches
+            'EntriesCacheSupportCachelet',
+            'CakeCacheSupportCachelet',
+            'SaitoCacheSupportCachelet',
+        ];
+
+        protected $_metaKeys = [
+            'Thread' => ['EntriesCache', 'LineCache']
+        ];
+
+        public function __construct() {
+            foreach ($this->_buildInCaches as $_name) {
+                $name = 'Saito\Cache\\' . $_name;
+                $this->add(new $name);
+            }
+            \CakeEventManager::instance()->attach($this);
+        }
+
+        public function implementedEvents() {
+            return ['Cmd.Cache.clear' => 'onClear'];
+        }
+
+        /**
+         * Clears out cache by name in $event['cache'];
+         *
+         * @param $event
+         */
+        public function onClear($event) {
+            $cache = $event->data['cache'];
+            $id = isset($event->data['id']) ? $event->data['id'] : null;
+            $this->clear($cache, $id);
+        }
+
+        /**
+         * @param mixed	$cache cache to clear
+         * 				null: all
+         * 				string: name of specific cache
+         * 				array: multiple name strings
+         * @param null $id
+         */
+        public function clear($cache = null, $id = null) {
+            if (is_string($cache) && isset($this->_metaKeys[$cache])) {
+                $cache = $this->_metaKeys[$cache];
+            }
+            if (is_array($cache)) {
+                foreach ($cache as $_c) {
+                    $this->clear($_c, $id);
+                }
+                return;
+            }
+            if ($cache === null) {
+                foreach ($this->_Caches as $_Cache) {
+                    $_Cache->clear();
+                }
+            } else {
+                if (isset($this->_Caches[$cache])) {
+                    $this->_Caches[$cache]->clear($id);
+                }
+            }
+        }
+
+        public function add(CacheSupportCacheletInterface $cache, $id = null) {
+            if ($id === null) {
+                $id = $cache->getId();
+            }
+            if (!isset($this->_Caches[$id])) {
+                $this->_Caches[$id] = $cache;
+            }
+        }
+
+    }
+
+    interface CacheSupportCacheletInterface {
+
+        public function clear($id = null);
+
+        public function getId();
+
+    }
+
+    class SaitoCacheSupportCachelet extends CacheSupportCachelet {
+
+        public function clear($id = null) {
+            \Cache::clear(false, 'default');
+            \Cache::clear(false, 'short');
+        }
+
+    }
+
+    class ApcCacheSupportCachelet extends CacheSupportCachelet {
+
+        public function clear($id = null) {
+            if (function_exists('apc_store')) {
+                apc_clear_cache();
+                apc_clear_cache('user');
+                apc_clear_cache('opcode');
+            }
+        }
+
+    }
+
+    class OpCacheSupportCachelet extends CacheSupportCachelet {
+
+        public function clear($id = null) {
+            if (function_exists('opcache_reset')) {
+                opcache_reset();
+            }
+        }
+
+    }
+
+    class CakeCacheSupportCachelet extends CacheSupportCachelet {
+
+        protected $_title = 'Cake';
+
+        public function clear($id = null) {
+            \Cache::clearGroup('persistent');
+            \Cache::clearGroup('models');
+            \Cache::clearGroup('views');
+        }
+
+    }
+
+    class EntriesCacheSupportCachelet extends CacheSupportCachelet implements \CakeEventListener {
+
+        // only rename if you rename event cmds triggering this cache
+        protected $_title = 'EntriesCache';
+
+        protected $_CacheTree;
+
+        public function __construct() {
+            \CakeEventManager::instance()->attach($this);
+        }
+
+        public function implementedEvents() {
+            return [
+                'Model.Thread.change' => 'onThreadChanged',
+                'Model.Entry.replyToEntry' => 'onEntryChanged',
+                'Model.Entry.update' => 'onEntryChanged'
+            ];
+        }
+
+        public function onThreadChanged($event) {
+            $this->clear();
+        }
 
-		/**
-		 * @param $event
-		 * @throws InvalidArgumentException
-		 */
-		public function onEntryChanged($event) {
-			$this->clear();
-		}
+        /**
+         * @param $event
+         * @throws InvalidArgumentException
+         */
+        public function onEntryChanged($event) {
+            $this->clear();
+        }
 
-		public function clear($id = null) {
-			\Cache::clearGroup('entries', 'entries');
-		}
+        public function clear($id = null) {
+            \Cache::clearGroup('entries', 'entries');
+        }
 
-	}
+    }

app/Lib/Saito/String/Properize.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 			if ($language === null) {
 				$language = static::$_lang;
 			}
-			$_method = '_properize' . ucfirst($language);
+			$_method = '_properize'.ucfirst($language);
 			if (!method_exists(get_class(), $_method)) {
 				throw new \InvalidArgumentException("Properize: unknown language '$language'");
 			}
@@ -33,7 +33,7 @@ 
 			if (isset($apo[mb_substr($string, -1)])) {
 				$suffix = '’';
 			}
-			return $string . $suffix;
+			return $string.$suffix;
 		}
 
 		protected static function _properizeDeu($string) {
@@ -48,7 +48,7 @@ 
 				$suffix = '’';
 			}
 
-			return $string . $suffix;
+			return $string.$suffix;
 		}
 
 	}
\ No newline at end of file

Indentation +52 added lines, -52 removed lines

@@ -1,54 +1,54 @@
 <?php
 
-	namespace Saito\String;
-
-	class Properize {
-
-		static protected $_lang;
-
-		public static function setLanguage($lang) {
-			static::$_lang = $lang;
-		}
-
-		/**
-		 * @param $string word to properize
-		 * @param string $language
-		 * @throws \InvalidArgumentException
-		 * @return mixed $string
-		 */
-		public static function prop($string, $language = null) {
-			if ($language === null) {
-				$language = static::$_lang;
-			}
-			$_method = '_properize' . ucfirst($language);
-			if (!method_exists(get_class(), $_method)) {
-				throw new \InvalidArgumentException("Properize: unknown language '$language'");
-			}
-			return static::$_method($string);
-		}
-
-		protected static function _properizeEng($string) {
-			$suffix = '’s';
-			$apo = ['S' => 1, 's' => 1];
-			if (isset($apo[mb_substr($string, -1)])) {
-				$suffix = '’';
-			}
-			return $string . $suffix;
-		}
-
-		protected static function _properizeDeu($string) {
-			$suffix = 's';
-			$apo = ['S' => 1, 's' => 1, 'ß' => 1, 'x' => 1, 'z' => 1];
-
-			if (isset($apo[mb_substr($string, -1)])) {
-				// Hans’ Tante
-				$suffix = '’';
-			} elseif ('ce' === (mb_substr($string, -2))) {
-				// Alice’ Tante
-				$suffix = '’';
-			}
-
-			return $string . $suffix;
-		}
-
-	}
\ No newline at end of file
+    namespace Saito\String;
+
+    class Properize {
+
+        static protected $_lang;
+
+        public static function setLanguage($lang) {
+            static::$_lang = $lang;
+        }
+
+        /**
+         * @param $string word to properize
+         * @param string $language
+         * @throws \InvalidArgumentException
+         * @return mixed $string
+         */
+        public static function prop($string, $language = null) {
+            if ($language === null) {
+                $language = static::$_lang;
+            }
+            $_method = '_properize' . ucfirst($language);
+            if (!method_exists(get_class(), $_method)) {
+                throw new \InvalidArgumentException("Properize: unknown language '$language'");
+            }
+            return static::$_method($string);
+        }
+
+        protected static function _properizeEng($string) {
+            $suffix = '’s';
+            $apo = ['S' => 1, 's' => 1];
+            if (isset($apo[mb_substr($string, -1)])) {
+                $suffix = '’';
+            }
+            return $string . $suffix;
+        }
+
+        protected static function _properizeDeu($string) {
+            $suffix = 's';
+            $apo = ['S' => 1, 's' => 1, 'ß' => 1, 'x' => 1, 'z' => 1];
+
+            if (isset($apo[mb_substr($string, -1)])) {
+                // Hans’ Tante
+                $suffix = '’';
+            } elseif ('ce' === (mb_substr($string, -2))) {
+                // Alice’ Tante
+                $suffix = '’';
+            }
+
+            return $string . $suffix;
+        }
+
+    }
\ No newline at end of file

app/Lib/Saito/SimpleSearchString.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 		}
 
 		public function getOmittedWords() {
-			$filter = function ($word) {
+			$filter = function($word) {
 				return mb_strlen($word) < $this->_length;
 			};
 			$string = preg_replace('/(".*")/', '', $this->_string);
@@ -74,7 +74,7 @@ 
 				if (mb_strpos($word, '-') === false) {
 					continue;
 				}
-				$string = str_replace($word, '"' . $word . '"', $string);
+				$string = str_replace($word, '"'.$word.'"', $string);
 			}
 			return $string;
 		}

Indentation +68 added lines, -68 removed lines

@@ -1,82 +1,82 @@
 <?php
 
-	namespace Saito;
+    namespace Saito;
 
-	class SimpleSearchString {
+    class SimpleSearchString {
 
-		protected $_length = 4;
+        protected $_length = 4;
 
-		protected $_operators = '+-';
+        protected $_operators = '+-';
 
-		protected $_string;
+        protected $_string;
 
-		public function __construct($string, $length = null) {
-			$this->_string = $string;
-			if ($length) {
-				$this->_length = $length;
-			}
-		}
+        public function __construct($string, $length = null) {
+            $this->_string = $string;
+            if ($length) {
+                $this->_length = $length;
+            }
+        }
 
-		/**
-		 * @param mixed $string
-		 */
-		public function setString($string) {
-			$this->_string = $string;
-		}
+        /**
+         * @param mixed $string
+         */
+        public function setString($string) {
+            $this->_string = $string;
+        }
 
-		/**
-		 * Checks if search words have minimal word length
-		 */
-		public function validateLength() {
-			if (empty($this->_string)) {
-				return false;
-			}
-			return strlen($this->getOmittedWords()) === 0;
-		}
+        /**
+         * Checks if search words have minimal word length
+         */
+        public function validateLength() {
+            if (empty($this->_string)) {
+                return false;
+            }
+            return strlen($this->getOmittedWords()) === 0;
+        }
 
-		public function getOmittedWords() {
-			$filter = function ($word) {
-				return mb_strlen($word) < $this->_length;
-			};
-			$string = preg_replace('/(".*")/', '', $this->_string);
-			$words = $this->_split($string);
-			$result = array_filter($words, $filter);
-			return implode(' ', $result);
-		}
+        public function getOmittedWords() {
+            $filter = function ($word) {
+                return mb_strlen($word) < $this->_length;
+            };
+            $string = preg_replace('/(".*")/', '', $this->_string);
+            $words = $this->_split($string);
+            $result = array_filter($words, $filter);
+            return implode(' ', $result);
+        }
 
-		protected function _split($string) {
-			return preg_split("/(^|\s+)[{$this->_operators}]?/", $string, -1,
-				PREG_SPLIT_NO_EMPTY);
-		}
+        protected function _split($string) {
+            return preg_split("/(^|\s+)[{$this->_operators}]?/", $string, -1,
+                PREG_SPLIT_NO_EMPTY);
+        }
 
-		/**
-		 * replaces whitespace with '+'
-		 *
-		 * whitespace should imply AND (not OR)
-		 *
-		 * @return string
-		 */
-		public function replaceOperators() {
-			$string = $this->_fulltextHyphenFix($this->_string);
-			return ltrim(preg_replace('/(^|\s)(?![-+><])/i', ' +', $string));
-		}
+        /**
+         * replaces whitespace with '+'
+         *
+         * whitespace should imply AND (not OR)
+         *
+         * @return string
+         */
+        public function replaceOperators() {
+            $string = $this->_fulltextHyphenFix($this->_string);
+            return ltrim(preg_replace('/(^|\s)(?![-+><])/i', ' +', $string));
+        }
 
-		/**
-		 * @see: http://bugs.mysql.com/bug.php?id=2095
-		 */
-		protected function _fulltextHyphenFix($string) {
-			$words = $this->_split($string);
-			foreach ($words as $word) {
-				$first = mb_substr($word, 0, 1);
-				if ($first === '"') {
-					continue;
-				}
-				if (mb_strpos($word, '-') === false) {
-					continue;
-				}
-				$string = str_replace($word, '"' . $word . '"', $string);
-			}
-			return $string;
-		}
+        /**
+         * @see: http://bugs.mysql.com/bug.php?id=2095
+         */
+        protected function _fulltextHyphenFix($string) {
+            $words = $this->_split($string);
+            foreach ($words as $word) {
+                $first = mb_substr($word, 0, 1);
+                if ($first === '"') {
+                    continue;
+                }
+                if (mb_strpos($word, '-') === false) {
+                    continue;
+                }
+                $string = str_replace($word, '"' . $word . '"', $string);
+            }
+            return $string;
+        }
 
-	}
+    }

app/Lib/Saito/Posting/Renderer/HelperTrait.php

Spacing +5 added lines, -5 removed lines

@@ -12,10 +12,10 @@ 
 		public function getBadges(\Saito\Posting\PostingInterface $entry) {
 			$out = '';
 			if ($entry->isPinned()) {
-				$out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> ';
+				$out .= '<i class="fa fa-thumb-tack" title="'.__('fixed').'"></i> ';
 			}
 			// anchor for inserting solve-icon via FE-JS
-			$out .= '<span class="solves ' . $entry->get('id') . '">';
+			$out .= '<span class="solves '.$entry->get('id').'">';
 			if ($entry->get('solves')) {
 				$out .= $this->solvedBadge();
 			}
@@ -36,8 +36,8 @@ 
 		}
 
 		public function solvedBadge() {
-			return '<i class="fa fa-badge-solves solves-isSolved" title="' .
-			__('Helpful entry') . '"></i>';
+			return '<i class="fa fa-badge-solves solves-isSolved" title="'.
+			__('Helpful entry').'"></i>';
 		}
 
 		/**
@@ -49,7 +49,7 @@ 
 		 * @return string
 		 */
 		public function getSubject(\Saito\Posting\Posting $posting) {
-			return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : '');
+			return \h($posting->get('subject')).($posting->isNt() ? ' n/t' : '');
 		}
 
 	}
\ No newline at end of file

Indentation +53 added lines, -53 removed lines

@@ -1,55 +1,55 @@
 <?php
 
-	namespace Saito\Posting\Renderer;
-
-	\App::uses('SaitoEventManager', 'Lib/Saito/Event');
-
-	/**
-	 * Helper methods for rendering postings
-	 */
-	trait HelperTrait {
-
-		public function getBadges(\Saito\Posting\PostingInterface $entry) {
-			$out = '';
-			if ($entry->isPinned()) {
-				$out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> ';
-			}
-			// anchor for inserting solve-icon via FE-JS
-			$out .= '<span class="solves ' . $entry->get('id') . '">';
-			if ($entry->get('solves')) {
-				$out .= $this->solvedBadge();
-			}
-			$out .= '</span>';
-
-			if (!isset($this->_SEM)) {
-				$this->_SEM = \SaitoEventManager::getInstance();
-			}
-			$additionalBadges = $this->_SEM->dispatch(
-				'Request.Saito.View.Posting.badges',
-				['posting' => $entry->getRaw()]
-			);
-			if ($additionalBadges) {
-				$out .= implode('', $additionalBadges);
-			}
-
-			return $out;
-		}
-
-		public function solvedBadge() {
-			return '<i class="fa fa-badge-solves solves-isSolved" title="' .
-			__('Helpful entry') . '"></i>';
-		}
-
-		/**
-		 *
-		 * This function may be called serveral hundred times on the front page.
-		 * Don't make ist slow, benchmark!
-		 *
-		 * @param $posting
-		 * @return string
-		 */
-		public function getSubject(\Saito\Posting\Posting $posting) {
-			return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : '');
-		}
-
-	}
\ No newline at end of file
+    namespace Saito\Posting\Renderer;
+
+    \App::uses('SaitoEventManager', 'Lib/Saito/Event');
+
+    /**
+     * Helper methods for rendering postings
+     */
+    trait HelperTrait {
+
+        public function getBadges(\Saito\Posting\PostingInterface $entry) {
+            $out = '';
+            if ($entry->isPinned()) {
+                $out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> ';
+            }
+            // anchor for inserting solve-icon via FE-JS
+            $out .= '<span class="solves ' . $entry->get('id') . '">';
+            if ($entry->get('solves')) {
+                $out .= $this->solvedBadge();
+            }
+            $out .= '</span>';
+
+            if (!isset($this->_SEM)) {
+                $this->_SEM = \SaitoEventManager::getInstance();
+            }
+            $additionalBadges = $this->_SEM->dispatch(
+                'Request.Saito.View.Posting.badges',
+                ['posting' => $entry->getRaw()]
+            );
+            if ($additionalBadges) {
+                $out .= implode('', $additionalBadges);
+            }
+
+            return $out;
+        }
+
+        public function solvedBadge() {
+            return '<i class="fa fa-badge-solves solves-isSolved" title="' .
+            __('Helpful entry') . '"></i>';
+        }
+
+        /**
+         *
+         * This function may be called serveral hundred times on the front page.
+         * Don't make ist slow, benchmark!
+         *
+         * @param $posting
+         * @return string
+         */
+        public function getSubject(\Saito\Posting\Posting $posting) {
+            return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : '');
+        }
+
+    }
\ No newline at end of file

app/Lib/Saito/Posting/Posting.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
 
 		public function __construct(\Saito\User\ForumsUserInterface $CurrentUser, $rawData, array $options = [], $tree = null) {
 			$this->_rawData = $rawData;
-			$this->_rawData[self::ALIAS]['id'] = (int)$this->_rawData[self::ALIAS]['id'];
+			$this->_rawData[self::ALIAS]['id'] = (int) $this->_rawData[self::ALIAS]['id'];
 			if (isset($this->_rawData[self::ALIAS]['pid'])) {
-				$this->_rawData[self::ALIAS]['pid'] = (int)$this->_rawData[self::ALIAS]['pid'];
+				$this->_rawData[self::ALIAS]['pid'] = (int) $this->_rawData[self::ALIAS]['pid'];
 			}
 			if (isset($this->_rawData[self::ALIAS]['tid'])) {
-				$this->_rawData[self::ALIAS]['tid'] = (int)$this->_rawData[self::ALIAS]['tid'];
+				$this->_rawData[self::ALIAS]['tid'] = (int) $this->_rawData[self::ALIAS]['tid'];
 			}
 
 			$this->setCurrentUser($CurrentUser);

Indentation +123 added lines, -123 removed lines

@@ -1,126 +1,126 @@
 <?php
 
-	namespace Saito\Posting;
-
-	class Posting implements PostingInterface {
-
-		use Decorator\UserPostingTrait;
-
-		const ALIAS = 'Entry';
-
-		protected $_children = [];
-
-		protected $_level;
-
-		protected $_rawData;
-
-		protected $_Thread;
-
-		public function __construct(\Saito\User\ForumsUserInterface $CurrentUser, $rawData, array $options = [], $tree = null) {
-			$this->_rawData = $rawData;
-			$this->_rawData[self::ALIAS]['id'] = (int)$this->_rawData[self::ALIAS]['id'];
-			if (isset($this->_rawData[self::ALIAS]['pid'])) {
-				$this->_rawData[self::ALIAS]['pid'] = (int)$this->_rawData[self::ALIAS]['pid'];
-			}
-			if (isset($this->_rawData[self::ALIAS]['tid'])) {
-				$this->_rawData[self::ALIAS]['tid'] = (int)$this->_rawData[self::ALIAS]['tid'];
-			}
-
-			$this->setCurrentUser($CurrentUser);
-
-			$options += ['level' => 0];
-			$this->_level = $options['level'];
-
-			if (!$tree) {
-				$tree = new \Saito\Thread\Thread;
-			}
-			$this->_Thread = $tree;
-			$this->_Thread->add($this);
-
-			$this->_attachChildren();
-			return $this;
-		}
-
-		/**
-		 * @param $var
-		 * @return mixed
-		 * @throws \InvalidArgumentException
-		 */
-		public function get($var) {
-			switch ($var) {
-				case (isset($this->_rawData[self::ALIAS][$var])):
-					return $this->_rawData[self::ALIAS][$var];
-				case (isset($this->_rawData[$var])):
-					return $this->_rawData[$var];
-				// if key is set but null
-				case (array_key_exists($var, $this->_rawData[self::ALIAS])):
-					return $this->_rawData[self::ALIAS][$var];
-				default:
-					throw new \InvalidArgumentException("Attribute '$var' not found in class Posting.");
-			}
-		}
-
-		public function getLevel() {
-			return $this->_level;
-		}
-
-		public function getChildren() {
-			return $this->_children;
-		}
-
-		public function getRaw() {
-			return $this->_rawData;
-		}
-
-		public function getThread() {
-			return $this->_Thread;
-		}
-
-		public function hasAnswers() {
-			return count($this->_children) > 0;
-		}
-
-		public function isLocked() {
-				return $this->get('locked') != false;
-		}
-
-		/**
-		 * checks if entry is n/t
-		 *
-		 * @return bool
-		 */
-		public function isNt() {
-			return empty($this->_rawData[self::ALIAS]['text']);
-		}
-
-		public function isPinned() {
-			return $this->_rawData[self::ALIAS]['fixed'] == true;
-		}
-
-		public function isRoot() {
-			return $this->_rawData[self::ALIAS]['pid'] === 0;
-		}
-
-		public function addDecorator($fct) {
-			foreach ($this->_children as $key => $child) {
-				$newChild = $fct($child);
-				$newChild->addDecorator($fct);
-				$this->_children[$key] = $newChild;
-			}
-			$new = $fct($this);
-			// replace decorated object in Thread collection
-			$this->_Thread->add($new);
-			return $new;
-		}
-
-		protected function _attachChildren() {
-			if (isset($this->_rawData['_children'])) {
-				foreach ($this->_rawData['_children'] as $child) {
-					$this->_children[] = new Posting($this->getCurrentUser(), $child, ['level' => $this->_level + 1], $this->_Thread);
-				}
-			}
-			unset($this->_rawData['_children']);
-		}
-
-	}
+    namespace Saito\Posting;
+
+    class Posting implements PostingInterface {
+
+        use Decorator\UserPostingTrait;
+
+        const ALIAS = 'Entry';
+
+        protected $_children = [];
+
+        protected $_level;
+
+        protected $_rawData;
+
+        protected $_Thread;
+
+        public function __construct(\Saito\User\ForumsUserInterface $CurrentUser, $rawData, array $options = [], $tree = null) {
+            $this->_rawData = $rawData;
+            $this->_rawData[self::ALIAS]['id'] = (int)$this->_rawData[self::ALIAS]['id'];
+            if (isset($this->_rawData[self::ALIAS]['pid'])) {
+                $this->_rawData[self::ALIAS]['pid'] = (int)$this->_rawData[self::ALIAS]['pid'];
+            }
+            if (isset($this->_rawData[self::ALIAS]['tid'])) {
+                $this->_rawData[self::ALIAS]['tid'] = (int)$this->_rawData[self::ALIAS]['tid'];
+            }
+
+            $this->setCurrentUser($CurrentUser);
+
+            $options += ['level' => 0];
+            $this->_level = $options['level'];
+
+            if (!$tree) {
+                $tree = new \Saito\Thread\Thread;
+            }
+            $this->_Thread = $tree;
+            $this->_Thread->add($this);
+
+            $this->_attachChildren();
+            return $this;
+        }
+
+        /**
+         * @param $var
+         * @return mixed
+         * @throws \InvalidArgumentException
+         */
+        public function get($var) {
+            switch ($var) {
+                case (isset($this->_rawData[self::ALIAS][$var])):
+                    return $this->_rawData[self::ALIAS][$var];
+                case (isset($this->_rawData[$var])):
+                    return $this->_rawData[$var];
+                // if key is set but null
+                case (array_key_exists($var, $this->_rawData[self::ALIAS])):
+                    return $this->_rawData[self::ALIAS][$var];
+                default:
+                    throw new \InvalidArgumentException("Attribute '$var' not found in class Posting.");
+            }
+        }
+
+        public function getLevel() {
+            return $this->_level;
+        }
+
+        public function getChildren() {
+            return $this->_children;
+        }
+
+        public function getRaw() {
+            return $this->_rawData;
+        }
+
+        public function getThread() {
+            return $this->_Thread;
+        }
+
+        public function hasAnswers() {
+            return count($this->_children) > 0;
+        }
+
+        public function isLocked() {
+                return $this->get('locked') != false;
+        }
+
+        /**
+         * checks if entry is n/t
+         *
+         * @return bool
+         */
+        public function isNt() {
+            return empty($this->_rawData[self::ALIAS]['text']);
+        }
+
+        public function isPinned() {
+            return $this->_rawData[self::ALIAS]['fixed'] == true;
+        }
+
+        public function isRoot() {
+            return $this->_rawData[self::ALIAS]['pid'] === 0;
+        }
+
+        public function addDecorator($fct) {
+            foreach ($this->_children as $key => $child) {
+                $newChild = $fct($child);
+                $newChild->addDecorator($fct);
+                $this->_children[$key] = $newChild;
+            }
+            $new = $fct($this);
+            // replace decorated object in Thread collection
+            $this->_Thread->add($new);
+            return $new;
+        }
+
+        protected function _attachChildren() {
+            if (isset($this->_rawData['_children'])) {
+                foreach ($this->_rawData['_children'] as $child) {
+                    $this->_children[] = new Posting($this->getCurrentUser(), $child, ['level' => $this->_level + 1], $this->_Thread);
+                }
+            }
+            unset($this->_rawData['_children']);
+        }
+
+    }
 

app/Lib/Saito/Event/SaitoEventManager.php

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
 		}
 
 		public function cakeEventPassThrough($event) {
-			$data = ($event->data) ? : [];
+			$data = ($event->data) ?: [];
 			$data += ['subject' => $event->subject];
-			$name = 'Event.Saito.' . $event->name();
+			$name = 'Event.Saito.'.$event->name();
 			$this->dispatch($name, $data);
 		}
 

Indentation +76 added lines, -76 removed lines

@@ -1,89 +1,89 @@
 <?php
 
-	/**
-	 * Event-manager for Saito
-	 *
-	 * A thin event manager with maximum dispatch speed.  It's called a
-	 * few hundred times on the front-page and gives roughly 3x over
-	 * the CakeEventManager in Cake 2.
-	 */
-	class SaitoEventManager implements CakeEventListener {
+    /**
+     * Event-manager for Saito
+     *
+     * A thin event manager with maximum dispatch speed.  It's called a
+     * few hundred times on the front-page and gives roughly 3x over
+     * the CakeEventManager in Cake 2.
+     */
+    class SaitoEventManager implements CakeEventListener {
 
-		protected static $_Instance;
+        protected static $_Instance;
 
-		protected $_listeners = [];
+        protected $_listeners = [];
 
-		public static function getInstance() {
-			if (self::$_Instance === null) {
-				self::$_Instance = new SaitoEventManager();
-			}
-			return self::$_Instance;
-		}
+        public static function getInstance() {
+            if (self::$_Instance === null) {
+                self::$_Instance = new SaitoEventManager();
+            }
+            return self::$_Instance;
+        }
 
-		public function implementedEvents() {
-			return [
-				'Controller.initialize' => 'cakeEventPassThrough',
-				'View.beforeRender' => 'cakeEventPassThrough'
-			];
-		}
+        public function implementedEvents() {
+            return [
+                'Controller.initialize' => 'cakeEventPassThrough',
+                'View.beforeRender' => 'cakeEventPassThrough'
+            ];
+        }
 
-		public function cakeEventPassThrough($event) {
-			$data = ($event->data) ? : [];
-			$data += ['subject' => $event->subject];
-			$name = 'Event.Saito.' . $event->name();
-			$this->dispatch($name, $data);
-		}
+        public function cakeEventPassThrough($event) {
+            $data = ($event->data) ? : [];
+            $data += ['subject' => $event->subject];
+            $name = 'Event.Saito.' . $event->name();
+            $this->dispatch($name, $data);
+        }
 
-		/**
-		 * attaches event-listener
-		 *
-		 * @param string|SaitoEventListener $key
-		 * @param null $callable function if $key is set
-		 * @throws InvalidArgumentException
-		 */
-		public function attach($key, $callable = null) {
-			if ($key instanceof SaitoEventListener) {
-				foreach ($key->implementedSaitoEvents() as $eventKey => $callable) {
-					$this->attach($eventKey, [$key, $callable]);
-				}
-				return;
-			}
-			if (empty($key)) {
-				throw new InvalidArgumentException;
-			}
-			$this->_listeners[$key][] = [
-				'func' => $callable,
-				'type' => gettype($callable) === 'array' ? 'object' : 'closure'
-			];
-		}
+        /**
+         * attaches event-listener
+         *
+         * @param string|SaitoEventListener $key
+         * @param null $callable function if $key is set
+         * @throws InvalidArgumentException
+         */
+        public function attach($key, $callable = null) {
+            if ($key instanceof SaitoEventListener) {
+                foreach ($key->implementedSaitoEvents() as $eventKey => $callable) {
+                    $this->attach($eventKey, [$key, $callable]);
+                }
+                return;
+            }
+            if (empty($key)) {
+                throw new InvalidArgumentException;
+            }
+            $this->_listeners[$key][] = [
+                'func' => $callable,
+                'type' => gettype($callable) === 'array' ? 'object' : 'closure'
+            ];
+        }
 
-		/**
-		 * dispatches event
-		 *
-		 * @param string $key
-		 * @param array $data
-		 * @return array|null
-		 */
-		public function dispatch($key, $data = []) {
+        /**
+         * dispatches event
+         *
+         * @param string $key
+         * @param array $data
+         * @return array|null
+         */
+        public function dispatch($key, $data = []) {
 //			Stopwatch::start("SaitoEventManager::dispatch $key");
-			if (!isset($this->_listeners[$key])) {
+            if (!isset($this->_listeners[$key])) {
 //				Stopwatch::stop("SaitoEventManager::dispatch $key");
-				return [];
-			}
-			$results = [];
-			foreach ($this->_listeners[$key] as $listener) {
-				if ($listener['type'] === 'object') {
-					// faster than call_user_func
-					$result = $listener['func'][0]->{$listener['func'][1]}($data);
-				} else {
-					$result = $listener['func']($data);
-				}
-				if ($result !== null) {
-					$results[] = $result;
-				}
-			}
+                return [];
+            }
+            $results = [];
+            foreach ($this->_listeners[$key] as $listener) {
+                if ($listener['type'] === 'object') {
+                    // faster than call_user_func
+                    $result = $listener['func'][0]->{$listener['func'][1]}($data);
+                } else {
+                    $result = $listener['func']($data);
+                }
+                if ($result !== null) {
+                    $results[] = $result;
+                }
+            }
 //			Stopwatch::stop("SaitoEventManager::dispatch $key");
-			return $results;
-		}
+            return $results;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Lib/Saito/Test/AssertTrait.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		protected function _getDOMXPath($html) {
 			$document = new \DOMDocument;
 			libxml_use_internal_errors(true);
-			$document->loadHTML('<!DOCTYPE html>' . $html);
+			$document->loadHTML('<!DOCTYPE html>'.$html);
 			$xpath = new \DOMXPath($document);
 			libxml_clear_errors();
 			return $xpath;

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 			return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
 		}
 
+		/**
+		 * @param string $path
+		 */
 		public function assertNotXPath($html, $path) {
 			return !$this->assertXPath($html, $path, 0);
 		}

Indentation +27 added lines, -27 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-	namespace Saito\Test;
+    namespace Saito\Test;
 
-	trait AssertTrait {
+    trait AssertTrait {
 
-		/**
-		 * tests if XPath exists in HTML Source
-		 *
-		 * @param $html HTML
-		 * @param $path XPath
-		 * @param int $count how many times should XPath exist in HTML
-		 * @return mixed
-		 */
-		public function assertXPath($html, $path, $count = 1) {
-			$xpath = $this->_getDOMXPath($html);
-			$length = $xpath->query($path)->length;
-			return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
-		}
+        /**
+         * tests if XPath exists in HTML Source
+         *
+         * @param $html HTML
+         * @param $path XPath
+         * @param int $count how many times should XPath exist in HTML
+         * @return mixed
+         */
+        public function assertXPath($html, $path, $count = 1) {
+            $xpath = $this->_getDOMXPath($html);
+            $length = $xpath->query($path)->length;
+            return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
+        }
 
-		public function assertNotXPath($html, $path) {
-			return !$this->assertXPath($html, $path, 0);
-		}
+        public function assertNotXPath($html, $path) {
+            return !$this->assertXPath($html, $path, 0);
+        }
 
-		protected function _getDOMXPath($html) {
-			$document = new \DOMDocument;
-			libxml_use_internal_errors(true);
-			$document->loadHTML('<!DOCTYPE html>' . $html);
-			$xpath = new \DOMXPath($document);
-			libxml_clear_errors();
-			return $xpath;
-		}
+        protected function _getDOMXPath($html) {
+            $document = new \DOMDocument;
+            libxml_use_internal_errors(true);
+            $document->loadHTML('<!DOCTYPE html>' . $html);
+            $xpath = new \DOMXPath($document);
+            libxml_clear_errors();
+            return $xpath;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Lib/Saito/Test/ControllerTestCase.php

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
 			);
 		}
 

Doc Comments +9 added lines

@@ -48,6 +48,9 @@ 
 			unset($_ENV['HTTP_X_REQUESTED_WITH']);
 		}
 
+		/**
+		 * @param string $agent
+		 */
 		protected function _setUserAgent($agent) {
 			if (isset($this->_env['HTTP_USER_AGENT'])) {
 				$this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
@@ -63,6 +66,9 @@ 
 			}
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		protected function _loginUser($id) {
 			// see: http://stackoverflow.com/a/10411128/1372085
 			$this->_logoutUser();
@@ -100,6 +106,9 @@ 
 			endif;
 		}
 
+		/**
+		 * @param string $name
+		 */
 		protected function _notImplementedOnDatasource($name) {
 			$mc = $this->controller->modelClass;
 			$Ds = $this->controller->{$mc}->getDataSource();

Indentation +125 added lines, -125 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-	namespace Saito\Test;
+    namespace Saito\Test;
 
-	/*
+    /*
 	fixes early output in PHPUnit 3.7:
 
 		$this->printer->write(
@@ -11,128 +11,128 @@ 
 
 	that prevents session setting in HTML test-run
 	*/
-	ob_start();
-
-	// load fixture
-	\App::uses('UserFixture', 'Fixture');
-
-	// sets the FULL_BASE_URL for CLI tests
-	if (!defined('FULL_BASE_URL')) {
-		define('FULL_BASE_URL', 'http://cakephp.org/');
-	}
-	\Configure::write('App.fullBaseURL', FULL_BASE_URL);
-
-
-	class ControllerTestCase extends \ControllerTestCase {
-
-		use AssertTrait;
-
-		/**
-		 * @var array cache environment variables
-		 */
-		protected $_env = [];
-
-		protected function _setJson() {
-			$_SERVER['HTTP_ACCEPT'] = 'application/json, text/javascript';
-		}
-
-		protected function _unsetJson() {
-			$_SERVER['HTTP_ACCEPT'] = "text/html,application/xhtml+xml,application/xml";
-		}
-
-		protected function _setAjax() {
-			$_ENV['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
-		}
-
-		protected function _unsetAjax() {
-			unset($_ENV['HTTP_X_REQUESTED_WITH']);
-		}
-
-		protected function _setUserAgent($agent) {
-			if (isset($this->_env['HTTP_USER_AGENT'])) {
-				$this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
-			}
-			$_ENV['HTTP_USER_AGENT'] = $agent;
-		}
-
-		protected function _unsetUserAgent() {
-			if (isset($this->_env['HTTP_USER_AGENT'])) {
-				$_ENV['HTTP_USER_AGENT'] = $this->_env('HTTP_USER_AGENT');
-			} else {
-				unset($_ENV['HTTP_USER_AGENT']);
-			}
-		}
-
-		protected function _loginUser($id) {
-			// see: http://stackoverflow.com/a/10411128/1372085
-			$this->_logoutUser();
-			$userFixture = new \UserFixture();
-			$users = $userFixture->records;
-
-			$this->controller->Session->write('Auth.User', $users[$id - 1]);
-		}
-
-		protected function _debugEmail() {
-			\Configure::write('Saito.Debug.email', true);
-		}
-
-		protected function _resetEmail() {
-			\Configure::write('Saito.Debug.email', false);
-		}
-
-		public function assertRedirectedTo($url = '') {
-			$this->assertEquals(
-				$this->headers['Location'],
-				\Router::fullBaseUrl() . $this->controller->request->webroot . $url
-			);
-		}
-
-		protected function _logoutUser() {
-			// if user is logged-in it should interfere with test runs
-			if (isset($_COOKIE['SaitoPersistent'])) :
-				unset($_COOKIE['SaitoPersistent']);
-			endif;
-			if (isset($_COOKIE['Saito'])) :
-				unset($_COOKIE['Saito']);
-			endif;
-			if (isset($this->controller->Session) && !empty($this->controller->Session)) :
-				$this->controller->Session->delete('Auth.User');
-			endif;
-		}
-
-		protected function _notImplementedOnDatasource($name) {
-			$mc = $this->controller->modelClass;
-			$Ds = $this->controller->{$mc}->getDataSource();
-			$this->_DsName = get_class($Ds);
-			if ($this->_DsName === $name) {
-				$this->markTestIncomplete("Datasource is $name.");
-			}
-		}
-
-		public function endTest($method) {
-			parent::endTest($method);
-			$this->_logoutUser();
-			$this->_unsetAjax();
-		}
-
-		public function setUp() {
-			parent::setUp();
-			$this->_logoutUser();
-			$this->_unsetAjax();
-			$this->_unsetJson();
-			$this->_debugEmail();
-			\Configure::write('Cache.disable', true);
-			\Configure::write('Config.language', 'eng');
-		}
-
-		public function tearDown() {
-			\Configure::write('Cache.disable', false);
-			$this->_unsetUserAgent();
-			$this->_resetEmail();
-			$this->_logoutUser();
-			parent::tearDown();
-		}
-
-	}
+    ob_start();
+
+    // load fixture
+    \App::uses('UserFixture', 'Fixture');
+
+    // sets the FULL_BASE_URL for CLI tests
+    if (!defined('FULL_BASE_URL')) {
+        define('FULL_BASE_URL', 'http://cakephp.org/');
+    }
+    \Configure::write('App.fullBaseURL', FULL_BASE_URL);
+
+
+    class ControllerTestCase extends \ControllerTestCase {
+
+        use AssertTrait;
+
+        /**
+         * @var array cache environment variables
+         */
+        protected $_env = [];
+
+        protected function _setJson() {
+            $_SERVER['HTTP_ACCEPT'] = 'application/json, text/javascript';
+        }
+
+        protected function _unsetJson() {
+            $_SERVER['HTTP_ACCEPT'] = "text/html,application/xhtml+xml,application/xml";
+        }
+
+        protected function _setAjax() {
+            $_ENV['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+        }
+
+        protected function _unsetAjax() {
+            unset($_ENV['HTTP_X_REQUESTED_WITH']);
+        }
+
+        protected function _setUserAgent($agent) {
+            if (isset($this->_env['HTTP_USER_AGENT'])) {
+                $this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
+            }
+            $_ENV['HTTP_USER_AGENT'] = $agent;
+        }
+
+        protected function _unsetUserAgent() {
+            if (isset($this->_env['HTTP_USER_AGENT'])) {
+                $_ENV['HTTP_USER_AGENT'] = $this->_env('HTTP_USER_AGENT');
+            } else {
+                unset($_ENV['HTTP_USER_AGENT']);
+            }
+        }
+
+        protected function _loginUser($id) {
+            // see: http://stackoverflow.com/a/10411128/1372085
+            $this->_logoutUser();
+            $userFixture = new \UserFixture();
+            $users = $userFixture->records;
+
+            $this->controller->Session->write('Auth.User', $users[$id - 1]);
+        }
+
+        protected function _debugEmail() {
+            \Configure::write('Saito.Debug.email', true);
+        }
+
+        protected function _resetEmail() {
+            \Configure::write('Saito.Debug.email', false);
+        }
+
+        public function assertRedirectedTo($url = '') {
+            $this->assertEquals(
+                $this->headers['Location'],
+                \Router::fullBaseUrl() . $this->controller->request->webroot . $url
+            );
+        }
+
+        protected function _logoutUser() {
+            // if user is logged-in it should interfere with test runs
+            if (isset($_COOKIE['SaitoPersistent'])) :
+                unset($_COOKIE['SaitoPersistent']);
+            endif;
+            if (isset($_COOKIE['Saito'])) :
+                unset($_COOKIE['Saito']);
+            endif;
+            if (isset($this->controller->Session) && !empty($this->controller->Session)) :
+                $this->controller->Session->delete('Auth.User');
+            endif;
+        }
+
+        protected function _notImplementedOnDatasource($name) {
+            $mc = $this->controller->modelClass;
+            $Ds = $this->controller->{$mc}->getDataSource();
+            $this->_DsName = get_class($Ds);
+            if ($this->_DsName === $name) {
+                $this->markTestIncomplete("Datasource is $name.");
+            }
+        }
+
+        public function endTest($method) {
+            parent::endTest($method);
+            $this->_logoutUser();
+            $this->_unsetAjax();
+        }
+
+        public function setUp() {
+            parent::setUp();
+            $this->_logoutUser();
+            $this->_unsetAjax();
+            $this->_unsetJson();
+            $this->_debugEmail();
+            \Configure::write('Cache.disable', true);
+            \Configure::write('Config.language', 'eng');
+        }
+
+        public function tearDown() {
+            \Configure::write('Cache.disable', false);
+            $this->_unsetUserAgent();
+            $this->_resetEmail();
+            $this->_logoutUser();
+            parent::tearDown();
+        }
+
+    }
 
 

app/Lib/Saito/User/ReadPostings/ReadPostingsDatabase.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		}
 
 		protected function _registerGc(\CronComponent $Cron) {
-			$Cron->addCronJob('ReadUser.' . $this->_id(), 'hourly', [$this, 'gcUser']);
+			$Cron->addCronJob('ReadUser.'.$this->_id(), 'hourly', [$this, 'gcUser']);
 			$Cron->addCronJob('ReadUser.global', 'hourly', [$this, 'gcGlobal']);
 		}
 

Indentation +141 added lines, -141 removed lines

@@ -1,143 +1,143 @@
 <?php
 
-	namespace Saito\User\ReadPostings;
-
-	/**
-	 * Handles read postings by a server table. Used for logged-in users.
-	 */
-	class ReadPostingsDatabase extends ReadPostingsAbstract {
-
-		protected $_UserRead;
-
-		protected $_minPostingsToKeep;
-
-		public function __construct(\CurrentUserComponent $CurrentUser) {
-			parent::__construct($CurrentUser);
-			$this->_UserRead = $this->_CurrentUser->getModel()->UserRead;
-			$this->_registerGc($this->_CurrentUser->Cron);
-		}
-
-		/**
-		 * @throws InvalidArgumentException
-		 */
-		public function set($entries) {
-			\Stopwatch::start('ReadPostingsDatabase::set()');
-			if (!$this->_CurrentUser->isLoggedIn()) {
-				return;
-			}
-
-			$entries = $this->_preparePostings($entries);
-			if (empty($entries)) {
-				return;
-			}
-
-			$this->_UserRead->setEntriesForUser($entries, $this->_id());
-			\Stopwatch::stop('ReadPostingsDatabase::set()');
-		}
-
-		public function delete() {
-			$this->_UserRead->deleteAllFromUser($this->_id());
-		}
-
-		/**
-		 * calculates user quota of allowed entries in DB
-		 *
-		 * @return int
-		 * @throws \UnexpectedValueException
-		 */
-		protected function _minNPostingsToKeep() {
-			if ($this->_minPostingsToKeep) {
-				return $this->_minPostingsToKeep;
-			}
-			$threadsOnPage = \Configure::read('Saito.Settings.topics_per_page');
-			$postingsPerThread = \Configure::read('Saito.Globals.postingsPerThread');
-			$pagesToCache = 1.5;
-			$this->_minPostingsToKeep = intval($postingsPerThread * $threadsOnPage * $pagesToCache);
-			if (empty($this->_minPostingsToKeep)) {
-				throw new \UnexpectedValueException();
-			}
-			return $this->_minPostingsToKeep;
-		}
-
-		protected function _registerGc(\CronComponent $Cron) {
-			$Cron->addCronJob('ReadUser.' . $this->_id(), 'hourly', [$this, 'gcUser']);
-			$Cron->addCronJob('ReadUser.global', 'hourly', [$this, 'gcGlobal']);
-		}
-
-		/**
-		 * removes old data from non-active users
-		 *
-		 * should prevent entries of non returning users to stay forever in DB
-		 */
-		public function gcGlobal() {
-			$lastEntry = $this->_CurrentUser->getModel()->Entry->find('first',
-					[
-							'contain' => false,
-							'fields' => ['Entry.id'],
-							'order' => ['Entry.id' => 'DESC']
-					]);
-			if (!$lastEntry) {
-				return;
-			}
-			// @bogus why not getModel()->Entry->Category
-			$Category = \ClassRegistry::init('Category');
-			$nCategories = $Category->find('count');
-			$entriesToKeep = $nCategories * $this->_minNPostingsToKeep();
-			$lastEntryId = $lastEntry['Entry']['id'] - $entriesToKeep;
-			$this->_UserRead->deleteEntriesBefore($lastEntryId);
-		}
-
-		/**
-		 * removes old data from current users
-		 *
-		 * should prevent endless growing of DB if user never clicks the MAR-button
-		 */
-		public function gcUser() {
-			if (!$this->_CurrentUser->isLoggedIn()) {
-				return;
-			}
-
-			$entries = $this->_get();
-			$numberOfEntries = count($entries);
-			if ($numberOfEntries === 0) {
-				return;
-			}
-
-			$maxEntriesToKeep = $this->_minNPostingsToKeep();
-			if ($numberOfEntries <= $maxEntriesToKeep) {
-				return;
-			}
-
-			$entriesToDelete = $numberOfEntries - $maxEntriesToKeep;
-			// assign dummy var to prevent Strict notice on reference passing
-			$dummy = array_slice($entries, $entriesToDelete, 1);
-			$oldestIdToKeep = array_shift($dummy);
-			$this->_UserRead->deleteUserEntriesBefore($this->_id(), $oldestIdToKeep);
-
-			// all entries older than (and including) the deleted entries become
-			// old entries by updating the MAR-timestamp
-			$youngestDeletedEntry = $this->_CurrentUser->getModel()->Entry->find('first',
-					[
-							'contain' => false,
-							'conditions' => ['Entry.id' => $oldestIdToKeep],
-							'fields' => ['Entry.time']
-					]);
-			// can't use  $this->_CU->LastRefresh->set() because this would also
-			// delete all of this user's UserRead entries
-			$this->_CurrentUser->getModel()
-					->setLastRefresh($youngestDeletedEntry['Entry']['time']);
-		}
-
-		protected function _get() {
-			if ($this->_readPostings !== null) {
-				return $this->_readPostings;
-			}
-			$this->_readPostings = $this->_UserRead->getUser($this->_id());
-			return $this->_readPostings;
-		}
-
-		protected function _id() {
-			return $this->_CurrentUser->getId();
-		}
-
-	}
+    namespace Saito\User\ReadPostings;
+
+    /**
+     * Handles read postings by a server table. Used for logged-in users.
+     */
+    class ReadPostingsDatabase extends ReadPostingsAbstract {
+
+        protected $_UserRead;
+
+        protected $_minPostingsToKeep;
+
+        public function __construct(\CurrentUserComponent $CurrentUser) {
+            parent::__construct($CurrentUser);
+            $this->_UserRead = $this->_CurrentUser->getModel()->UserRead;
+            $this->_registerGc($this->_CurrentUser->Cron);
+        }
+
+        /**
+         * @throws InvalidArgumentException
+         */
+        public function set($entries) {
+            \Stopwatch::start('ReadPostingsDatabase::set()');
+            if (!$this->_CurrentUser->isLoggedIn()) {
+                return;
+            }
+
+            $entries = $this->_preparePostings($entries);
+            if (empty($entries)) {
+                return;
+            }
+
+            $this->_UserRead->setEntriesForUser($entries, $this->_id());
+            \Stopwatch::stop('ReadPostingsDatabase::set()');
+        }
+
+        public function delete() {
+            $this->_UserRead->deleteAllFromUser($this->_id());
+        }
+
+        /**
+         * calculates user quota of allowed entries in DB
+         *
+         * @return int
+         * @throws \UnexpectedValueException
+         */
+        protected function _minNPostingsToKeep() {
+            if ($this->_minPostingsToKeep) {
+                return $this->_minPostingsToKeep;
+            }
+            $threadsOnPage = \Configure::read('Saito.Settings.topics_per_page');
+            $postingsPerThread = \Configure::read('Saito.Globals.postingsPerThread');
+            $pagesToCache = 1.5;
+            $this->_minPostingsToKeep = intval($postingsPerThread * $threadsOnPage * $pagesToCache);
+            if (empty($this->_minPostingsToKeep)) {
+                throw new \UnexpectedValueException();
+            }
+            return $this->_minPostingsToKeep;
+        }
+
+        protected function _registerGc(\CronComponent $Cron) {
+            $Cron->addCronJob('ReadUser.' . $this->_id(), 'hourly', [$this, 'gcUser']);
+            $Cron->addCronJob('ReadUser.global', 'hourly', [$this, 'gcGlobal']);
+        }
+
+        /**
+         * removes old data from non-active users
+         *
+         * should prevent entries of non returning users to stay forever in DB
+         */
+        public function gcGlobal() {
+            $lastEntry = $this->_CurrentUser->getModel()->Entry->find('first',
+                    [
+                            'contain' => false,
+                            'fields' => ['Entry.id'],
+                            'order' => ['Entry.id' => 'DESC']
+                    ]);
+            if (!$lastEntry) {
+                return;
+            }
+            // @bogus why not getModel()->Entry->Category
+            $Category = \ClassRegistry::init('Category');
+            $nCategories = $Category->find('count');
+            $entriesToKeep = $nCategories * $this->_minNPostingsToKeep();
+            $lastEntryId = $lastEntry['Entry']['id'] - $entriesToKeep;
+            $this->_UserRead->deleteEntriesBefore($lastEntryId);
+        }
+
+        /**
+         * removes old data from current users
+         *
+         * should prevent endless growing of DB if user never clicks the MAR-button
+         */
+        public function gcUser() {
+            if (!$this->_CurrentUser->isLoggedIn()) {
+                return;
+            }
+
+            $entries = $this->_get();
+            $numberOfEntries = count($entries);
+            if ($numberOfEntries === 0) {
+                return;
+            }
+
+            $maxEntriesToKeep = $this->_minNPostingsToKeep();
+            if ($numberOfEntries <= $maxEntriesToKeep) {
+                return;
+            }
+
+            $entriesToDelete = $numberOfEntries - $maxEntriesToKeep;
+            // assign dummy var to prevent Strict notice on reference passing
+            $dummy = array_slice($entries, $entriesToDelete, 1);
+            $oldestIdToKeep = array_shift($dummy);
+            $this->_UserRead->deleteUserEntriesBefore($this->_id(), $oldestIdToKeep);
+
+            // all entries older than (and including) the deleted entries become
+            // old entries by updating the MAR-timestamp
+            $youngestDeletedEntry = $this->_CurrentUser->getModel()->Entry->find('first',
+                    [
+                            'contain' => false,
+                            'conditions' => ['Entry.id' => $oldestIdToKeep],
+                            'fields' => ['Entry.time']
+                    ]);
+            // can't use  $this->_CU->LastRefresh->set() because this would also
+            // delete all of this user's UserRead entries
+            $this->_CurrentUser->getModel()
+                    ->setLastRefresh($youngestDeletedEntry['Entry']['time']);
+        }
+
+        protected function _get() {
+            if ($this->_readPostings !== null) {
+                return $this->_readPostings;
+            }
+            $this->_readPostings = $this->_UserRead->getUser($this->_id());
+            return $this->_readPostings;
+        }
+
+        protected function _id() {
+            return $this->_CurrentUser->getId();
+        }
+
+    }