type fixes

This commit is contained in:
Yuri Kuznetsov
2022-03-17 16:37:37 +02:00
parent 706cb66021
commit 0cc88a395f
4 changed files with 13 additions and 7 deletions
@@ -392,7 +392,7 @@ abstract class Base
}
/**
* @param string[] $versionList
* @param string[]|string $versionList
* @param string $currentVersion
* @param string $errorMessage
* @return bool
@@ -249,7 +249,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
}
/**
* @param array<string,string[]> $dependencyList
* @param array<string,string[]|string> $dependencyList
* @return bool
*/
protected function checkDependencies($dependencyList)
@@ -35,7 +35,7 @@ class Upload extends \Espo\Core\Upgrades\Actions\Base\Upload
/**
* Check dependencies.
*
* @param array<string,string[]>|string $dependencyList
* @param array<string,string[]|string> $dependencyList
* @return bool
*/
protected function checkDependencies($dependencyList)
@@ -67,15 +67,17 @@ class Helper
/**
* Check dependencies.
*
* @param array<string,string[]>|string $dependencyList
* @param array<string,string[]|string> $dependencyList
* @return bool
*/
public function checkDependencies($dependencyList)
{
if (!is_array($dependencyList)) {
if (!is_array($dependencyList)) { /** @phpstan-ignore-line */
$dependencyList = (array) $dependencyList;
}
/** @var array<string,string[]|string> $dependencyList */
$actionObject = $this->getActionObject();
foreach ($dependencyList as $extensionName => $extensionVersion) {
@@ -88,8 +90,12 @@ class Helper
])
->findOne();
$errorMessage = 'Dependency Error: The extension "'.$extensionName.'" with version "'.
$extensionVersion.'" is missing.';
$versionString = is_array($extensionVersion) ?
implode(', ', $extensionVersion) :
$extensionVersion;
$errorMessage = 'Dependency Error: The extension "' . $extensionName .'" with version "'.
$versionString . '" is missing.';
if (
!isset($dependencyExtensionEntity) ||