Move trait

composer.json

@@ -34,5 +34,6 @@
 	},
 	"extra": {
 		"installer-name": "Tools"
-	}
+	},
+	"minimum-stability": "dev"
 }

src/Controller/Component/AuthUserComponent.php

@@ -13,7 +13,7 @@ class AuthUserComponent extends Component {
 
 	use AuthUserTrait;
 
-	public $components = array('Auth', 'Tools.Session');
+	public $components = ['Auth', 'Tools.Session'];
 
 	/**
 	 * AuthUserComponent::beforeRender()

src/Controller/Component/CommonComponent.php

@@ -4,14 +4,8 @@ namespace Tools\Controller\Component;
 use Cake\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Tools\Utility\Utility;
 use Cake\Routing\Router;
-
-use Tools\Lib\UserAgentLib;
-
-if (!defined('CLASS_USER')) {
-	define('CLASS_USER', 'User');
-}
+use Tools\Utility\Utility;
 
 /**
  * A component included in every app to take care of common stuff.
@@ -22,8 +16,12 @@ if (!defined('CLASS_USER')) {
  */
 class CommonComponent extends Component {
 
-	public $userModel = CLASS_USER;
-
+	/**
+	 * CommonComponent::beforeFilter()
+	 *
+	 * @param Event $event
+	 * @return void
+	 */
 	public function beforeFilter(Event $event) {
 		$this->Controller = $event->subject();
 	}
@@ -88,7 +86,7 @@ class CommonComponent extends Component {
 	 * @return bool If it is of type POST/PUT/PATCH
 	 */
 	public function isPosted() {
-		return $this->Controller->request->is(array('post', 'put', 'patch'));
+		return $this->Controller->request->is(['post', 'put', 'patch']);
 	}
 
 	/**
@@ -98,7 +96,7 @@ class CommonComponent extends Component {
 	 * @param mixed $components (single string or multiple array)
 	 * @param bool $callbacks (defaults to true)
 	 */
-	public function loadComponent($component, array $config = array(), $callbacks = true) {
+	public function loadComponent($component, array $config = [], $callbacks = true) {
 		list($plugin, $componentName) = pluginSplit($component);
 		$this->Controller->loadComponent($component, $config);
 		if (!$callbacks) {
@@ -129,7 +127,7 @@ class CommonComponent extends Component {
 	 * @return array Url params
 	 */
 	public static function defaultUrlParams() {
-		$defaults = array('plugin' => false);
+		$defaults = ['plugin' => false];
 		$prefixes = (array)Configure::read('Routing.prefixes');
 		foreach ($prefixes as $prefix) {
 			$defaults[$prefix] = false;
@@ -151,8 +149,8 @@ class CommonComponent extends Component {
 			$action = $this->Controller->request->params['action'];
 		}
 
-		$url = array_merge($this->Controller->request->params['pass'], array('prefix' => isset($this->Controller->request->params['prefix']) ? $this->Controller->request->params['prefix'] : null,
-			'plugin' => $this->Controller->request->params['plugin'], 'action' => $action, 'controller' => $this->Controller->request->params['controller']));
+		$url = array_merge($this->Controller->request->params['pass'], ['prefix' => isset($this->Controller->request->params['prefix']) ? $this->Controller->request->params['prefix'] : null,
+			'plugin' => $this->Controller->request->params['plugin'], 'action' => $action, 'controller' => $this->Controller->request->params['controller']]);
 
 		if ($asString === true) {
 			return Router::url($url);
@@ -218,7 +216,7 @@ class CommonComponent extends Component {
 			}
 			// fixme
 			if (!isset($this->Controller->autoRedirectActions)) {
-				$this->Controller->autoRedirectActions = array();
+				$this->Controller->autoRedirectActions = [];
 			}
 			foreach ($this->Controller->autoRedirectActions as $action) {
 				list($controller, $action) = pluginSplit($action);
@@ -228,7 +226,7 @@ class CommonComponent extends Component {
 				if (empty($controller) && $refererController != Inflector::camelize($this->Controller->request->params['controller'])) {
 					continue;
 				}
-				if (!in_array($referer['action'], $this->Controller->autoRedirectActions)) {
+				if (!in_array($referer['action'], $this->Controller->autoRedirectActions, true)) {
 					continue;
 				}
 				$this->autoRedirect($whereTo, true, $status);

src/Controller/Controller.php

@@ -15,9 +15,9 @@ class Controller extends CakeController {
 	 * @return void
 	 */
 	public function disableCache() {
-		$this->response->header(array(
+		$this->response->header([
 			'Pragma' => 'no-cache',
-		));
+		]);
 		$this->response->disableCache();
 	}
 

src/TestSuite/ConsoleOutput.php

@@ -2,7 +2,7 @@
 namespace Tools\TestSuite;
 
 use Cake\Console\ConsoleOutput as CakeConsoleOutput;
-use Tools\TestSuite\Traits\ToolsTestTrait;
+use Tools\TestSuite\ToolsTestTrait;
 
 /**
  * Use for testing as

src/TestSuite/IntegrationTestCase.php

@@ -3,7 +3,7 @@ namespace Tools\TestSuite;
 
 use Cake\TestSuite\IntegrationTestCase as CakeIntegrationTestCase;
 use Cake\Routing\Router;
-use Tools\TestSuite\Traits\ToolsTestTrait;
+use Tools\TestSuite\ToolsTestTrait;
 
 /**
  * Tools TestCase class

src/TestSuite/TestCase.php

@@ -2,7 +2,7 @@
 namespace Tools\TestSuite;
 
 use Cake\TestSuite\TestCase as CakeTestCase;
-use Tools\TestSuite\Traits\ToolsTestTrait;
+use Tools\TestSuite\ToolsTestTrait;
 
 /**
  * Tools TestCase class

src/TestSuite/Traits/ToolsTestTrait.php

@@ -1,5 +1,5 @@
 <?php
-namespace Tools\TestSuite\Traits;
+namespace Tools\TestSuite;
 
 /**
  * Utility methods for easier testing in CakePHP & PHPUnit