adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update afterSave() callback signature to be PHP5.4+ compliant.

Browse source
This commit is contained in:
Ber Clausen 2013-09-09 21:20:22 -03:00
parent 98a32c334a
commit 867d4b312d
7 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Model/Behavior/AclBehavior.php
View file

@ -97,9 +97,10 @@ class AclBehavior extends ModelBehavior {
* *
* @param Model $model * @param Model $model
* @param boolean $created True if this is a new record * @param boolean $created True if this is a new record
* @param array $options Options passed from Model::save().
* @return void * @return void
*/ */
public function afterSave(Model $model, $created) { public function afterSave(Model $model, $created, $options = array()) {
$types = $this->_typeMaps[$this->settings[$model->name]['type']]; $types = $this->_typeMaps[$this->settings[$model->name]['type']];
if (!is_array($types)) { if (!is_array($types)) {
$types = array($types); $types = array($types);

3
lib/Cake/Model/Behavior/TranslateBehavior.php
View file

@ -408,9 +408,10 @@ class TranslateBehavior extends ModelBehavior {
* *
* @param Model $Model Model the callback is called on * @param Model $Model Model the callback is called on
* @param boolean $created Whether or not the save created a record. * @param boolean $created Whether or not the save created a record.
* @param array $options Options passed from Model::save().
* @return void * @return void
*/ */
public function afterSave(Model $Model, $created) { public function afterSave(Model $Model, $created, $options = array()) {
if (!isset($this->runtime[$Model->alias]['beforeValidate']) && !isset($this->runtime[$Model->alias]['beforeSave'])) { if (!isset($this->runtime[$Model->alias]['beforeValidate']) && !isset($this->runtime[$Model->alias]['beforeSave'])) {
return true; return true;
} }

3
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -88,9 +88,10 @@ class TreeBehavior extends ModelBehavior {
* *
* @param Model $Model Model instance. * @param Model $Model Model instance.
* @param boolean $created indicates whether the node just saved was created or updated * @param boolean $created indicates whether the node just saved was created or updated
* @param array $options Options passed from Model::save().
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
public function afterSave(Model $Model, $created) { public function afterSave(Model $Model, $created, $options = array()) {
extract($this->settings[$Model->alias]); extract($this->settings[$Model->alias]);
if ($created) { if ($created) {
if ((isset($Model->data[$Model->alias][$parent])) && $Model->data[$Model->alias][$parent]) { if ((isset($Model->data[$Model->alias][$parent])) && $Model->data[$Model->alias][$parent]) {

7
lib/Cake/Model/Model.php
View file

@ -3418,9 +3418,10 @@ class Model extends Object implements CakeEventListener {
* Called before each save operation, after validation. Return a non-true result * Called before each save operation, after validation. Return a non-true result
* to halt the save. * to halt the save.
* *
* @param array $options * @param array $options Options passed from Model::save().
* @return boolean True if the operation should continue, false if it should abort * @return boolean True if the operation should continue, false if it should abort
* @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforesave * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforesave
* @see Model::save()
*/ */
public function beforeSave($options = array()) { public function beforeSave($options = array()) {
return true; return true;
@ -3430,10 +3431,12 @@ class Model extends Object implements CakeEventListener {
* Called after each successful save operation. * Called after each successful save operation.
* *
* @param boolean $created True if this save created a new record * @param boolean $created True if this save created a new record
* @param array $options Options passed from Model::save().
* @return void * @return void
* @link http://book.cakephp.org/2.0/en/models/callback-methods.html#aftersave * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#aftersave
* @see Model::save()
*/ */
public function afterSave($created) { public function afterSave($created, $options = array()) {
} }
/** /**

4
lib/Cake/Model/ModelBehavior.php
View file

@ -178,9 +178,11 @@ class ModelBehavior extends Object {
* *
* @param Model $model Model using this behavior * @param Model $model Model using this behavior
* @param boolean $created True if this save created a new record * @param boolean $created True if this save created a new record
* @param array $options Options passed from Model::save().
* @return boolean * @return boolean
* @see Model::save()
*/ */
public function afterSave(Model $model, $created) { public function afterSave(Model $model, $created, $options = array()) {
return true; return true;
} }

3
lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View file

@ -130,9 +130,10 @@ class TestBehavior extends ModelBehavior {
* *
* @param Model $model * @param Model $model
* @param boolean $created * @param boolean $created
* @param array $options Options passed from Model::save().
* @return void * @return void
*/ */
public function afterSave(Model $model, $created) { public function afterSave(Model $model, $created, $options = array()) {
$settings = $this->settings[$model->alias]; $settings = $this->settings[$model->alias];
if (!isset($settings['afterSave']) || $settings['afterSave'] === 'off') { if (!isset($settings['afterSave']) || $settings['afterSave'] === 'off') {
return parent::afterSave($model, $created); return parent::afterSave($model, $created);

6
lib/Cake/Test/Case/Model/models.php
View file

@ -2731,7 +2731,7 @@ class AfterTree extends NumberTree {
*/ */
public $actsAs = array('Tree'); public $actsAs = array('Tree');
public function afterSave($created) { public function afterSave($created, $options = array()) {
if ($created && isset($this->data['AfterTree'])) { if ($created && isset($this->data['AfterTree'])) {
$this->data['AfterTree']['name'] = 'Six and One Half Changed in AfterTree::afterSave() but not in database'; $this->data['AfterTree']['name'] = 'Six and One Half Changed in AfterTree::afterSave() but not in database';
} }
@ -3473,7 +3473,7 @@ class TransactionTestModel extends CakeTestModel {
public $useTable = 'samples'; public $useTable = 'samples';
public function afterSave($created) { public function afterSave($created, $options = array()) {
$data = array( $data = array(
array('apple_id' => 1, 'name' => 'sample6'), array('apple_id' => 1, 'name' => 'sample6'),
); );
@ -3488,7 +3488,7 @@ class TransactionManyTestModel extends CakeTestModel {
public $useTable = 'samples'; public $useTable = 'samples';
public function afterSave($created) { public function afterSave($created, $options = array()) {
$data = array( $data = array(
array('apple_id' => 1, 'name' => 'sample6'), array('apple_id' => 1, 'name' => 'sample6'),
); );