Merge branch 'release/4.6.0'

.gitignore

@@ -6,6 +6,11 @@
 .DS_Store
 tags
 
+### CakePHP 3 ###
+/logs
+/tmp
+/vendor
+
 # Saito
 /app/Config/email.php
 /app/Config/database.php

app/Config/Schema/schema.php

@@ -1,21 +1,7 @@
 <?php
 
-App::uses('SchemaCakeMysqlFixTrait', 'Lib');
-
 class AppSchema extends CakeSchema {
 
-	use SchemaCakeMysqlFixTrait;
-
-	public function before($event = array()) {
-		return true;
-	}
-
-	public function after($event = array()) {
-		if (isset($event['create']) && $event['create'] === 'ecaches') {
-			$this->cakeMysqlMediumBlobFix();
-		}
-	}
-
 	public $bookmarks = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
 		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
@@ -44,17 +30,6 @@ public function after($event = array()) {
 		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
 	);
 
-	public $ecaches = array(
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'key' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 128, 'key' => 'primary', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'value' => array('type' => 'binary', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'key', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'MyISAM')
-	);
-
 	public $entries = array(
 		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),

app/Config/bootstrap.php

@@ -190,7 +190,6 @@
 		'file' => 'saito-auth'
 ));
 
-include APP . 'Lib' . DS . 'SaitoExceptions.php';
 include 'version.php';
 
 /**

app/Config/routes.php

@@ -56,6 +56,10 @@
 	 */
 	Router::connect('/admin',
 			['controller' => 'admins', 'action' => 'index', 'admin' => true]);
+	Router::connect(
+		'/admin/plugins',
+		['controller' => 'admins', 'action' => 'plugins', 'admin' => true]
+	);
 
 	/**
 	 * Default search action

app/Config/version.php

@@ -1,4 +1,4 @@
 <?php
-	Configure::write('Saito.v', '4.5.0');
+	Configure::write('Saito.v', '4.6.0');
 
 	Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');

app/Console/Command/DummyDataShell.php

@@ -1,6 +1,7 @@
 <?php
 
-	App::uses('SaitoUser', 'Lib/SaitoUser');
+	use Saito\User\Auth;
+	use Saito\User\SaitoUser;
 
 	class DummyDataShell extends AppShell {
 
@@ -147,8 +148,7 @@ class SaitoUserDummy extends SaitoUser {
 
 		public function __construct($settings = null) {
 			parent::__construct($settings);
-			App::uses('CategoryAuth', 'Lib/SaitoUser');
-			$this->Categories = new CategoryAuth($this);
+			$this->Categories = new Auth\CategoryAuthorization($this);
 		}
 
 		public function getMaxAccession() {

app/Controller/AdminsController.php

@@ -15,20 +15,26 @@ public function admin_logs() {
 			// order here is output order in frontend
 			$_logsToRead = ['error', 'debug'];
 
+			$_logsToRead = glob(LOGS . '*.log');
+			if (!$_logsToRead) {
+				return;
+			}
+
 			// will contain ['error' => '<string>', 'debug' => '<string>']
 			$_logs = [];
-			foreach ($_logsToRead as $_log) {
-				$_path = LOGS . $_log . '.log';
+			foreach ($_logsToRead as $_path) {
 				$_content = '';
-				if (file_exists($_path)) {
-					$_size = filesize($_path);
-					$_content = file_get_contents($_path, false, null, $_size - 65536);
-				}
-				$_logs[$_log] = $_content;
+				$_size = filesize($_path);
+				$_content = file_get_contents($_path, false, null, $_size - 65536);
+				$name = basename($_path);
+				$_logs[$name] = $_content;
 			}
 			$this->set('logs', $_logs);
 		}
 
+		public function admin_plugins() {
+		}
+
 		public function admin_stats() {
 			$postingsPA = $this->_getYearStats('Entry', 'time');
 			$registrationsPA = $this->_getYearStats('User', 'registered');

app/Controller/AppController.php

@@ -1,13 +1,11 @@
 <?php
 
-	App::uses('Properize', 'Lib');
+	use Saito\Exception\SaitoBlackholeException;
+
 	App::uses('Controller', 'Controller');
 	App::uses('CakeEmail', 'Network/Email');
 	App::import('Lib', 'Stopwatch.Stopwatch');
 
-	\App::uses('Saito\Logger\ForbiddenLogger', 'Lib');
-	\App::uses('Saito\Logger\ExceptionLogger', 'Lib');
-
 	if (Configure::read('debug') > 0) {
 		App::uses('FireCake', 'DebugKit.Lib');
 	}
@@ -105,9 +103,20 @@ public function __construct($request = null, $response = null) {
 			Stopwatch::start(
 				'---------------------- Controller ----------------------'
 			);
+
+			ClassRegistry::addObject('dic', \Saito\DicSetup::getNewDic());
 			parent::__construct($request, $response);
 		}
 
+		public function __get($name) {
+			switch ($name) {
+				case 'dic':
+					return ClassRegistry::getObject('dic');
+				default:
+					return parent::__get($name);
+			}
+		}
+
 		public function beforeFilter() {
 			Stopwatch::start('App->beforeFilter()');
 
@@ -151,7 +160,7 @@ public function beforeFilter() {
 			$this->_setConfigurationFromGetParams();
 
 			// must be set after all language chooser
-			Properize::setLanguage(Configure::read('Config.language'));
+			\Saito\String\Properize::setLanguage(Configure::read('Config.language'));
 
 			// allow sql explain for DebugKit toolbar
 			if ($this->request->plugin === 'debug_kit') {
@@ -298,10 +307,10 @@ protected function _setXFrameOptionsHeader() {
 		 *
 		 *
 		 * @param $type
-		 * @throws Saito\BlackHoledException
+		 * @throws Saito\Exception\SaitoBlackholeException
 		 */
 		public function blackhole($type) {
-			throw new Saito\BlackHoledException($type,
+			throw new SaitoBlackholeException($type,
 				['CurrentUser' => $this->CurrentUser]);
 		}
 

app/Controller/BookmarksController.php

@@ -55,12 +55,18 @@ public function add() {
 	 * @param null $id
 	 * @throws NotFoundException
 	 * @throws MethodNotAllowedException
-	 * @throws Saito\ForbiddenException
 	 */
 	public function edit($id = null) {
 		$bookmark = $this->_getBookmark($id);
 
 		if (!$this->request->is('post') && !$this->request->is('put')) {
+			$posting = array(
+				'Entry' => $bookmark['Entry'],
+				'Category' => $bookmark['Entry']['Category'],
+				'User' => $bookmark['Entry']['User'],
+			);
+			$this->set('entry', $this->dic->newInstance('\Saito\Posting\Posting',
+				['rawData' => $posting]));
 			$this->request->data = $bookmark;
 			return;
 		}
@@ -103,10 +109,10 @@ public function beforeFilter() {
 
 	/**
 	 * @param $id
-	 * @return mixed
 	 * @throws NotFoundException
 	 * @throws MethodNotAllowedException
-	 * @throws Saito\ForbiddenException
+	 * @throws Saito\Exception\SaitoForbiddenException
+	 * @return mixed
 	 */
 	protected function _getBookmark($id) {
 		if (!$this->CurrentUser->isLoggedIn()) {
@@ -121,7 +127,7 @@ protected function _getBookmark($id) {
 		$bookmark = $this->Bookmark->findById($id);
 
 		if ($bookmark['Bookmark']['user_id'] != $this->CurrentUser->getId()) {
-			throw new Saito\ForbiddenException("Attempt to edit bookmark $id.");
+			throw new Saito\Exception\SaitoForbiddenException("Attempt to edit bookmark $id.");
 		}
 		return $bookmark;
 	}

app/Controller/Component/CacheSupportComponent.php

@@ -1,20 +1,17 @@
 <?php
 
+	use Saito\Cache\CacheSupport;
+	use Saito\Cache\ItemCache;
+	use Saito\Cache\LineCacheSupportCachelet;
+	use Saito\Cache\SaitoCacheEngineAppCache;
+
 	App::uses('Component', 'Controller');
-	App::import('Lib/Cache', 'CacheSupport');
-	App::uses('CacheTree', 'Lib/Cache');
-	App::uses('CacheTreeCacheSupportCachelet', 'Lib/Cache');
-	App::uses('SaitoCacheEngineDbCache', 'Lib/Cache');
-	App::uses('SaitoCacheEngineAppCache', 'Lib/Cache');
-	App::uses('ItemCache', 'Lib/Cache');
-	App::uses('LineCacheSupportCachelet', 'Lib/Cache');
 
 	class CacheSupportComponent extends Component {
 
 		protected $_CacheSupport;
 
-		public $CacheTree;
-
+		/** * @var ItemCache */
 		public $LineCache;
 
 		public function initialize(Controller $Controller) {
@@ -23,7 +20,6 @@ public function initialize(Controller $Controller) {
 				$Controller->{$Controller->modelClass}->SharedObjects['CacheSupport'] = $this->_CacheSupport;
 			}
 			$this->_addConfigureCachelets();
-			$this->_initCacheTree($Controller);
 			$this->_initLineCache($Controller);
 		}
 
@@ -32,29 +28,11 @@ protected function _initLineCache() {
 				'Saito.LineCache',
 				new SaitoCacheEngineAppCache,
 				// duration: update relative time values in HTML at least every hour
-				['duration' => 3600, 'maxItems' => 500]
+				['duration' => 3600, 'maxItems' => 600]
 			);
 			$this->_CacheSupport->add(new LineCacheSupportCachelet($this->LineCache));
 		}
 
-		protected function _initCacheTree($Controller) {
-			$cacheConfig = Cache::settings();
-			if ($cacheConfig['engine'] === 'Apc') {
-				$CacheEngine = new SaitoCacheEngineAppCache;
-			} else {
-				$CacheEngine = new SaitoCacheEngineDbCache;
-			}
-
-			$this->CacheTree = new CacheTree(
-				'EntrySub',
-				$CacheEngine,
-				['maxItems' => 240]
-			);
-
-			$this->CacheTree->initialize($Controller->CurrentUser);
-			$this->_CacheSupport->add(new CacheTreeCacheSupportCachelet($this->CacheTree));
-		}
-
 		/**
 		 * Adds additional cachelets from Configure `Saito.Cachelets`
 		 *