espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/5.7.6' of ssh://172.20.0.1/var/git/espo/backend into hotfix/5.7.6

Browse Source
This commit is contained in:
yuri
2019-10-22 10:05:32 +03:00
parent be33d90986 0daae5ced5
commit f319e5219d
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/FieldManager.php
+6 -2
View File
@@ -427,7 +427,11 @@ class FieldManager
protected function getFieldDefs($scope, $name, $default = null)
{
return $this->getMetadata()->get('entityDefs'.'.'.$scope.'.fields.'.$name, $default);
$defs = $this->getMetadata()->getObjects(['entityDefs', $scope, 'fields', $name], $default);
if (is_object($defs)) {
return get_object_vars($defs);
}
return $defs;
}
protected function getCustomFieldDefs($scope, $name, $default = null)
@@ -532,7 +536,7 @@ class FieldManager
}
$actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name, []);
$actualFieldDefs = $this->getFieldDefs($scope, $name, []);
$actualFieldDefs = $this->getFieldDefs($scope, $name, (object) []);
$permittedParamList = array_keys($params);
$filteredFieldDefs = !empty($actualCustomFieldDefs) ? $actualCustomFieldDefs : [];
tests/integration/Core/Tester.php
+2 -1
View File
@@ -264,7 +264,8 @@ class Tester
return true;
}
Utils::truncateTables($configData['database']);
//Utils::truncateTables($configData['database']);
Utils::dropTables($configData['database']);
$fileManager->removeInDir($this->installPath . '/data');
$fileManager->removeInDir($this->installPath . '/custom/Espo/Custom');
$fileManager->removeInDir($this->installPath . '/client/custom');
tests/unit/Espo/Core/Utils/FieldManagerTest.php
+27 -11
View File
@@ -74,14 +74,14 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
{
$this->expectException('\Espo\Core\Exceptions\Conflict');
$data = array(
$data = (object) [
"type" => "varchar",
"maxLength" => "50",
);
];
$this->objects['metadata']
->expects($this->once())
->method('get')
->method('getObjects')
->will($this->returnValue($data));
$this->object->create('CustomEntity', 'varName', $data);
@@ -95,15 +95,14 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
"label" => "Modified Name",
);
$existingData = array(
$existingData = (object) [
"type" => "varchar",
"maxLength" => 50,
"label" => "Name",
);
];
$map = array(
['entityDefs.Account.fields.name', [], $existingData],
[['entityDefs', 'Account', 'fields', 'name', 'type'], null, $existingData['type']],
[['entityDefs', 'Account', 'fields', 'name', 'type'], null, $data['type']],
['fields.varchar', null, null],
[['fields', 'varchar', 'hookClassName'], null, null],
);
@@ -118,6 +117,11 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
->method('get')
->will($this->returnValueMap($map));
$this->objects['metadata']
->expects($this->exactly(2))
->method('getObjects')
->will($this->returnValue($existingData));
$this->objects['metadataHelper']
->expects($this->once())
->method('getFieldDefsByType')
@@ -177,7 +181,6 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
);
$map = array(
['entityDefs.Account.fields.name', [], $data],
[['entityDefs', 'Account', 'fields', 'name', 'type'], null, $data['type']],
['fields.varchar', null, null],
[['fields', 'varchar', 'hookClassName'], null, null],
@@ -240,9 +243,18 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
$this->objects['metadata']
->expects($this->exactly(2))
->method('getObjects')
->will($this->returnValue((object) $data));
$this->objects['metadata']
->expects($this->exactly(1))
->method('getCustom')
->will($this->returnValue((object) []));
$this->objects['metadata']
->expects($this->never())
->method('saveCustom');
$this->object->update('Account', 'name', $data);
}
@@ -289,7 +301,6 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
);
$map = array(
['entityDefs.CustomEntity.fields.varName', [], $data],
['entityDefs.CustomEntity.fields.varName.type', null, $data['type']],
[['entityDefs', 'CustomEntity', 'fields', 'varName'], null, $data],
['fields.varchar', null, null],
@@ -301,6 +312,11 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
->method('get')
->will($this->returnValueMap($map));
$this->objects['metadata']
->expects($this->exactly(2))
->method('getObjects')
->will($this->returnValue((object) $data));
$this->objects['metadata']
->expects($this->once())
->method('saveCustom')
@@ -374,8 +390,8 @@ class FieldManagerTest extends \PHPUnit\Framework\TestCase
$this->objects['metadata']
->expects($this->at(0))
->method('get')
->will($this->returnValue($data));
->method('getObjects')
->will($this->returnValue((object) $data));
$this->objects['language']
->expects($this->once())