Permalink
Browse files

Removing all methods currently issuing warnings about being deprecated.

  • Loading branch information...
1 parent 2d3cde1 commit f4e837d985c36e7aaa453b35b0611843e1362b16 @markstory markstory committed Jan 21, 2010
View
@@ -241,17 +241,6 @@ function id($id = null) {
}
/**
- * Remove a variable from the session
- *
- * @return boolean
- * @deprecated Use CakeSession::delete instead
- */
- function del($name) {
- trigger_error(__('CakeSession::del() is deprecated, use CakeSession::delete() instead.', true), E_USER_WARNING);
- return $this->delete($name);
- }
-
-/**
* Removes a variable from session.
*
* @param string $name Session variable to remove
@@ -260,14 +260,6 @@ function read($key = null) {
}
/**
- * @deprecated use delete()
- */
- function del($key) {
- trigger_error(__('Deprecated method, use CookieComponent::delete instead', true), E_USER_WARNING);
- return $this->delete($key);
- }
-
-/**
* Delete a cookie value
*
* Optional [Name.], reguired key
@@ -422,14 +422,6 @@ function getReferer() {
}
/**
- * @deprecated use getReferer()
- */
- function getReferrer() {
- trigger_error(__('Deprecated method, use RequestHandlerComponent::getReferer instead', true), E_USER_WARNING);
- return $this->getReferer();
- }
-
-/**
* Gets remote client IP
*
* @return string Client IP address
@@ -138,18 +138,6 @@ function read($name = null) {
}
/**
- * @deprecated use delete
- */
- function del($name) {
- trigger_error(__('Deprecated method, use SessionComponent::delete instead', true), E_USER_WARNING);
- if ($this->__active === true) {
- $this->__start();
- return parent::del($name);
- }
- return false;
- }
-
-/**
* Wrapper for SessionComponent::del();
*
* In your controller: $this->Session->delete('Controller.sessKey');
View
@@ -716,66 +716,6 @@ function errors() {
}
/**
- * nix flavored alias
- *
- * @see read
- * @deprecated use read
- * @access public
- */
- function ls($sort = true, $exceptions = false) {
- trigger_error(__('Deprecated method, use Folder::read instead', true), E_USER_WARNING);
- return $this->read($sort, $exceptions);
- }
-
-/**
- * nix flavored alias
- *
- * @see create
- * @deprecated use create
- * @access public
- */
- function mkdir($pathname, $mode = 0755) {
- trigger_error(__('Deprecated method, use Folder::create instead', true), E_USER_WARNING);
- return $this->create($pathname, $mode);
- }
-
-/**
- * nix flavored alias
- *
- * @see copy
- * @deprecated use copy
- * @access public
- */
- function cp($options) {
- trigger_error(__('Deprecated method, use Folder::copy instead', true), E_USER_WARNING);
- return $this->copy($options);
- }
-
-/**
- * nix flavored alias
- *
- * @see move
- * @deprecated use move
- * @access public
- */
- function mv($options) {
- trigger_error(__('Deprecated method, use Folder::move instead', true), E_USER_WARNING);
- return $this->move($options);
- }
-
-/**
- * nix flavored alias
- *
- * @see delete
- * @deprecated use delete
- * @access public
- */
- function rm($path) {
- trigger_error(__('Deprecated method, use Folder::delete instead', true), E_USER_WARNING);
- return $this->delete($path);
- }
-
-/**
* Get the real path (taking ".." and such into account)
*
* @param string $path Path to resolve
View
@@ -518,57 +518,6 @@ function call__($method, $params) {
/**
* Bind model associations on the fly.
*
- * If $permanent is true, association will not be reset
- * to the originals defined in the model.
- *
- * @param mixed $model A model or association name (string) or set of binding options (indexed by model name type)
- * @param array $options If $model is a string, this is the list of association properties with which $model will
- * be bound
- * @param boolean $permanent Set to true to make the binding permanent
- * @return void
- * @access public
- * @deprecated Use Model::bindModel() instead.
- */
- function bind($model, $options = array(), $permanent = true) {
- trigger_error(__('Deprecated method, use Model::bindModel instead', true), E_USER_WARNING);
- if (!is_array($model)) {
- $model = array($model => $options);
- }
-
- foreach ($model as $name => $options) {
- if (isset($options['type'])) {
- $assoc = $options['type'];
- } elseif (isset($options[0])) {
- $assoc = $options[0];
- } else {
- $assoc = 'belongsTo';
- }
-
- if (!$permanent) {
- $this->__backAssociation[$assoc] = $this->{$assoc};
- }
- foreach ($model as $key => $value) {
- $assocName = $modelName = $key;
-
- if (isset($this->{$assoc}[$assocName])) {
- $this->{$assoc}[$assocName] = array_merge($this->{$assoc}[$assocName], $options);
- } else {
- if (isset($value['className'])) {
- $modelName = $value['className'];
- }
-
- $this->__constructLinkedModel($assocName, $modelName);
- $this->{$assoc}[$assocName] = $model[$assocName];
- $this->__generateAssociation($assoc);
- }
- unset($this->{$assoc}[$assocName]['type'], $this->{$assoc}[$assocName][0]);
- }
- }
- }
-
-/**
- * Bind model associations on the fly.
- *
* If $reset is false, association will not be reset
* to the originals defined in the model
*
@@ -1820,15 +1769,6 @@ function updateAll($fields, $conditions = true) {
}
/**
- * @deprecated
- * @link http://book.cakephp.org/view/691/remove
- */
- function remove($id = null, $cascade = true) {
- trigger_error(__('Deprecated method, use Model::delete instead', true), E_USER_WARNING);
- return $this->delete($id, $cascade);
- }
-
-/**
* Removes record for given ID. If no ID is given, the current ID is used. Returns true on success.
*
* @param mixed $id ID of record to delete
@@ -1874,14 +1814,6 @@ function delete($id = null, $cascade = true) {
}
/**
- * @deprecated
- */
- function del($id = null, $cascade = true) {
- trigger_error(__('Deprecated method, use Model::delete instead', true), E_USER_WARNING);
- return $this->delete($id, $cascade);
- }
-
-/**
* Cascades model deletes through associated hasMany and hasOne child records.
*
* @param string $id ID of record that was deleted
@@ -2731,18 +2663,6 @@ function isForeignKey($field) {
}
/**
- * Returns the display field for this model.
- *
- * @return string The name of the display field for this Model (i.e. 'name', 'title').
- * @access public
- * @deprecated
- */
- function getDisplayField() {
- trigger_error(__('Deprecated method, use Model::$displayField instead', true), E_USER_WARNING);
- return $this->displayField;
- }
-
-/**
* Escapes the field name and prepends the model name. Escaping is done according to the current database driver's rules.
*
* @param string $field Field to escape (e.g: id)

0 comments on commit f4e837d

Please sign in to comment.