mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-02-01 01:26:19 +00:00
Some tabbing issues
This commit is contained in:
k-halaburda
parent
74eb32696a
commit
4c460c1c68
3 changed files with 235 additions and 7 deletions
|
|
@ -6302,7 +6302,6 @@ class ModelReadTest extends BaseModelTest {
|
||||||
$this->loadFixtures('User');
|
$this->loadFixtures('User');
|
||||||
$TestModel = new User();
|
$TestModel = new User();
|
||||||
$TestModel->cacheQueries = false;
|
$TestModel->cacheQueries = false;
|
||||||
$TestModel->order = null;
|
|
||||||
|
|
||||||
$expected = array(
|
$expected = array(
|
||||||
'conditions' => array(
|
'conditions' => array(
|
||||||
|
|
@ -6850,8 +6849,6 @@ class ModelReadTest extends BaseModelTest {
|
||||||
));
|
));
|
||||||
$this->assertEquals('mariano', $result);
|
$this->assertEquals('mariano', $result);
|
||||||
|
|
||||||
$TestModel->order = null;
|
|
||||||
|
|
||||||
$result = $TestModel->field('COUNT(*) AS count', true);
|
$result = $TestModel->field('COUNT(*) AS count', true);
|
||||||
$this->assertEquals(4, $result);
|
$this->assertEquals(4, $result);
|
||||||
|
|
||||||
|
|
@ -6907,9 +6904,7 @@ class ModelReadTest extends BaseModelTest {
|
||||||
$this->assertNotRegExp('/ORDER\s+BY/', $log['log'][0]['query']);
|
$this->assertNotRegExp('/ORDER\s+BY/', $log['log'][0]['query']);
|
||||||
|
|
||||||
$Article = new Article();
|
$Article = new Article();
|
||||||
$Article->order = null;
|
|
||||||
$Article->recursive = -1;
|
$Article->recursive = -1;
|
||||||
|
|
||||||
$expected = count($Article->find('all', array(
|
$expected = count($Article->find('all', array(
|
||||||
'fields' => array('Article.user_id'),
|
'fields' => array('Article.user_id'),
|
||||||
'group' => 'Article.user_id')
|
'group' => 'Article.user_id')
|
||||||
|
|
@ -7766,8 +7761,6 @@ class ModelReadTest extends BaseModelTest {
|
||||||
));
|
));
|
||||||
$this->assertEquals(2, $result['Post']['id']);
|
$this->assertEquals(2, $result['Post']['id']);
|
||||||
|
|
||||||
$Post->order = null;
|
|
||||||
|
|
||||||
$Post->virtualFields = array('other_field' => 'Post.id + 1');
|
$Post->virtualFields = array('other_field' => 'Post.id + 1');
|
||||||
$result = $Post->find('all', array(
|
$result = $Post->find('all', array(
|
||||||
'fields' => array($dbo->calculate($Post, 'max', array('other_field')))
|
'fields' => array($dbo->calculate($Post, 'max', array('other_field')))
|
||||||
|
|
@ -7973,4 +7966,207 @@ class ModelReadTest extends BaseModelTest {
|
||||||
$this->assertEquals(1, count($result));
|
$this->assertEquals(1, count($result));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* test after find callback on related model
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function testRelatedAfterFindCallback() {
|
||||||
|
$this->loadFixtures('ModelWithRelations', 'ModelRelated', 'ModelHabtmRelation');
|
||||||
|
$ModelWithRelations = new ModelWithRelations();
|
||||||
|
|
||||||
|
$ModelWithRelations->bindModel(array(
|
||||||
|
'belongsTo' => array(
|
||||||
|
'BelongsTo' => array(
|
||||||
|
'className' => 'ModelRelated',
|
||||||
|
'foreignKey' => 'related_id',
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$results = $ModelWithRelations->find('all');
|
||||||
|
$expected = array(
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'First record',
|
||||||
|
'related_id' => '1'
|
||||||
|
),
|
||||||
|
'BelongsTo' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '1'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Second record',
|
||||||
|
'related_id' => '2'
|
||||||
|
),
|
||||||
|
'BelongsTo' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '2'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$this->assertEquals($expected, $results, 'Model related with belongsTo afterFind callback fail');
|
||||||
|
|
||||||
|
$ModelWithRelations->bindModel(array(
|
||||||
|
'hasOne' => array(
|
||||||
|
'HasOne' => array(
|
||||||
|
'className' => 'ModelRelated',
|
||||||
|
'foreignKey' => 'primary_id',
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$results = $ModelWithRelations->find('all');
|
||||||
|
$expected = array(
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'First record',
|
||||||
|
'related_id' => '1'
|
||||||
|
),
|
||||||
|
'HasOne' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '1'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Second record',
|
||||||
|
'related_id' => '2'
|
||||||
|
),
|
||||||
|
'HasOne' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '2'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$this->assertEquals($expected, $results, 'Model related with hasOne afterFind callback fail');
|
||||||
|
|
||||||
|
$ModelWithRelations->bindModel(array(
|
||||||
|
'hasMany' => array(
|
||||||
|
'HasMany' => array(
|
||||||
|
'className' => 'ModelRelated',
|
||||||
|
'foreignKey' => 'primary_id',
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$results = $ModelWithRelations->find('all');
|
||||||
|
|
||||||
|
$expected = array(
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'First record',
|
||||||
|
'related_id' => '1'
|
||||||
|
),
|
||||||
|
'HasMany' => array(
|
||||||
|
array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '1'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Second record',
|
||||||
|
'related_id' => '2'
|
||||||
|
),
|
||||||
|
'HasMany' => array(
|
||||||
|
array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '2'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$this->assertEquals($expected, $results, 'Model related with hasMany afterFind callback fail');
|
||||||
|
|
||||||
|
$ModelWithRelations->bindModel(array(
|
||||||
|
'hasAndBelongsToMany' => array(
|
||||||
|
'HasAndBelongsToMany' => array(
|
||||||
|
'className' => 'ModelRelated',
|
||||||
|
'with' => 'ModelHabtmRelation',
|
||||||
|
'foreignKey' => 'primary_id',
|
||||||
|
'associationForeignKey' => 'related_id',
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$results = $ModelWithRelations->find('all');
|
||||||
|
|
||||||
|
$expected = array(
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'First record',
|
||||||
|
'related_id' => '1'
|
||||||
|
),
|
||||||
|
'HasAndBelongsToMany' => array(
|
||||||
|
array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '1',
|
||||||
|
'ModelHabtmRelation' => array(
|
||||||
|
'id' => '1',
|
||||||
|
'primary_id' => '1',
|
||||||
|
'related_id' => '1'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '2',
|
||||||
|
'ModelHabtmRelation' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'primary_id' => '1',
|
||||||
|
'related_id' => '2'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'ModelWithRelations' => array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Second record',
|
||||||
|
'related_id' => '2'
|
||||||
|
),
|
||||||
|
'HasAndBelongsToMany' => array(
|
||||||
|
array(
|
||||||
|
'id' => '1',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '1',
|
||||||
|
'ModelHabtmRelation' => array(
|
||||||
|
'id' => '3',
|
||||||
|
'primary_id' => '2',
|
||||||
|
'related_id' => '1'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'id' => '2',
|
||||||
|
'name' => 'Successfuly changed in AfterFind',
|
||||||
|
'primary_id' => '2',
|
||||||
|
'ModelHabtmRelation' => array(
|
||||||
|
'id' => '4',
|
||||||
|
'primary_id' => '2',
|
||||||
|
'related_id' => '2'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$this->assertEquals($expected, $results, 'Model related with hasAndBelongsToMany afterFind callback fail');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,7 @@ abstract class BaseModelTest extends CakeTestCase {
|
||||||
'core.fruits_uuid_tag', 'core.uuid_tag', 'core.product_update_all', 'core.group_update_all',
|
'core.fruits_uuid_tag', 'core.uuid_tag', 'core.product_update_all', 'core.group_update_all',
|
||||||
'core.player', 'core.guild', 'core.guilds_player', 'core.armor', 'core.armors_player',
|
'core.player', 'core.guild', 'core.guilds_player', 'core.armor', 'core.armors_player',
|
||||||
'core.bidding', 'core.bidding_message', 'core.site', 'core.domain', 'core.domains_site',
|
'core.bidding', 'core.bidding_message', 'core.site', 'core.domain', 'core.domains_site',
|
||||||
|
'core.model_with_relations','core.model_related','core.model_habtm_relation',
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4993,3 +4993,34 @@ class CustomArticle extends AppModel {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ModelWithRelations class
|
||||||
|
*
|
||||||
|
* @package Cake.Test.Case.Model
|
||||||
|
*/
|
||||||
|
class ModelWithRelations extends CakeTestModel {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ModelRelated class
|
||||||
|
*
|
||||||
|
* @package Cake.Test.Case.Model
|
||||||
|
*/
|
||||||
|
class ModelRelated extends CakeTestModel {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* afterFind callback method
|
||||||
|
*
|
||||||
|
* @param array $results
|
||||||
|
* @param boolean $primary
|
||||||
|
* @return array Modified $results
|
||||||
|
*/
|
||||||
|
public function afterFind($results, $primary = false) {
|
||||||
|
foreach ($results as $key => $result) {
|
||||||
|
$results[$key][$this->alias]['name'] = 'Successfuly changed in AfterFind';
|
||||||
|
}
|
||||||
|
return $results;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue