adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 12:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.5

Browse source 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
This commit is contained in:
ADmad 2014-05-04 13:28:53 +05:30
commit d466e00644
48 changed files with 138 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -663,7 +663,7 @@ class CakeSessionTest extends CakeTestCase {
$this->assertEquals($expected, TestCakeSession::id());
TestCakeSession::renew();
$this->assertFalse($expected == TestCakeSession::id());
$this->assertFalse($expected === TestCakeSession::id());
$expected = session_id();
$this->assertEquals($expected, TestCakeSession::id());

13
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -1144,11 +1144,14 @@ class MysqlTest extends CakeTestCase {
$linkModel = $this->Model->Category2->{$assoc};
$external = isset($assocData['external']);
if ($this->Model->Category2->alias == $linkModel->alias && $type !== 'hasAndBelongsToMany' && $type !== 'hasMany') {
if ($this->Model->Category2->alias === $linkModel->alias &&
$type !== 'hasAndBelongsToMany' &&
$type !== 'hasMany'
) {
$result = $this->Dbo->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external);
$this->assertFalse(empty($result));
} else {
if ($this->Model->Category2->useDbConfig == $linkModel->useDbConfig) {
if ($this->Model->Category2->useDbConfig === $linkModel->useDbConfig) {
$result = $this->Dbo->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external);
$this->assertFalse(empty($result));
}
@ -3173,9 +3176,9 @@ class MysqlTest extends CakeTestCase {
*
* @param array $data Column data
* @param string $expected Expected sql part
*
*
* @return void
*
*
* @dataProvider buildColumnUnsignedProvider
*/
public function testBuildColumnUnsigned($data, $expected) {
@ -3281,7 +3284,7 @@ class MysqlTest extends CakeTestCase {
/**
* Test getting `unsigned` field parameter from DB
*
*
* @return void
*/
public function testSchemaUnsigned() {