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

cs fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-04-18 20:07:12 +03:00
parent dc389e0f41
commit 491a28c03e
6 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/File/Unifier.php
+74 -32
View File
@@ -31,6 +31,11 @@ namespace Espo\Core\Utils\File;
use Espo\Core\Utils;
use Espo\Core\{
Utils\File\Manager as FileManager,
Utils\Metadata,
};
class Unifier
{
private $fileManager;
@@ -43,8 +48,11 @@ class Unifier
protected $pathToDefaults = 'application/Espo/Core/defaults';
public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Metadata $metadata = null, $useObjects = false)
{
public function __construct(
FileManager $fileManager,
Metadata $metadata = null,
bool $useObjects = false
) {
$this->fileManager = $fileManager;
$this->metadata = $metadata;
$this->useObjects = $useObjects;
@@ -61,11 +69,12 @@ class Unifier
}
/**
* Unite file content to the file
* Unite file content to the file.
*
* @param string $name
* @param array $paths
* @param boolean $recursively Note: only for first level of sub directory, other levels of sub directories will be ignored
* @param string $name
* @param array $paths
* @param boolean $recursively Note: only for first level of sub directory,
* other levels of sub directories will be ignored.
*
* @return array
*/
@@ -76,24 +85,39 @@ class Unifier
if (!empty($paths['modulePath'])) {
$customDir = strstr($paths['modulePath'], '{*}', true);
$moduleList = isset($this->metadata) ? $this->getMetadata()->getModuleList() : $this->getFileManager()->getFileList($customDir, false, '', false);
$moduleList = isset($this->metadata) ?
$this->getMetadata()->getModuleList() :
$this->getFileManager()->getFileList($customDir, false, '', false);
foreach ($moduleList as $moduleName) {
$curPath = str_replace('{*}', $moduleName, $paths['modulePath']);
if ($this->useObjects) {
$content = Utils\DataUtil::merge($content, $this->unifySingle($curPath, $name, $recursively, $moduleName));
$content = Utils\DataUtil::merge(
$content,
$this->unifySingle($curPath, $name, $recursively, $moduleName)
);
} else {
$content = Utils\Util::merge($content, $this->unifySingle($curPath, $name, $recursively, $moduleName));
$content = Utils\Util::merge(
$content,
$this->unifySingle($curPath, $name, $recursively, $moduleName)
);
}
}
}
if (!empty($paths['customPath'])) {
if ($this->useObjects) {
$content = Utils\DataUtil::merge($content, $this->unifySingle($paths['customPath'], $name, $recursively));
} else {
$content = Utils\Util::merge($content, $this->unifySingle($paths['customPath'], $name, $recursively));
$content = Utils\DataUtil::merge(
$content,
$this->unifySingle($paths['customPath'], $name, $recursively)
);
}
else {
$content = Utils\Util::merge(
$content,
$this->unifySingle($paths['customPath'], $name, $recursively)
);
}
}
@@ -101,14 +125,15 @@ class Unifier
}
/**
* Unite file content to the file for one directory [NOW ONLY FOR METADATA, NEED TO CHECK FOR LAYOUTS AND OTHERS]
* Unite file content to the file for one directory.
*
* @param string $dirPath
* @param string $type - name of type array("metadata", "layouts"), ex. $this->name
* @param bool $recursively - Note: only for first level of sub directory, other levels of sub directories will be ignored
* @param string $moduleName - name of module if exists
* @param string $type Nname of type array("metadata", "layouts"), ex. $this->name.
* @param bool $recursively Note: only for first level of sub directory,
* other levels of sub directories will be ignored.
* @param string $moduleName Name of module if exists.
*
* @return string - content of the files
* @return string Content of the files.
*/
protected function unifySingle($dirPath, $type, $recursively = false, $moduleName = '')
{
@@ -127,24 +152,38 @@ class Unifier
$fileList = $this->getFileManager()->getFileList($dirPath, $recursively, '\.json$');
$dirName = $this->getFileManager()->getDirName($dirPath, false);
$defaultValues = $this->loadDefaultValues($dirName, $type);
foreach ($fileList as $dirName => $fileName) {
if (is_array($fileName)) { /*only first level of a sub directory*/
if ($this->useObjects) {
$content->$dirName = $this->unifySingle(Utils\Util::concatPath($dirPath, $dirName), $type, false, $moduleName);
} else {
$content[$dirName] = $this->unifySingle(Utils\Util::concatPath($dirPath, $dirName), $type, false, $moduleName);
$content->$dirName = $this->unifySingle(
Utils\Util::concatPath($dirPath, $dirName),
$type,
false,
$moduleName
);
}
else {
$content[$dirName] = $this->unifySingle(
Utils\Util::concatPath($dirPath, $dirName),
$type,
false,
$moduleName
);
}
} else {
if ($fileName === $this->unsetFileName) {
$fileContent = $this->getFileManager()->getContents(array($dirPath, $fileName));
if ($this->useObjects) {
$unsets = Utils\Json::decode($fileContent);
} else {
$unsets = Utils\Json::getArrayData($fileContent);
}
continue;
}
@@ -155,7 +194,8 @@ class Unifier
if ($this->useObjects) {
$content->$name = $mergedValues;
} else {
}
else {
$content[$name] = $mergedValues;
}
@@ -165,7 +205,8 @@ class Unifier
if ($this->useObjects) {
$content = Utils\DataUtil::unsetByKey($content, $unsets);
} else {
}
else {
$content = Utils\Util::unsetInArray($content, $unsets);
}
@@ -173,10 +214,11 @@ class Unifier
}
/**
* Helpful method for get content from files for unite Files
* Helpful method for get content from files for unite files.
*
* @param string | array $paths
* @param string | array() $defaults - It can be a string like ["metadata","layouts"] OR an array with default values
* @param string|array $paths
* @param string|array $defaults It can be a string like
* ["metadata","layouts"] OR an array with default values.
*
* @return array
*/
@@ -192,10 +234,11 @@ class Unifier
if (!isset($decoded)) {
$GLOBALS['log']->emergency('Syntax error in '.Utils\Util::concatPath($paths));
if ($this->useObjects) {
return (object) [];
} else {
return array();
return [];
}
}
@@ -206,13 +249,14 @@ class Unifier
* Load default values for selected type [metadata, layouts]
*
* @param string $name
* @param string $type - [metadata, layouts]
* @param string $type [metadata, layouts]
*
* @return array
*/
protected function loadDefaultValues($name, $type = 'metadata')
{
$defaultValue = $this->getFileManager()->getContents(array($this->pathToDefaults, $type, $name.'.json') );
$defaultValue = $this->getFileManager()->getContents([$this->pathToDefaults, $type, $name . '.json']);
if ($defaultValue !== false) {
if ($this->useObjects) {
return Utils\Json::decode($defaultValue);
@@ -220,13 +264,11 @@ class Unifier
return Utils\Json::decode($defaultValue, true);
}
}
if ($this->useObjects) {
return (object) [];
} else {
return array();
return [];
}
}
}
?>
application/Espo/Core/Utils/Hasher.php
+5 -4
View File
@@ -32,20 +32,21 @@ namespace Espo\Core\Utils;
use Espo\Core\Utils\Config;
/**
* Hash a string. E.g. hash an email address to use it in opt-out URL to recognize a recipient who clicked opt-out.
* Hash a string. E.g. hash an email address to use it in opt-out URL
* to recognize a recipient who clicked opt-out.
*/
class Hasher
{
protected $config;
private $config;
protected $secretKeyParam = 'hashSecretKey';
private $secretKeyParam = 'hashSecretKey';
public function __construct(Config $config)
{
$this->config = $config;
}
public function hash(string $string) : string
public function hash(string $string): string
{
$secretKey = $this->config->get($this->secretKeyParam) ?? '';
application/Espo/Core/Utils/Language.php
+6 -3
View File
@@ -144,7 +144,7 @@ class Language
$this->currentLanguage = $language;
}
protected function getCacheKey(string $language = null) : string
protected function getCacheKey(string $language = null): string
{
$language = $language ?? $this->getLanguage();
@@ -236,7 +236,7 @@ class Language
/**
* Save changes.
*/
public function save() : bool
public function save(): bool
{
$language = $this->getLanguage();
@@ -309,9 +309,11 @@ class Language
$this->changedData[$scope][$category][$name] = $value;
$currentLanguage = $this->getLanguage();
if (!isset($this->data[$currentLanguage])) {
$this->init();
}
$this->data[$currentLanguage][$scope][$category][$name] = $value;
$this->undelete($scope, $category, $name);
@@ -420,7 +422,8 @@ class Language
foreach ($data as $key => &$subData) {
if (is_array($subData)) {
$this->sanitizeData($subData);
} else {
}
else {
if (is_string($subData)) {
$subData = str_replace('<', '&lt;', $subData);
$subData = str_replace('>', '&gt;', $subData);
application/Espo/Core/Utils/Layout.php
+3 -3
View File
@@ -54,13 +54,13 @@ class Layout
$this->metadata = $metadata;
}
protected function sanitizeInput(string $name) : string
protected function sanitizeInput(string $name): string
{
return preg_replace("([\.]{2,})", '', $name);
}
public function get(string $scope, string $name) : ?string
public function get(string $scope, string $name): ?string
{
$scope = $this->sanitizeInput($scope);
$name = $this->sanitizeInput($name);
@@ -109,7 +109,7 @@ class Layout
return $this->fileManager->getContents($filePath);
}
public function getDirPath(string $entityType, bool $isCustom = false) : string
public function getDirPath(string $entityType, bool $isCustom = false): string
{
$path = $this->paths['customPath'];
application/Espo/Core/Utils/Metadata/OrmMetadataData.php
+2 -2
View File
@@ -63,7 +63,7 @@ class OrmMetadataData
$this->useCache = $this->config->get('useCache', false);
}
protected function getConverter() : Converter
protected function getConverter(): Converter
{
if (!isset($this->converter)) {
$this->converter = new Converter($this->metadata, $this->fileManager, $this->config);
@@ -72,7 +72,7 @@ class OrmMetadataData
return $this->converter;
}
public function getData(bool $reload = false) : array
public function getData(bool $reload = false): array
{
if (isset($this->data) && !$reload) {
return $this->data;
application/Espo/Core/Utils/Module.php
+6 -3
View File
@@ -63,8 +63,11 @@ class Module
private $fileManager;
private $dataCache;
public function __construct(FileManager $fileManager, ?DataCache $dataCache = null, bool $useCache = false)
{
public function __construct(
FileManager $fileManager,
?DataCache $dataCache = null,
bool $useCache = false
) {
$this->fileManager = $fileManager;
$this->dataCache = $dataCache;
@@ -115,7 +118,7 @@ class Module
/**
* Get an ordered list of modules.
*/
public function getOrderedList() : array
public function getOrderedList(): array
{
$modules = $this->fileManager->getFileList($this->pathToModules, false, '', false);