mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-06-18 20:53:40 +00:00
Replacing self with static due to PHP5.3+. Following #7040.
This commit is contained in:
parent
27e40f084d
commit
52e79987a2
53 changed files with 998 additions and 998 deletions
lib/Cake/Test/Case/Model
|
@ -2102,7 +2102,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'body' => 'Second Article Body',
|
||||
'published' => 'Y',
|
||||
'created' => '2007-03-18 10:41:23',
|
||||
'updated' => self::date()
|
||||
'updated' => static::date()
|
||||
),
|
||||
'Tag' => array(
|
||||
array(
|
||||
|
@ -3042,23 +3042,23 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'JoinA' => array(
|
||||
'id' => '1',
|
||||
'name' => 'New name for Join A 1',
|
||||
'updated' => self::date()
|
||||
'updated' => static::date()
|
||||
),
|
||||
'JoinB' => array(
|
||||
array(
|
||||
'id' => 1,
|
||||
'join_b_id' => 2,
|
||||
'other' => 'New data for Join A 1 Join B 2',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
)),
|
||||
'JoinC' => array(
|
||||
array(
|
||||
'id' => 1,
|
||||
'join_c_id' => 2,
|
||||
'other' => 'New data for Join A 1 Join C 2',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
)));
|
||||
|
||||
$TestModel->set($data);
|
||||
|
@ -3071,7 +3071,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'name' => 'New name for Join A 1',
|
||||
'body' => 'Join A 1 Body',
|
||||
'created' => '2008-01-03 10:54:23',
|
||||
'updated' => self::date()
|
||||
'updated' => static::date()
|
||||
),
|
||||
'JoinB' => array(
|
||||
0 => array(
|
||||
|
@ -3084,8 +3084,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'join_a_id' => 1,
|
||||
'join_b_id' => 2,
|
||||
'other' => 'New data for Join A 1 Join B 2',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
))),
|
||||
'JoinC' => array(
|
||||
0 => array(
|
||||
|
@ -3098,8 +3098,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'join_a_id' => 1,
|
||||
'join_c_id' => 2,
|
||||
'other' => 'New data for Join A 1 Join C 2',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
))));
|
||||
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -3143,10 +3143,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
|
||||
'test' => 'working'
|
||||
));
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Author']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Author']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Author']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Author']['updated']);
|
||||
unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
|
||||
unset($result[3]['Author']['created'], $result[3]['Author']['updated']);
|
||||
$this->assertEquals($expected, $result[3]);
|
||||
|
@ -3191,10 +3191,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'body' => 'Second multi-record post',
|
||||
'published' => 'N'
|
||||
)));
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['updated']);
|
||||
unset($result[0]['Post']['created'], $result[0]['Post']['updated']);
|
||||
unset($result[1]['Post']['created'], $result[1]['Post']['updated']);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -3220,8 +3220,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'comment' => 'New comment with attachment',
|
||||
'published' => 'Y'
|
||||
);
|
||||
$this->assertEquals(self::date(), $result[6]['Comment']['created']);
|
||||
$this->assertEquals(self::date(), $result[6]['Comment']['updated']);
|
||||
$this->assertEquals(static::date(), $result[6]['Comment']['created']);
|
||||
$this->assertEquals(static::date(), $result[6]['Comment']['updated']);
|
||||
unset($result[6]['Comment']['created'], $result[6]['Comment']['updated']);
|
||||
$this->assertEquals($expected, $result[6]['Comment']);
|
||||
|
||||
|
@ -3230,8 +3230,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'comment_id' => '7',
|
||||
'attachment' => 'some_file.tgz'
|
||||
);
|
||||
$this->assertEquals(self::date(), $result[6]['Attachment']['created']);
|
||||
$this->assertEquals(self::date(), $result[6]['Attachment']['updated']);
|
||||
$this->assertEquals(static::date(), $result[6]['Attachment']['created']);
|
||||
$this->assertEquals(static::date(), $result[6]['Attachment']['updated']);
|
||||
unset($result[6]['Attachment']['created'], $result[6]['Attachment']['updated']);
|
||||
$this->assertEquals($expected, $result[6]['Attachment']);
|
||||
}
|
||||
|
@ -4665,8 +4665,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'New Fourth Post',
|
||||
'body' => null,
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
));
|
||||
|
||||
$expected[] = array(
|
||||
|
@ -4676,8 +4676,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'New Fifth Post',
|
||||
'body' => null,
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
));
|
||||
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -4733,8 +4733,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'New Fourth Post',
|
||||
'body' => 'Third Post Body',
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
));
|
||||
|
||||
$expected[] = array(
|
||||
|
@ -4744,8 +4744,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Third Post',
|
||||
'body' => 'Third Post Body',
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
));
|
||||
}
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -4870,10 +4870,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'body' => 'Fourth post body',
|
||||
'published' => 'N'
|
||||
)));
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
unset($result[0]['Post']['updated'], $result[1]['Post']['updated']);
|
||||
unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -4964,10 +4964,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
)
|
||||
);
|
||||
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
unset(
|
||||
$result[0]['Post']['updated'], $result[1]['Post']['updated'],
|
||||
$result[3]['Post']['updated'], $result[3]['Post']['created']
|
||||
|
@ -5348,10 +5348,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
|
||||
'test' => 'working'
|
||||
));
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Author']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Author']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Author']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Author']['updated']);
|
||||
unset(
|
||||
$result[3]['Post']['updated'], $result[3]['Post']['created'],
|
||||
$result[3]['Author']['updated'], $result[3]['Author']['created']
|
||||
|
@ -5380,8 +5380,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'comment' => 'New comment with attachment',
|
||||
'published' => 'Y'
|
||||
);
|
||||
$this->assertEquals(self::date(), $result[6]['Comment']['updated']);
|
||||
$this->assertEquals(self::date(), $result[6]['Comment']['created']);
|
||||
$this->assertEquals(static::date(), $result[6]['Comment']['updated']);
|
||||
$this->assertEquals(static::date(), $result[6]['Comment']['created']);
|
||||
unset($result[6]['Comment']['updated'], $result[6]['Comment']['created']);
|
||||
$this->assertEquals($expected, $result[6]['Comment']);
|
||||
|
||||
|
@ -5390,8 +5390,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'comment_id' => '7',
|
||||
'attachment' => 'some_file.tgz'
|
||||
);
|
||||
$this->assertEquals(self::date(), $result[6]['Attachment']['updated']);
|
||||
$this->assertEquals(self::date(), $result[6]['Attachment']['created']);
|
||||
$this->assertEquals(static::date(), $result[6]['Attachment']['updated']);
|
||||
$this->assertEquals(static::date(), $result[6]['Attachment']['created']);
|
||||
unset($result[6]['Attachment']['updated'], $result[6]['Attachment']['created']);
|
||||
$this->assertEquals($expected, $result[6]['Attachment']);
|
||||
}
|
||||
|
@ -5491,10 +5491,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
)
|
||||
)
|
||||
);
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['created']);
|
||||
unset($result[0]['Post']['updated'], $result[0]['Post']['created']);
|
||||
unset($result[1]['Post']['updated'], $result[1]['Post']['created']);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -6184,10 +6184,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'published' => 'N',
|
||||
));
|
||||
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[4]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[4]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[4]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[4]['Post']['updated']);
|
||||
unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
|
||||
unset($result[4]['Post']['created'], $result[4]['Post']['updated']);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -6253,10 +6253,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'body' => 'Third Post Body',
|
||||
'published' => 'N'
|
||||
));
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[4]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[4]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[4]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[4]['Post']['updated']);
|
||||
unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
|
||||
unset($result[4]['Post']['created'], $result[4]['Post']['updated']);
|
||||
}
|
||||
|
@ -6387,10 +6387,10 @@ class ModelWriteTest extends BaseModelTest {
|
|||
)
|
||||
);
|
||||
|
||||
$this->assertEquals(self::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(self::date(), $result[3]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[0]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[1]['Post']['updated']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['created']);
|
||||
$this->assertEquals(static::date(), $result[3]['Post']['updated']);
|
||||
unset($result[0]['Post']['updated'], $result[1]['Post']['updated']);
|
||||
unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -7147,15 +7147,15 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Post without body',
|
||||
'body' => null,
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date(),
|
||||
'created' => static::date(),
|
||||
'updated' => static::date(),
|
||||
),
|
||||
'Author' => array(
|
||||
'id' => '5',
|
||||
'user' => 'bob',
|
||||
'password' => null,
|
||||
'created' => self::date(),
|
||||
'updated' => self::date(),
|
||||
'created' => static::date(),
|
||||
'updated' => static::date(),
|
||||
'test' => 'working',
|
||||
),
|
||||
);
|
||||
|
@ -7210,15 +7210,15 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Post title',
|
||||
'body' => 'Post body',
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
),
|
||||
'Author' => array(
|
||||
'id' => '6',
|
||||
'user' => 'jack',
|
||||
'password' => 'foobar',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date(),
|
||||
'created' => static::date(),
|
||||
'updated' => static::date(),
|
||||
'test' => 'working'
|
||||
),
|
||||
);
|
||||
|
@ -7252,8 +7252,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Multi-record post 1',
|
||||
'body' => '',
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
)
|
||||
),
|
||||
array(
|
||||
|
@ -7263,8 +7263,8 @@ class ModelWriteTest extends BaseModelTest {
|
|||
'title' => 'Multi-record post 2',
|
||||
'body' => '',
|
||||
'published' => 'N',
|
||||
'created' => self::date(),
|
||||
'updated' => self::date()
|
||||
'created' => static::date(),
|
||||
'updated' => static::date()
|
||||
)
|
||||
)
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue