Replace deprecated methods

Controller/Component/CommonComponent.php

@@ -26,6 +26,8 @@ class CommonComponent extends Component {
 	/**
 	 * For automatic startup
 	 * for this helper the controller has to be passed as reference
+	 *
+	 * @return void
 	 */
 	public function initialize(Controller $Controller) {
 		parent::initialize($Controller);
@@ -36,9 +38,13 @@ class CommonComponent extends Component {
 	/**
 	 * For this helper the controller has to be passed as reference
 	 * for manual startup with $disableStartup = true (requires this to be called prior to any other method)
+	 *
+	 * @return void
 	 */
 	public function startup(Controller $Controller = null) {
-		/** DATA PREPARATION **/
+		parent::startup($Controller);
+
+		// Data preparation
 		if (!empty($this->Controller->request->data) && !Configure::read('DataPreparation.notrim')) {
 			$this->Controller->request->data = $this->trimDeep($this->Controller->request->data);
 		}
@@ -52,7 +58,7 @@ class CommonComponent extends Component {
 			$this->Controller->request->params['pass'] = $this->trimDeep($this->Controller->request->params['pass']);
 		}
 
-		/** Information Gathering **/
+		// Information gathering
 		if (!Configure::read('App.disableMobileDetection') && ($mobile = $this->Session->read('Session.mobile')) === null) {
 			App::uses('UserAgentLib', 'Tools.Lib');
 			$UserAgentLib = new UserAgentLib();
@@ -60,7 +66,7 @@ class CommonComponent extends Component {
 			$this->Session->write('Session.mobile', $mobile);
 		}
 
-		/** Layout **/
+		// Auto layout switch
 		if ($this->Controller->request->is('ajax')) {
 			$this->Controller->layout = 'ajax';
 		}
@@ -70,10 +76,8 @@ class CommonComponent extends Component {
 	 * Called after the Controller::beforeRender(), after the view class is loaded, and before the
 	 * Controller::render()
 	 *
-	 * Created: 2010-10-10
 	 * @param object $Controller Controller with components to beforeRender
 	 * @return void
-	 * @author deltachaos
 	 */
 	public function beforeRender(Controller $Controller) {
 		if ($this->RequestHandler->isAjax()) {
@@ -140,8 +144,8 @@ class CommonComponent extends Component {
 	/**
 	 * Updates FlashMessage SessionContent (to enable unlimited messages of one case)
 	 *
-	 * @param STRING messagestring
-	 * @param STRING class ['error', 'warning', 'success', 'info']
+	 * @param string messagestring
+	 * @param string class ['error', 'warning', 'success', 'info']
 	 * @return void
 	 */
 	public function flashMessage($messagestring, $class = null) {
@@ -167,8 +171,8 @@ class CommonComponent extends Component {
 	 * FlashMessages that are not saved (only for current view)
 	 * will be merged into the session flash ones prior to output
 	 *
-	 * @param STRING messagestring
-	 * @param STRING class ['error', 'warning', 'success', 'info']
+	 * @param string messagestring
+	 * @param string class ['error', 'warning', 'success', 'info']
 	 * @return void
 	 */
 	public static function transientFlashMessage($messagestring, $class = null) {
@@ -1189,6 +1193,9 @@ class CommonComponent extends Component {
 	 * Returns searchArray (options['wildcard'] TRUE/FALSE)
 	 * TODO: move to SearchLib etc
 	 *
+	 * @param string $keyword
+	 * @param string $searchphrase
+	 * @param array $options
 	 * @return array Cleaned array('keyword'=>'searchphrase') or array('keyword LIKE'=>'searchphrase')
 	 */
 	public function getSearchItem($keyword = null, $searchphrase = null, $options = array()) {
@@ -1209,6 +1216,7 @@ class CommonComponent extends Component {
 
 	/**
 	 * Returns auto-generated password
+	 *
 	 * @param string $type: user, ...
 	 * @param integer $length (if no type is submitted)
 	 * @return pwd on success, empty string otherwise
@@ -1229,6 +1237,8 @@ class CommonComponent extends Component {
 	/**
 	 * TODO: move to Lib
 	 * Checks if string contains @ sign
+	 *
+	 * @param string
 	 * @return true if at least one @ is in the string, false otherwise
 	 */
 	public static function containsAtSign($string = null) {
@@ -1280,6 +1290,7 @@ class CommonComponent extends Component {
 	 * Get the Corresponding Message to an HTTP Error Code
 	 *
 	 * @param integer $code: 100...505
+	 * @param boolean $autoTranslate
 	 * @return array codes if code is NULL, otherwise string $code (empty string on failure)
 	 */
 	public function responseCodes($code = null, $autoTranslate = false) {
@@ -1351,7 +1362,9 @@ class CommonComponent extends Component {
 
 	/**
 	 * Get the Corresponding Message to an HTTP Error Code
+	 *
 	 * @param integer $code: 4xx...5xx
+	 * @return string
 	 */
 	public function smtpResponseCodes($code = null, $autoTranslate = false) {
 		# 550 5.1.1 User is unknown
@@ -1376,6 +1389,9 @@ class CommonComponent extends Component {
 	 * isnt this covered by core Set stuff anyway?)
 	 *
 	 * tryout: sorting multidim. array by field [0]..[x]; z.b. $array['Model']['name'] DESC etc.
+	 *
+	 * @return array()
+	 * @deprecated
 	 */
 	public function sortArray($array, $obj, $direction = null) {
 		if (empty($direction) || empty($array) || empty($obj)) {

Model/Behavior/LogableBehavior.php

@@ -46,7 +46,7 @@ if (!defined('CLASS_USER')) {
  *
  * - In AppController (or single controller if only needed once) add these lines to beforeFilter :
  *
- * 	if (count($this->uses) && $this->{$this->modelClass}->Behaviors->attached('Logable')) {
+ * 	if (count($this->uses) && $this->{$this->modelClass}->Behaviors->loaded('Logable')) {
  *			$this->{$this->modelClass}->setUserData($this->activeUser);
  *		}
  *
@@ -280,7 +280,7 @@ class LogableBehavior extends ModelBehavior {
 	 * Use this to supply a model with the data of the logged in User.
 	 * Intended to be called in AppController::beforeFilter like this :
 	 *
-	 * 	if ($this->{$this->modelClass}->Behaviors->attached('Logable')) {
+	 * 	if ($this->{$this->modelClass}->Behaviors->loaded('Logable')) {
 	 *			$this->{$this->modelClass}->setUserData($activeUser);/
 	 *		}
 	 *

Model/Behavior/SluggedBehavior.php

@@ -99,7 +99,7 @@ class SluggedBehavior extends ModelBehavior {
 		$this->settings[$Model->alias] = Set::merge($this->_defaultSettings, $config);
 		extract($this->settings[$Model->alias]);
 		$label = $this->settings[$Model->alias]['label'] = (array)$label;
-		if ($Model->Behaviors->attached('Translate')) {
+		if ($Model->Behaviors->loaded('Translate')) {
 			$notices = false;
 		}
 		if ($notices) {

Test/Case/Controller/Component/CommonComponentTest.php

@@ -2,7 +2,7 @@
 
 App::uses('CommonComponent', 'Tools.Controller/Component');
 App::uses('Component', 'Controller');
-App::uses('AppController', 'Controller');
+App::uses('Controller', 'Controller');
 App::uses('AppModel', 'Model');
 
 /**
@@ -270,6 +270,37 @@ class CommonComponentTest extends CakeTestCase {
 		$this->assertEquals('Contributor', $res);
 	}
 
+	/**
+	 * CommonComponentTest::testDataTrim()
+	 *
+	 * @return void
+	 */
+	public function testDataTrim() {
+		$array = array('Some' => array('Deep' => array('array' => '  bla  ')));
+
+		$this->Controller = new CommonComponentTestController(new CakeRequest, new CakeResponse);
+		$this->Controller->request->data = $array;
+		$this->Controller->request->query = $array;
+		$this->Controller->constructClasses();
+		$this->Controller->startupProcess();
+
+		$expected = array('Some' => array('Deep' => array('array' => 'bla')));
+		$this->assertSame($expected, $this->Controller->request->data);
+		$this->assertSame($expected, $this->Controller->request->query);
+
+		// Overwrite
+		Configure::write('DataPreparation.notrim', true);
+
+		$this->Controller = new CommonComponentTestController(new CakeRequest, new CakeResponse);
+		$this->Controller->request->data = $array;
+		$this->Controller->request->query = $array;
+		$this->Controller->constructClasses();
+		$this->Controller->startupProcess();
+
+		$this->assertSame($array, $this->Controller->request->data);
+		$this->assertSame($array, $this->Controller->request->query);
+	}
+
 }
 
 /*** additional helper classes ***/
@@ -286,9 +317,10 @@ class ToolsUser extends AppModel {
 
 }
 
-class CommonComponentTestController extends AppController {
+// Use Controller instead of AppController to avoid conflicts
+class CommonComponentTestController extends Controller {
 
-	public $components = array('Tools.Common', 'Auth');
+	public $components = array('Session', 'Tools.Common', 'Auth');
 
 	public $failed = false;
 

Test/Case/Model/Behavior/ResetBehaviorTest.php

@@ -18,7 +18,7 @@ class ResetBehaviorTest extends MyCakeTestCase {
 		$this->ResetBehavior = new ResetBehavior();
 
 		$this->Model = ClassRegistry::init('MyComment');
-		$this->Model->Behaviors->attach('Tools.Reset');
+		$this->Model->Behaviors->load('Tools.Reset');
 	}
 
 	public function testObject() {

Test/Case/View/Helper/TreeHelperTest.php

@@ -29,7 +29,7 @@ class TreeHelperTest extends MyCakeTestCase {
 
 		$this->Tree = new TreeHelper(new View(null));
 		$this->Model = ClassRegistry::init('AfterTree');
-		$this->Model->Behaviors->attach('Tree');
+		$this->Model->Behaviors->load('Tree');
 
 		$this->Model->truncate();