viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

type fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-03-17 15:14:41 +02:00
parent a33d49b151
commit 706cb66021
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/Espo/Core/Utils/AdminNotificationManager.php
View File

@@ -78,7 +78,7 @@ class AdminNotificationManager
$notificationList[] = [
'id' => 'cronIsNotConfigured',
'type' => 'cronIsNotConfigured',
'message' => $this->language->translate('cronIsNotConfigured', 'messages', 'Admin'),
'message' => $this->language->translateLabel('cronIsNotConfigured', 'messages', 'Admin'),
];
}
}
@@ -87,7 +87,7 @@ class AdminNotificationManager
$instanceNeedingUpgrade = $this->getInstanceNeedingUpgrade();
if (!empty($instanceNeedingUpgrade)) {
$message = $this->language->translate('newVersionIsAvailable', 'messages', 'Admin');
$message = $this->language->translateLabel('newVersionIsAvailable', 'messages', 'Admin');
$notificationList[] = [
'id' => 'newVersionIsAvailable',

5
application/Espo/Core/Utils/Autoload.php
View File

@@ -94,7 +94,10 @@ class Autoload
$useCache = $this->config->get('useCache');
if ($useCache && $this->dataCache->has($this->cacheKey)) {
$this->data = $this->dataCache->get($this->cacheKey);
/** @var ?array<string,mixed> */
$data = $this->dataCache->get($this->cacheKey);
$this->data = $data;
return;
}

18
application/Espo/Core/Utils/Autoload/NamespaceLoader.php
View File

@@ -60,7 +60,7 @@ class NamespaceLoader
private string $autoloadFilePath = 'vendor/autoload.php';
/**
* @var array<string,string>
* @var array<'psr-4'|'psr-0'|'classmap',string>
*/
private $namespacesPaths = [
'psr-4' => 'vendor/composer/autoload_psr4.php',
@@ -69,7 +69,7 @@ class NamespaceLoader
];
/**
* @var array<string,string>
* @var array<'psr-4'|'psr-0',string>
*/
private $methodNameMap = [
'psr-4' => 'addPsr4',
@@ -157,16 +157,18 @@ class NamespaceLoader
}
/**
* @param 'psr-4'|'psr-0'|'classmap' $type
* @return string[]
*/
private function getNamespaceList(string $type): array
{
$namespaces = $this->getNamespaces();
return array_keys($namespaces[$type]);
return array_keys($namespaces[$type] ?? []);
}
/**
* @param 'psr-4'|'psr-0'|'classmap' $type
* @param string|array<string,string> $path
*/
private function addNamespace(string $type, string $name, $path): void
@@ -178,6 +180,9 @@ class NamespaceLoader
$this->namespaces[$type][$name] = (array) $path;
}
/**
* @param 'psr-4'|'psr-0'|'classmap' $type
*/
private function hasNamespace(string $type, string $name): bool
{
if (in_array($name, $this->getNamespaceList($type))) {
@@ -249,11 +254,10 @@ class NamespaceLoader
$this->vendorNamespaces = [];
if ($useCache && $this->dataCache->has($this->cacheKey)) {
$this->vendorNamespaces = $this->dataCache->get($this->cacheKey);
/** @var ?array<string,mixed>*/
$cachedData = $this->dataCache->get($this->cacheKey);
if (!is_array($this->vendorNamespaces)) {
$this->vendorNamespaces = [];
}
$this->vendorNamespaces = $cachedData;
}
}