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

Add model id to all exists() method calls,

Browse source 
Related issue - https://github.com/dereuromark/cakephp-shim/issues/25
This commit is contained in:
bancer 2018-10-30 10:39:16 +01:00
parent 33ac2b2537
commit 3ea39d96b4
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Console/Templates/default/actions/controller_actions.ctp
View file

@ -132,7 +132,7 @@
*/ */
public function <?php echo $admin; ?>delete($id = null) { public function <?php echo $admin; ?>delete($id = null) {
$this-><?php echo $currentModelName; ?>->id = $id; $this-><?php echo $currentModelName; ?>->id = $id;
if (!$this-><?php echo $currentModelName; ?>->exists()) { if (!$this-><?php echo $currentModelName; ?>->exists($id)) {
throw new NotFoundException(__('Invalid <?php echo strtolower($singularHumanName); ?>')); throw new NotFoundException(__('Invalid <?php echo strtolower($singularHumanName); ?>'));
} }
$this->request->allowMethod('post', 'delete'); $this->request->allowMethod('post', 'delete');

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

@ -225,7 +225,7 @@ class TreeBehavior extends ModelBehavior {
} }
$parentIsSet = array_key_exists($parent, $Model->data[$Model->alias]); $parentIsSet = array_key_exists($parent, $Model->data[$Model->alias]);
if (!$Model->id || !$Model->exists()) { if (!$Model->id || !$Model->exists($Model->getID())) {
if ($parentIsSet && $Model->data[$Model->alias][$parent]) { if ($parentIsSet && $Model->data[$Model->alias][$parent]) {
$parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]); $parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]);
if (!$parentNode) { if (!$parentNode) {

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -2547,7 +2547,7 @@ class DboSource extends DataSource {
if (!empty($conditions)) { if (!empty($conditions)) {
return $conditions; return $conditions;
} }
$exists = $Model->exists(); $exists = $Model->exists($Model->getID());
if (!$exists && ($conditions !== null || !empty($Model->__safeUpdateMode))) { if (!$exists && ($conditions !== null || !empty($Model->__safeUpdateMode))) {
return false; return false;
} elseif (!$exists) { } elseif (!$exists) {

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

@ -1824,7 +1824,7 @@ class Model extends CakeObject implements CakeEventListener {
} }
} }
$exists = $this->exists(); $exists = $this->exists($this->getID());
$dateFields = array('modified', 'updated'); $dateFields = array('modified', 'updated');
if (!$exists) { if (!$exists) {
@ -2696,7 +2696,7 @@ class Model extends CakeObject implements CakeEventListener {
return false; return false;
} }
if (!$this->exists()) { if (!$this->exists($this->getID())) {
return false; return false;
} }

2
lib/Cake/Model/ModelValidator.php
View file

@ -257,7 +257,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
} }
} }
$exists = $model->exists(); $exists = $model->exists($model->getID());
$methods = $this->getMethods(); $methods = $this->getMethods();
$fields = $this->_validationList($fieldList); $fields = $this->_validationList($fieldList);